diff --git a/.github/actions/docker-build-push/action.yml b/.github/actions/docker-build-push/action.yml
index 7c90618..2170b2c 100644
--- a/.github/actions/docker-build-push/action.yml
+++ b/.github/actions/docker-build-push/action.yml
@@ -19,7 +19,15 @@ runs:
         username: ${{ inputs.ghcr_username }}
         password: ${{ inputs.ghcr_token }}
 
-    - name: Build and push Docker image
+    - name: Prepare Ubuntu tags
+      id: ubuntu_tags
+      shell: bash
+      run: |
+        TAGS="${{ inputs.tags }}"
+        UBUNTU_TAGS=$(echo "$TAGS" | awk -F, '{for(i=1;i<=NF;i++){split($i,a,":"); printf "%s:%s-ubuntu", a[1], a[2]; if(i<NF) printf ","}}')
+        echo "ubuntu_tags=$UBUNTU_TAGS" >> $GITHUB_OUTPUT
+
+    - name: Build and push Docker image (Alpine)
       uses: docker/build-push-action@v5
       with:
         context: ${{ inputs.context }}
@@ -30,6 +38,17 @@ runs:
         cache-from: type=gha
         cache-to: type=gha
 
+    - name: Build and push Docker image (Ubuntu)
+      uses: docker/build-push-action@v5
+      with:
+        context: ${{ inputs.context }}
+        file: docker/Dockerfile.ubuntu
+        platforms: ${{ inputs.platforms }}
+        push: true
+        tags: ${{ steps.ubuntu_tags.outputs.ubuntu_tags }}
+        cache-from: type=gha
+        cache-to: type=gha
+
 inputs:
   dockerhub_username:
     required: true
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 87d5776..2e0c221 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -18,10 +18,10 @@ jobs:
       packages: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
diff --git a/.github/workflows/docker-fix.yml b/.github/workflows/docker-fix.yml
index a759bc2..87b2b5f 100644
--- a/.github/workflows/docker-fix.yml
+++ b/.github/workflows/docker-fix.yml
@@ -12,10 +12,10 @@ jobs:
       packages: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cc5e05f..eaf81a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
       release_version: ${{ steps.get_version.outputs.release_version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -64,17 +64,17 @@ jobs:
       packages: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Download modified files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: modified-files
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -119,17 +119,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Download modified files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: modified-files
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -150,12 +150,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Download modified files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: modified-files
 
diff --git a/.run/GameyfinApplication.run.xml b/.run/Gameyfin.run.xml
similarity index 84%
rename from .run/GameyfinApplication.run.xml
rename to .run/Gameyfin.run.xml
index 31c486d..a35cfdb 100644
--- a/.run/GameyfinApplication.run.xml
+++ b/.run/Gameyfin.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GameyfinApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+  <configuration default="false" name="Gameyfin" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev" />
     <option name="ALTERNATIVE_JRE_PATH" value="BUNDLED" />
     <envs>
diff --git a/app/package-lock.json b/app/package-lock.json
index 6bf65fb..0532cf8 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "gameyfin",
-  "version": "2.0.0.RC1",
+  "version": "2.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gameyfin",
-      "version": "2.0.0.RC1",
+      "version": "2.0.1",
       "dependencies": {
         "@heroui/react": "2.7.9",
         "@material-tailwind/react": "^2.1.10",
@@ -14,22 +14,22 @@
         "@polymer/polymer": "3.5.2",
         "@react-stately/data": "^3.12.2",
         "@react-types/shared": "^3.28.0",
-        "@vaadin/bundles": "24.8.3",
+        "@vaadin/bundles": "24.8.6",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-file-router": "24.8.2",
-        "@vaadin/hilla-frontend": "24.8.2",
-        "@vaadin/hilla-lit-form": "24.8.2",
-        "@vaadin/hilla-react-auth": "24.8.2",
-        "@vaadin/hilla-react-crud": "24.8.2",
-        "@vaadin/hilla-react-form": "24.8.2",
-        "@vaadin/hilla-react-i18n": "24.8.2",
-        "@vaadin/hilla-react-signals": "24.8.2",
-        "@vaadin/polymer-legacy-adapter": "24.8.3",
-        "@vaadin/react-components": "24.8.3",
+        "@vaadin/hilla-file-router": "24.8.7",
+        "@vaadin/hilla-frontend": "24.8.7",
+        "@vaadin/hilla-lit-form": "24.8.7",
+        "@vaadin/hilla-react-auth": "24.8.7",
+        "@vaadin/hilla-react-crud": "24.8.7",
+        "@vaadin/hilla-react-form": "24.8.7",
+        "@vaadin/hilla-react-i18n": "24.8.7",
+        "@vaadin/hilla-react-signals": "24.8.7",
+        "@vaadin/polymer-legacy-adapter": "24.8.6",
+        "@vaadin/react-components": "24.8.6",
         "@vaadin/vaadin-development-mode-detector": "2.0.7",
-        "@vaadin/vaadin-lumo-styles": "24.8.3",
-        "@vaadin/vaadin-material-styles": "24.8.3",
-        "@vaadin/vaadin-themable-mixin": "24.8.3",
+        "@vaadin/vaadin-lumo-styles": "24.8.6",
+        "@vaadin/vaadin-material-styles": "24.8.6",
+        "@vaadin/vaadin-themable-mixin": "24.8.6",
         "@vaadin/vaadin-usage-statistics": "2.1.3",
         "classnames": "^2.5.1",
         "construct-style-sheets-polyfill": "3.1.0",
@@ -66,17 +66,17 @@
         "@types/node": "^22.4.0",
         "@types/react": "18.3.23",
         "@types/react-dom": "18.3.7",
-        "@vaadin/hilla-generator-cli": "24.8.2",
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.8.2",
-        "@vaadin/hilla-generator-plugin-barrel": "24.8.2",
-        "@vaadin/hilla-generator-plugin-client": "24.8.2",
-        "@vaadin/hilla-generator-plugin-model": "24.8.2",
-        "@vaadin/hilla-generator-plugin-push": "24.8.2",
-        "@vaadin/hilla-generator-plugin-signals": "24.8.2",
-        "@vaadin/hilla-generator-plugin-subtypes": "24.8.2",
-        "@vaadin/hilla-generator-plugin-transfertypes": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-cli": "24.8.7",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-backbone": "24.8.7",
+        "@vaadin/hilla-generator-plugin-barrel": "24.8.7",
+        "@vaadin/hilla-generator-plugin-client": "24.8.7",
+        "@vaadin/hilla-generator-plugin-model": "24.8.7",
+        "@vaadin/hilla-generator-plugin-push": "24.8.7",
+        "@vaadin/hilla-generator-plugin-signals": "24.8.7",
+        "@vaadin/hilla-generator-plugin-subtypes": "24.8.7",
+        "@vaadin/hilla-generator-plugin-transfertypes": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "@vitejs/plugin-react": "4.5.0",
         "@vitejs/plugin-react-swc": "^3.7.0",
         "async": "3.2.6",
@@ -6699,201 +6699,6 @@
         }
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
-      "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz",
-      "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz",
-      "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz",
-      "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz",
-      "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz",
-      "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz",
-      "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz",
-      "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz",
-      "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz",
-      "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz",
-      "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz",
-      "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz",
-      "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
       "version": "4.38.0",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz",
@@ -6908,96 +6713,6 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz",
-      "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz",
-      "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz",
-      "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz",
-      "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz",
-      "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz",
-      "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true
-    },
     "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",
@@ -7476,168 +7191,168 @@
       "license": "ISC"
     },
     "node_modules/@vaadin/a11y-base": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/a11y-base/-/a11y-base-24.8.3.tgz",
-      "integrity": "sha512-RbNp466eAqR1FFzDeCAtTvZb7ffmys7Wmb9Klk88pC9lPjnMySvPhLO2EtV5soSE1WFQAoNSOCblSqDvjTp1Dg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/a11y-base/-/a11y-base-24.8.6.tgz",
+      "integrity": "sha512-c8SEpMbgdOXtfHG7HS4FT80UnVQ1TiOx2g7F2YWkJDGLJ+/GjiX7dGZfX3zn92U8Yc3voSCB0JsOu9OCtnGQTw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/accordion": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/accordion/-/accordion-24.8.3.tgz",
-      "integrity": "sha512-UAzqnptUjzf/OQc6gDflomXKWrNYllY4vBJwF9vK7lOvDOvB1uUxQMnvgKQCwyJJTj1Hkgj8Pf92z/Mw5u8HIQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/accordion/-/accordion-24.8.6.tgz",
+      "integrity": "sha512-aXvLcxUWFA5Q7W07aTAbnSairTmahQS5pKffswWzawfhBq8XHxRAXuui5lzOcmGyagV0SUP5di3hq8D3p8J9Nw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/details": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/details": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/app-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/app-layout/-/app-layout-24.8.3.tgz",
-      "integrity": "sha512-GN+fCGs08lqHoV/t4RGO1umQKYBKySe1rTunQIfS6iidrLS+w3QFAJnQqApl/N+c19AcX6myn+tkbcKvluKZgQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/app-layout/-/app-layout-24.8.6.tgz",
+      "integrity": "sha512-Jl+RciFBnQlLImk3zkl/0TQrQmeuxf4MYqfsQ1oW9xdOEeR04VJ6Cw5BM+gG9I8PfszlyHYbFmnTE3JurRK7cA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/avatar": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/avatar/-/avatar-24.8.3.tgz",
-      "integrity": "sha512-IvznGJRgvtPT3i12+9KyhXs5QCD2QPlI8XuSqR73GnYmBaOCJEPf6jGaFUNr68CHB8Lphytc/w9ryii/8nDERg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/avatar/-/avatar-24.8.6.tgz",
+      "integrity": "sha512-ZWe5g5ZorJXyd3d8DqDQkJ6TpGkwTsOGMQQgEWVVs00DyYENFCs4dF+jL9taYXfr7DF8x58XIS9aARQpKWnyIQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/tooltip": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/tooltip": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/avatar-group": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/avatar-group/-/avatar-group-24.8.3.tgz",
-      "integrity": "sha512-Ml6DoKGBEd9cnAyaRwKKm8P1i96SaGAUlXXPXNLCSLIXO3bxo5Lezma8WDii6HHIOfsFXhL9x9ATNBDNuYd7fw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/avatar-group/-/avatar-group-24.8.6.tgz",
+      "integrity": "sha512-sGGzMNbsIigD8ijjyMgqmPJ4Qir7IhUSu87pl17Iy3nNVIXk9hsoIPTKoDbPPCzuRHo+bTEEYKeGqGJFKeAFeA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/avatar": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/list-box": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/tooltip": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/avatar": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/list-box": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/tooltip": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/bundles": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/bundles/-/bundles-24.8.3.tgz",
-      "integrity": "sha512-7MccSIvAC5L7q2LTumizigUE4rPshQWAq67Id2oH9HJCqBzsn6qBoG5GsQgZjEorp5/K2c0oYCYstI6hamZICw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/bundles/-/bundles-24.8.6.tgz",
+      "integrity": "sha512-/7R6FNJuD78UUT4csMuAEZhf0Qgz7zJ4mIvhG/uUhJauV48S9zi1RFp0NLRIpn41LRjb1hLEyMIlbjA9k2JJkw==",
       "license": "(Apache-2.0 OR SEE LICENSE IN https://vaadin.com/license/cvdl-4.0)",
       "peerDependencies": {
         "@open-wc/dedupe-mixin": "1.4.0",
         "@polymer/polymer": "3.5.2",
-        "@vaadin/a11y-base": "24.8.3",
-        "@vaadin/accordion": "24.8.3",
-        "@vaadin/app-layout": "24.8.3",
-        "@vaadin/avatar": "24.8.3",
-        "@vaadin/avatar-group": "24.8.3",
-        "@vaadin/board": "24.8.3",
-        "@vaadin/button": "24.8.3",
-        "@vaadin/card": "24.8.3",
-        "@vaadin/charts": "24.8.3",
-        "@vaadin/checkbox": "24.8.3",
-        "@vaadin/checkbox-group": "24.8.3",
-        "@vaadin/combo-box": "24.8.3",
-        "@vaadin/component-base": "24.8.3",
-        "@vaadin/confirm-dialog": "24.8.3",
-        "@vaadin/context-menu": "24.8.3",
-        "@vaadin/cookie-consent": "24.8.3",
-        "@vaadin/crud": "24.8.3",
-        "@vaadin/custom-field": "24.8.3",
-        "@vaadin/dashboard": "24.8.3",
-        "@vaadin/date-picker": "24.8.3",
-        "@vaadin/date-time-picker": "24.8.3",
-        "@vaadin/details": "24.8.3",
-        "@vaadin/dialog": "24.8.3",
-        "@vaadin/email-field": "24.8.3",
-        "@vaadin/field-base": "24.8.3",
-        "@vaadin/field-highlighter": "24.8.3",
-        "@vaadin/form-layout": "24.8.3",
-        "@vaadin/grid": "24.8.3",
-        "@vaadin/grid-pro": "24.8.3",
-        "@vaadin/horizontal-layout": "24.8.3",
-        "@vaadin/icon": "24.8.3",
-        "@vaadin/icons": "24.8.3",
-        "@vaadin/input-container": "24.8.3",
-        "@vaadin/integer-field": "24.8.3",
-        "@vaadin/item": "24.8.3",
-        "@vaadin/list-box": "24.8.3",
-        "@vaadin/lit-renderer": "24.8.3",
-        "@vaadin/login": "24.8.3",
-        "@vaadin/map": "24.8.3",
-        "@vaadin/markdown": "24.8.3",
-        "@vaadin/master-detail-layout": "24.8.3",
-        "@vaadin/menu-bar": "24.8.3",
-        "@vaadin/message-input": "24.8.3",
-        "@vaadin/message-list": "24.8.3",
-        "@vaadin/multi-select-combo-box": "24.8.3",
-        "@vaadin/notification": "24.8.3",
-        "@vaadin/number-field": "24.8.3",
-        "@vaadin/overlay": "24.8.3",
-        "@vaadin/password-field": "24.8.3",
-        "@vaadin/polymer-legacy-adapter": "24.8.3",
-        "@vaadin/popover": "24.8.3",
-        "@vaadin/progress-bar": "24.8.3",
-        "@vaadin/radio-group": "24.8.3",
-        "@vaadin/rich-text-editor": "24.8.3",
-        "@vaadin/scroller": "24.8.3",
-        "@vaadin/select": "24.8.3",
-        "@vaadin/side-nav": "24.8.3",
-        "@vaadin/split-layout": "24.8.3",
-        "@vaadin/tabs": "24.8.3",
-        "@vaadin/tabsheet": "24.8.3",
-        "@vaadin/text-area": "24.8.3",
-        "@vaadin/text-field": "24.8.3",
-        "@vaadin/time-picker": "24.8.3",
-        "@vaadin/tooltip": "24.8.3",
-        "@vaadin/upload": "24.8.3",
+        "@vaadin/a11y-base": "24.8.6",
+        "@vaadin/accordion": "24.8.6",
+        "@vaadin/app-layout": "24.8.6",
+        "@vaadin/avatar": "24.8.6",
+        "@vaadin/avatar-group": "24.8.6",
+        "@vaadin/board": "24.8.6",
+        "@vaadin/button": "24.8.6",
+        "@vaadin/card": "24.8.6",
+        "@vaadin/charts": "24.8.6",
+        "@vaadin/checkbox": "24.8.6",
+        "@vaadin/checkbox-group": "24.8.6",
+        "@vaadin/combo-box": "24.8.6",
+        "@vaadin/component-base": "24.8.6",
+        "@vaadin/confirm-dialog": "24.8.6",
+        "@vaadin/context-menu": "24.8.6",
+        "@vaadin/cookie-consent": "24.8.6",
+        "@vaadin/crud": "24.8.6",
+        "@vaadin/custom-field": "24.8.6",
+        "@vaadin/dashboard": "24.8.6",
+        "@vaadin/date-picker": "24.8.6",
+        "@vaadin/date-time-picker": "24.8.6",
+        "@vaadin/details": "24.8.6",
+        "@vaadin/dialog": "24.8.6",
+        "@vaadin/email-field": "24.8.6",
+        "@vaadin/field-base": "24.8.6",
+        "@vaadin/field-highlighter": "24.8.6",
+        "@vaadin/form-layout": "24.8.6",
+        "@vaadin/grid": "24.8.6",
+        "@vaadin/grid-pro": "24.8.6",
+        "@vaadin/horizontal-layout": "24.8.6",
+        "@vaadin/icon": "24.8.6",
+        "@vaadin/icons": "24.8.6",
+        "@vaadin/input-container": "24.8.6",
+        "@vaadin/integer-field": "24.8.6",
+        "@vaadin/item": "24.8.6",
+        "@vaadin/list-box": "24.8.6",
+        "@vaadin/lit-renderer": "24.8.6",
+        "@vaadin/login": "24.8.6",
+        "@vaadin/map": "24.8.6",
+        "@vaadin/markdown": "24.8.6",
+        "@vaadin/master-detail-layout": "24.8.6",
+        "@vaadin/menu-bar": "24.8.6",
+        "@vaadin/message-input": "24.8.6",
+        "@vaadin/message-list": "24.8.6",
+        "@vaadin/multi-select-combo-box": "24.8.6",
+        "@vaadin/notification": "24.8.6",
+        "@vaadin/number-field": "24.8.6",
+        "@vaadin/overlay": "24.8.6",
+        "@vaadin/password-field": "24.8.6",
+        "@vaadin/polymer-legacy-adapter": "24.8.6",
+        "@vaadin/popover": "24.8.6",
+        "@vaadin/progress-bar": "24.8.6",
+        "@vaadin/radio-group": "24.8.6",
+        "@vaadin/rich-text-editor": "24.8.6",
+        "@vaadin/scroller": "24.8.6",
+        "@vaadin/select": "24.8.6",
+        "@vaadin/side-nav": "24.8.6",
+        "@vaadin/split-layout": "24.8.6",
+        "@vaadin/tabs": "24.8.6",
+        "@vaadin/tabsheet": "24.8.6",
+        "@vaadin/text-area": "24.8.6",
+        "@vaadin/text-field": "24.8.6",
+        "@vaadin/time-picker": "24.8.6",
+        "@vaadin/tooltip": "24.8.6",
+        "@vaadin/upload": "24.8.6",
         "@vaadin/vaadin-development-mode-detector": "2.0.7",
-        "@vaadin/vaadin-lumo-styles": "24.8.3",
-        "@vaadin/vaadin-themable-mixin": "24.8.3",
+        "@vaadin/vaadin-lumo-styles": "24.8.6",
+        "@vaadin/vaadin-themable-mixin": "24.8.6",
         "@vaadin/vaadin-usage-statistics": "2.1.3",
-        "@vaadin/vertical-layout": "24.8.3",
-        "@vaadin/virtual-list": "24.8.3",
+        "@vaadin/vertical-layout": "24.8.6",
+        "@vaadin/virtual-list": "24.8.6",
         "cookieconsent": "3.1.1",
         "dompurify": "3.2.6",
         "highcharts": "9.2.2",
@@ -7894,87 +7609,87 @@
       }
     },
     "node_modules/@vaadin/button": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/button/-/button-24.8.3.tgz",
-      "integrity": "sha512-WqDpZe/Db994Lz5qkp5GO2KxDJOn7h6MetJszOOeHS2BZyQh8uyCmfL88b8NQMFOgU/nFfrKLzL8/3mPkE3v9A==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/button/-/button-24.8.6.tgz",
+      "integrity": "sha512-mXZLt2u3elJ3WMLaw35zLIpZiPPB+hlpKdfTlOF22vDm1OIalVYpQlGcdDDOshtIGaUH1W3eb1MmlQhVAEFmkA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/card": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/card/-/card-24.8.3.tgz",
-      "integrity": "sha512-cUFAZKTTnVBjvbXkEPiroPtDHLHCM8+LER7OFMdOX7MCRxFQA5hh4cDUjxnnBWBhCqu/NwxgaumbOimciNx3fg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/card/-/card-24.8.6.tgz",
+      "integrity": "sha512-VgnQUkHY8I06INUSwXuNOrevG7PYQsBKr6k1r42KqEzLESiWV/pk+WpdyGRTEH4MbKc8oj6Ut6Uu6DtUpgK+eg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/checkbox": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/checkbox/-/checkbox-24.8.3.tgz",
-      "integrity": "sha512-FMg6EtgkVFRxwCy1C6LIidt472Ix8VYWE6pkAaDCBpzs/mQaFWPF0jRRxUyxJcYQmNP1/WoKTHAror19t+EbYw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/checkbox/-/checkbox-24.8.6.tgz",
+      "integrity": "sha512-wLaKHniu8MKO4sfKJMiC+F/fMZVi1l2CpRw3RTTFzKYQMeBVwVRv3Lg1yV75LN8KtHU0DBR5l2Xfb4pa+rRGFg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/checkbox-group": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/checkbox-group/-/checkbox-group-24.8.3.tgz",
-      "integrity": "sha512-E/6V4H619i6N0B56pp2BoU2gYhbQyS2nQsoeJceyrBAEVri9pKT2NGumqDqHSGetk8x2dXlZWUIUJJN1OY5BrQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/checkbox-group/-/checkbox-group-24.8.6.tgz",
+      "integrity": "sha512-odQ9PnF5SfWAniYnhKb6gEDPkn0ZO+P7gK5AUit3TadeAGc9t2+7BgqcJlg0o6fflgfEwD/RKWV6PXCU30BVEw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/checkbox": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/checkbox": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/combo-box": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/combo-box/-/combo-box-24.8.3.tgz",
-      "integrity": "sha512-H3oEpAgzCD6Pi37auXW4HIB/d99Uz5xtV+cjkQ6opMW1nOYSbRfJazxfl4yvoaD9PLok/IyN2i50saSiTlpoCw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/combo-box/-/combo-box-24.8.6.tgz",
+      "integrity": "sha512-baeU/8jn7JdV4R3tqoVJMHc3wsMeo4RMREPAYjiQ1T4q1378cOpIixoPgXBnRj0g2bGwVD0dCHXcfb0BtVo9KQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
@@ -7991,9 +7706,9 @@
       }
     },
     "node_modules/@vaadin/component-base": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/component-base/-/component-base-24.8.3.tgz",
-      "integrity": "sha512-ZtMnFZdlnEXpOaiatCaOd156oNnJeQO5CH5cUMf8/hQoONMSrsXGTi+nFsrn88VRPbKD0RhnoZq6lt7eOudjKQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/component-base/-/component-base-24.8.6.tgz",
+      "integrity": "sha512-EnhFwUXkZ53AASaPMJukI0w/DTSM74IXh+j65GUcFbrlN/S7tdFCQhtIsaLX95pcEtestSXOSufI/kW/B+6hgA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
@@ -8004,223 +7719,223 @@
       }
     },
     "node_modules/@vaadin/confirm-dialog": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/confirm-dialog/-/confirm-dialog-24.8.3.tgz",
-      "integrity": "sha512-dSGlmNQh/Cejj7sCmS09v072Pq6noM2XveOp1N3e8lJFf/KHQcl+RORoPrNaDm741yApkJgTfR7tW3qX8qbtIw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/confirm-dialog/-/confirm-dialog-24.8.6.tgz",
+      "integrity": "sha512-Cm0bJFSfd+MU++d6N15XypSzpJ/1wcF8/NmTKMOW3falJOMHNl3F5/pzo1I24PBDjM/moQrXtOjUS5eKD6nf7g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/dialog": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/dialog": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/context-menu": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/context-menu/-/context-menu-24.8.3.tgz",
-      "integrity": "sha512-588VDBfYrUgA1aVInvQpn1cH/hDhNsbaPAPnp1irx0f8tV2tUWKk0pq5MPo8wzTt+xBO1NOiQGXHywnbooSdZw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/context-menu/-/context-menu-24.8.6.tgz",
+      "integrity": "sha512-oxgko1QeexR0ZFXEr0wt/AgX202rDb2VG0k3Rdjl05e4fzKI7Z5sJastkLEx15CG27JuPEC2iiwrIThzdpTm5Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/list-box": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/list-box": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/custom-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/custom-field/-/custom-field-24.8.3.tgz",
-      "integrity": "sha512-s0ALwKtVY3Rf3vFwQKEjne46D9wxxBuI6hXGNcViqYf7JffK23T2lwnRrVgonCG5dpZ74gBHGHwS1oHqWGsUXA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/custom-field/-/custom-field-24.8.6.tgz",
+      "integrity": "sha512-yi8fAOl4rW55qqj2+eBlHdNvRaIvBEqcm1cZLEQufxi+F/8oCcYj52HceKYTrtnL4eIcwCxDm+E4F/Bvft/8jw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/date-picker": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/date-picker/-/date-picker-24.8.3.tgz",
-      "integrity": "sha512-LFLpCjMlbJfEhpcWPoPLqeDc//rMdKRD08QP9plCSRf1Kn1HRfPAjW8Lqq1wMKDLTgQnrth/G7a5vYuaAR3zzg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/date-picker/-/date-picker-24.8.6.tgz",
+      "integrity": "sha512-ofuf57/hynJiiMlyWbSpraQtce+htN1SL4J7pUvB315Qekb6Piic+u11/Y9UC22yl0du39KetsXTZ6dgk0oi1g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.2.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/date-time-picker": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/date-time-picker/-/date-time-picker-24.8.3.tgz",
-      "integrity": "sha512-J3IRtZL3upG+JKKTkNE+aFUxSmoGpp0Vw077u+3K7Kj8Lx4MLtsKXny03yZsnzBTkoomfCZHQbonYr5fCQsTIw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/date-time-picker/-/date-time-picker-24.8.6.tgz",
+      "integrity": "sha512-55I5JgZz3GGoGSUvntovjpqDQxn267C1G3kn9zELVCVEN8yNG2q8cdyunHLpKx+fj6y2/PZIkiVPNiUpBw/Www==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/custom-field": "~24.8.3",
-        "@vaadin/date-picker": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/time-picker": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/custom-field": "~24.8.6",
+        "@vaadin/date-picker": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/time-picker": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/details": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/details/-/details-24.8.3.tgz",
-      "integrity": "sha512-G2aq3F+jT5rzxPZKgiEhjdjJnKgFjry710GS1+YsiEs531fVNAIuNQWZYY1PzNMsh9AJ1HoIIp9v7Vx+RTL53Q==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/details/-/details-24.8.6.tgz",
+      "integrity": "sha512-vJ7ufMXabp5ltZcsxlTwPwwB5LDwbRsQzFts4Z187L8s0E0k/18xHkdggIPqKZV+hoEh+NsqyZwjAOpK/qSqtQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/dialog": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/dialog/-/dialog-24.8.3.tgz",
-      "integrity": "sha512-RxGUr5FVXRtIHpy+MOIVKIaOmTIEV1sRe7waGbiWID+E1r5BRdJnGqV5fjujC7ppS4ZHzydgxglkWeTMDC1QuA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/dialog/-/dialog-24.8.6.tgz",
+      "integrity": "sha512-87h1iwoiS/B5+YWnS2XXWTtqzWJvpYK7BOaqrSsQIbPI9jww3TguTNKiHgu4i/yXXavMBoEhvBrJxJ46i9Ftdg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/email-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/email-field/-/email-field-24.8.3.tgz",
-      "integrity": "sha512-l7k8XKWsjhA+i3exXzrcr0bwbkLjszJ2OR4HvDqe5EcF4fmGWcegnVUrGKmzj1hpNPRuPhbG1ADuHKv263zjHw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/email-field/-/email-field-24.8.6.tgz",
+      "integrity": "sha512-OjT0OCpU+ByTsCO6YxSnbuT8f8m3ALEabf/3r7uPZYVaAxGTaD/rd2oyyq/bYPe8ZsY7rcTHvRyW91zb8DOzOA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/text-field": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/text-field": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/field-base": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/field-base/-/field-base-24.8.3.tgz",
-      "integrity": "sha512-ozkzamDbWWYFDvgQrUfWV3amM37+gKJd581MpBLHCc1ER42D+jtu7Fzll73OmjopL+ykaNZUv/RidsQpINP5xA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/field-base/-/field-base-24.8.6.tgz",
+      "integrity": "sha512-B3DXzH1wys6airDSNKfBJZE8kH34N52dhW3DBhcwaQ87iw4KdTG3IbQ+3c7oHc4mezOhtfgtst00PIs8RCg6Hg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/field-highlighter": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/field-highlighter/-/field-highlighter-24.8.3.tgz",
-      "integrity": "sha512-r+ivpdL55mo1wuYhbwLOBxDijZ/9YRqUteBnQ5JH776ogxibS7KaaMTTMt5x609J0p9Lav6gJqB8v+5HqwesQA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/field-highlighter/-/field-highlighter-24.8.6.tgz",
+      "integrity": "sha512-TJBf2Nib6SW/rRUVsK81p+qdkXw/WjWxceypmE6nJlcZqGquqcz8TMqY+3g6dXcfUrMKi5nResxjkmkd1RNQxQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/form-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/form-layout/-/form-layout-24.8.3.tgz",
-      "integrity": "sha512-qpOdU5zJDeRuJqb9myaJ/dewxN1MtYERrS2K5bZV/B/xMd9aZZ5jY1eVudy+7wVqdWsFYvJhbBuHq69sp7Pzqg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/form-layout/-/form-layout-24.8.6.tgz",
+      "integrity": "sha512-7rCr8DxK/Wdn8F7bB/JX70vA6fzYbuQbF22odP6auzVRKWoE6JWY8gvkFIHtuAFnNt+Fc56CRbtHXPewqCY8QQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/grid": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/grid/-/grid-24.8.3.tgz",
-      "integrity": "sha512-agGZmF4TFL3UICiJNUXI7aovVJOiqqJmBs+3f9QUxl2nLV3zvm/oG3xmS4yx90xARdZzfcAH+ZWJbEngfFGYfQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/grid/-/grid-24.8.6.tgz",
+      "integrity": "sha512-RZUhKOunOdfErNakt4xz99gmmqmjWemYZDWtECh03xTPq2rtZXICmaK4/JqwJ/i+I8/TwDyMSUu3boqlFNiMYA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/checkbox": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/text-field": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/checkbox": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/text-field": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/hilla-file-router": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-file-router/-/hilla-file-router-24.8.2.tgz",
-      "integrity": "sha512-rBLFUADRQu53/yrYRJxB5iAqoKRbp0EiU1REWSSivEUd7wk7zon3OkblhHVyU7Ohx6BdqDMxlKnbStJijdBcFg==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-file-router/-/hilla-file-router-24.8.7.tgz",
+      "integrity": "sha512-pWSzxpd8NU4rZjKtPNMfMG7Qhnl7A3CyKGArWBvOCfCeyW0cdLt+Gkxl+606dsgoSqdyHMHrX0EdrtWtsO50EA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@ungap/with-resolvers": "0.1.0",
-        "@vaadin/hilla-generator-utils": "24.8.2",
-        "@vaadin/hilla-react-auth": "24.8.2",
-        "@vaadin/hilla-react-signals": "24.8.2",
+        "@vaadin/hilla-generator-utils": "24.8.7",
+        "@vaadin/hilla-react-auth": "24.8.7",
+        "@vaadin/hilla-react-signals": "24.8.7",
         "tsc-template": "0.2.3",
         "typescript": "5.8.3"
       },
@@ -8231,9 +7946,9 @@
       }
     },
     "node_modules/@vaadin/hilla-frontend": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-frontend/-/hilla-frontend-24.8.2.tgz",
-      "integrity": "sha512-YPFb52LghlpHGzoLlaYY5Bz47G/F+YCaOYTH5aS+kageXaQ5kVnZRYZPG59gElk4Bqk3Z/I2q4+V1BrXCdcerg==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-frontend/-/hilla-frontend-24.8.7.tgz",
+      "integrity": "sha512-WTwv8CAEXZrKhdP0mszuptWKBx453X1fTohkcNx3V58vAhzg/cakBQsdXo1OqGBd3ZPbHUgZ1R5lFp1lL4qAgQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "0.0.19",
@@ -8245,14 +7960,14 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-cli": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-cli/-/hilla-generator-cli-24.8.2.tgz",
-      "integrity": "sha512-AKKa9bsCQMqGN8+TVavLCH90uW83PP15XDcSNHNIsTVNmvByOXGPJslvW2o9ne3Or7p3x1bhTLDadNushI0q4Q==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-cli/-/hilla-generator-cli-24.8.7.tgz",
+      "integrity": "sha512-qd+lfRXtJmy59X4IoBEuBuGynx5dI0QftBNBjCRSSANWbv31WWTOqKOUtZiGTbAYqDqDKcw3Tu1RqMV1KXqaCA==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2"
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7"
       },
       "bin": {
         "tsgen": "bin/index.js"
@@ -8262,14 +7977,14 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-core": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-core/-/hilla-generator-core-24.8.2.tgz",
-      "integrity": "sha512-iZ87vMJ6X2hVZzpo5fP7k4f+WzRO5e/5CnZwmQ0ZQOV/DcyiXWi+VcLEGbsuejUhqcyKrNnfzuQb4qqHb7oYAw==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-core/-/hilla-generator-core-24.8.7.tgz",
+      "integrity": "sha512-XmbruZpmssOjyGfOcL5l5eSACLzHjHq5tlItTBlsfHpYyrT6SImJQQn0r2MX/tpDV4cNALzCd3tAbOsH3oREzw==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "10.1.1",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "meow": "13.2.0",
         "openapi-types": "12.1.3",
         "typescript": "5.8.3"
@@ -8292,15 +8007,15 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-backbone": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-backbone/-/hilla-generator-plugin-backbone-24.8.2.tgz",
-      "integrity": "sha512-JLIgfmg2L0dfjSFUEdgb4bv/q7IK3Q+OIOaOGVe5FCeIrd2jihJhQgzdRkufIsfIbYosXNfEoz9EF5U1xqMi7A==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-backbone/-/hilla-generator-plugin-backbone-24.8.7.tgz",
+      "integrity": "sha512-c62JKMCAt4YGfo9BWwDeaLIDYz8mVl/lwMdyW4anJH+1GLbN1PTnLbjUToNkyl/aRHFQ1wsDz4MSuVFrbmkpYA==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-client": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-client": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "fast-deep-equal": "3.1.3",
         "openapi-types": "12.1.3",
         "typescript": "5.8.3"
@@ -8310,15 +8025,15 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-barrel": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-barrel/-/hilla-generator-plugin-barrel-24.8.2.tgz",
-      "integrity": "sha512-WNF2DVoTDFXXjFxlwfaO0OrYrphfSbtg4CvEcwTU/9pZo7dQKEQXxYk5rVCONYpCdjyS+q/r9s2c1GJFoQasZw==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-barrel/-/hilla-generator-plugin-barrel-24.8.7.tgz",
+      "integrity": "sha512-4ha9b1hWc8qRryoS9xKEe2isy/Mrn6W5VWugbTjCLLr1PJtwT7meLE41W5IMtiUawoc8Y5VqHwvYoHmEQ8SdOw==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-backbone": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "typescript": "5.8.3"
       },
       "engines": {
@@ -8326,14 +8041,14 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-client": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-client/-/hilla-generator-plugin-client-24.8.2.tgz",
-      "integrity": "sha512-EQ+ZeKbGApVZzx4xtNTzueQSBnsM+GPks8tRxFLC8BfczB9LIm+MCv2m88VAQRiznY3Xdtz2aEyCWQ0oV0ZSeQ==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-client/-/hilla-generator-plugin-client-24.8.7.tgz",
+      "integrity": "sha512-w6HjsM8i+whzuvYHDLLttyzYydXJr2JMdcRy0wjwJrpJiDS9btvKN7dbicesfY6yi9BgT/4UtLtvAAAvEkaF0w==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "typescript": "5.8.3"
       },
       "engines": {
@@ -8341,16 +8056,16 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-model": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-model/-/hilla-generator-plugin-model-24.8.2.tgz",
-      "integrity": "sha512-0b/HVEqKKLH0GswPONbNJxadIVBn66sXHqXNfgB2AdBYFrnORgbVnO96qgxdGrRWHlBO4sf6SXgHf4bb4z7KcA==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-model/-/hilla-generator-plugin-model-24.8.7.tgz",
+      "integrity": "sha512-KwAqPqVdhbPOU0Afur59FUB3uuZyr7TvCMCvBcpebaUe+8t7kPekoX/dYbhQP5tYh4VoFusQNe9xjVSaHvP5lQ==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
-        "@vaadin/hilla-lit-form": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-backbone": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
+        "@vaadin/hilla-lit-form": "24.8.7",
         "fast-deep-equal": "3.1.3",
         "openapi-types": "12.1.3",
         "typescript": "5.8.3"
@@ -8360,15 +8075,15 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-push": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-push/-/hilla-generator-plugin-push-24.8.2.tgz",
-      "integrity": "sha512-bj/zxHzR4mhbUGyyA/FxIJvZEvgcjgKW2E5KsVJOtmOUFQTQ2KO7haofCgTwT3wCzxFk4EMYt8St+njJs2dqlQ==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-push/-/hilla-generator-plugin-push-24.8.7.tgz",
+      "integrity": "sha512-zG8q/a1i+mHHhjTwn0+NHtJGsbdmkT6Bdp26j5lVM+Qs2aUMhHBtIQCkUbgK+Ack4vi5FfE20ELCLYD4QwsSkg==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-client": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-client": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "fast-deep-equal": "3.1.3",
         "openapi-types": "12.1.3",
         "typescript": "5.8.3"
@@ -8378,14 +8093,14 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-signals": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-signals/-/hilla-generator-plugin-signals-24.8.2.tgz",
-      "integrity": "sha512-aCMQXQkXzUlIcGsd2Qng2dZxTzKn5ykTP2VtAm64Xl+1dUqmruTrTmqonIFEHrqJsEqWWbk/qhADYNBa6jsjew==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-signals/-/hilla-generator-plugin-signals-24.8.7.tgz",
+      "integrity": "sha512-qAC2+jn8oDPzc2nFNEosLhKysl0hGrbRVBCC9fDDUyo5XdgZnIyCoETRpo12qAqRyP8y/LToeyAm1deNs82MWQ==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "fast-deep-equal": "3.1.3",
         "iterator-helpers-polyfill": "3.0.1",
         "openapi-types": "12.1.3",
@@ -8397,16 +8112,16 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-subtypes": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-subtypes/-/hilla-generator-plugin-subtypes-24.8.2.tgz",
-      "integrity": "sha512-aLDhUjeJq8sBFkin7svULv454WAJ6Olsdqg2iWJU/gfad+9j7XlKy3IWZI+FI/02uzmB0Vtpn34jx0k2jZyxMQ==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-subtypes/-/hilla-generator-plugin-subtypes-24.8.7.tgz",
+      "integrity": "sha512-CTGlPc4MMbuY31pCBFec38XMZ8Z5sKAMZ+hh4+sXrMLD/2Wrxt7qwf+R7OBULdSXnP0cHqv22FMPwYjOdMrR4g==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-client": "24.8.2",
-        "@vaadin/hilla-generator-plugin-model": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-client": "24.8.7",
+        "@vaadin/hilla-generator-plugin-model": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.8.3"
@@ -8416,16 +8131,16 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-plugin-transfertypes": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-transfertypes/-/hilla-generator-plugin-transfertypes-24.8.2.tgz",
-      "integrity": "sha512-Eb8BumgIxc8Hl3GI+q2gIa60liynUHxXv7mMdvTn9CBMDEMRhKJ8ER8TKVi9rdffDAMhR/Xpf6L7z4aH2I5+WA==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-plugin-transfertypes/-/hilla-generator-plugin-transfertypes-24.8.7.tgz",
+      "integrity": "sha512-EssIPC+kMCTL985x7JwcqXA1UfX0/BTcUq14Ur2bj4NQeO4LP2JU5F1+IeGNlyyGQMHwP5MO0qnnMPkvviJFew==",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.8.2",
-        "@vaadin/hilla-generator-plugin-client": "24.8.2",
-        "@vaadin/hilla-generator-plugin-model": "24.8.2",
-        "@vaadin/hilla-generator-utils": "24.8.2",
+        "@vaadin/hilla-generator-core": "24.8.7",
+        "@vaadin/hilla-generator-plugin-client": "24.8.7",
+        "@vaadin/hilla-generator-plugin-model": "24.8.7",
+        "@vaadin/hilla-generator-utils": "24.8.7",
         "fast-deep-equal": "3.1.3",
         "openapi-types": "12.1.3",
         "typescript": "5.8.3"
@@ -8435,9 +8150,9 @@
       }
     },
     "node_modules/@vaadin/hilla-generator-utils": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-utils/-/hilla-generator-utils-24.8.2.tgz",
-      "integrity": "sha512-qcuC0SRWSzf/3LzSqyxdiid9xbPtkx28e8XsD/MSJK4fgylS5Znz/aeRzd1EHMY3t93XWQ09Nk2yLsExocPQzA==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-generator-utils/-/hilla-generator-utils-24.8.7.tgz",
+      "integrity": "sha512-dKFpGw9V9offx4zne92xEPEw6bMhQGs/abbwkrOJgRTXoZIRQlzGUrc50+LRd7zRoaoE0OLKnBepL1O9TgIPKg==",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "9.6.0",
@@ -8449,12 +8164,12 @@
       }
     },
     "node_modules/@vaadin/hilla-lit-form": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-lit-form/-/hilla-lit-form-24.8.2.tgz",
-      "integrity": "sha512-KcBUiZVVfEPKVPxNpAb6WYGOMOxxShu6Q0jHvPdLrWGhRXPFs3SORZGQPsiryjLlp6seb3p2IO9f9gxYZplqJg==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-lit-form/-/hilla-lit-form-24.8.7.tgz",
+      "integrity": "sha512-1+NeXot0YfuVEKeXjgZ6wMEz6VMePioQYlif70xpsw31trDNqIOhb9jrawe5YJVw7qntPDO+g8mkVuwuOBuYNg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.8.2",
+        "@vaadin/hilla-frontend": "24.8.7",
         "validator": "13.12.0"
       },
       "peerDependencies": {
@@ -8462,12 +8177,12 @@
       }
     },
     "node_modules/@vaadin/hilla-react-auth": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-auth/-/hilla-react-auth-24.8.2.tgz",
-      "integrity": "sha512-yH//4AVBfdX/3X6mJy5Y4IpLzcYMldHUkZh9Pv4vy3anNo0jXQVcNcM3Y8U+Kt5xXL/6VsRvTO6KLZ+mmECiaQ==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-auth/-/hilla-react-auth-24.8.7.tgz",
+      "integrity": "sha512-baE+BbaIyds+6Cxb7ylqLGYc7f4CSBCmbqDpYciGuU2vurNdWrx2vGjgm3yoae0WU8UHMz/mjsf0bp6fkIc2+Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.8.2"
+        "@vaadin/hilla-frontend": "24.8.7"
       },
       "peerDependencies": {
         "react": "18 || 19",
@@ -8476,16 +8191,16 @@
       }
     },
     "node_modules/@vaadin/hilla-react-crud": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-crud/-/hilla-react-crud-24.8.2.tgz",
-      "integrity": "sha512-92Jhxlz1n+6aE+rzJYUqacVTrb2dVpyFv650neV8UzCEAyWqJgV+o4UUx2vWn0iEiS2xsMLK8iOJOjUeMQPZpQ==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-crud/-/hilla-react-crud-24.8.7.tgz",
+      "integrity": "sha512-6UPwCHQpNm7Zc4GpjgzFAPLyF32UtTS2Yy/0LxBUKAC6qqfO87SMMMxNy8YHYifxE1T3NVvUwMAFd1yQhYE+EQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.8.2",
-        "@vaadin/hilla-lit-form": "24.8.2",
-        "@vaadin/hilla-react-form": "24.8.2",
-        "@vaadin/react-components": "24.8.3",
-        "@vaadin/vaadin-lumo-styles": "24.8.3",
+        "@vaadin/hilla-frontend": "24.8.7",
+        "@vaadin/hilla-lit-form": "24.8.7",
+        "@vaadin/hilla-react-form": "24.8.7",
+        "@vaadin/react-components": "24.8.6",
+        "@vaadin/vaadin-lumo-styles": "24.8.6",
         "type-fest": "4.35.0"
       },
       "peerDependencies": {
@@ -8494,12 +8209,12 @@
       }
     },
     "node_modules/@vaadin/hilla-react-form": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-form/-/hilla-react-form-24.8.2.tgz",
-      "integrity": "sha512-yK/PseFMVg43N4pLljWykvYH0HPLL16y6RVNDh0Dv84RziDN/0xstI/XDpicZEjILCTgQNt9bjP//l5C9/wCfw==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-form/-/hilla-react-form-24.8.7.tgz",
+      "integrity": "sha512-bIXY6toMLgiHk3wVkQc/JnhogvB4+SdSmxiTH+AdGSHw1SOAx+F/wPZI1M24tkluBCCg6YRNQwAR/dlf/MkONw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.8.2"
+        "@vaadin/hilla-lit-form": "24.8.7"
       },
       "peerDependencies": {
         "react": "18 || 19",
@@ -8507,13 +8222,13 @@
       }
     },
     "node_modules/@vaadin/hilla-react-i18n": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-i18n/-/hilla-react-i18n-24.8.2.tgz",
-      "integrity": "sha512-NXODXGQQJMdjQCNXVhPsoBPklqqnV4jiHkbddbYe+h7SjBmglqi2sQObMLuCNkJFjN1Lt/BzB3s3u0n3Yc2cqA==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-i18n/-/hilla-react-i18n-24.8.7.tgz",
+      "integrity": "sha512-1SU3ndFOTN7KA1aI5bx+2L98Yob+KCHsicX3B62IEbp1ChUl+FhoO5TF8/aZoKVFRDnGcHPtorv+5Js8ABlY1g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.8.2",
-        "@vaadin/hilla-react-signals": "24.8.2",
+        "@vaadin/hilla-frontend": "24.8.7",
+        "@vaadin/hilla-react-signals": "24.8.7",
         "intl-messageformat": "10.7.11"
       },
       "peerDependencies": {
@@ -8585,13 +8300,13 @@
       }
     },
     "node_modules/@vaadin/hilla-react-signals": {
-      "version": "24.8.2",
-      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-signals/-/hilla-react-signals-24.8.2.tgz",
-      "integrity": "sha512-2RKOWZ0C2Uy+KxYYeuw55wzPOue3raIUWYi7RGUH2T+wLUrzMqnswmlUZrBHMexHvOWtsQ8mDnNibzvrXsABOg==",
+      "version": "24.8.7",
+      "resolved": "https://registry.npmjs.org/@vaadin/hilla-react-signals/-/hilla-react-signals-24.8.7.tgz",
+      "integrity": "sha512-eCQzw3pYkzNCe0eaXjtfYVKjUEC+qx9S8lZ0EE2gC22Ux80scn5LCMISlWj14yvdmn9oy0utnrkJ2p5+H6dQ/w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "3.0.1",
-        "@vaadin/hilla-frontend": "24.8.2",
+        "@vaadin/hilla-frontend": "24.8.7",
         "nanoid": "5.0.9"
       },
       "peerDependencies": {
@@ -8600,437 +8315,437 @@
       }
     },
     "node_modules/@vaadin/horizontal-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/horizontal-layout/-/horizontal-layout-24.8.3.tgz",
-      "integrity": "sha512-6OxhXUTQhM6bh8Utahr8EjBi72qBwy38jO1Tve1P5p4ChnqSoW8TONXf873GlrCiEXVE3oJiifV1VHb6Y6NRNQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/horizontal-layout/-/horizontal-layout-24.8.6.tgz",
+      "integrity": "sha512-xInsr7wQ92V3a8DNVyIbR3PZKrqVnG1jAMWGxad854j/f0RMZMecF2u/98mPW4GrKGxswCh2AFWR8w9HFuXLUg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/icon": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/icon/-/icon-24.8.3.tgz",
-      "integrity": "sha512-BYmBFhB61ISEcxb6Q96LObInraEhK3L52TUKfmJubB93vfTQMQA+AyPywK+mFRGMGg/84n86hIjYrlbnSWxNwQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/icon/-/icon-24.8.6.tgz",
+      "integrity": "sha512-qnZMtMuEpDxEMwNkrtLorIclSzdlYZaFGm1UD25PLl2uu3jFzsTgsHKxKFHm5Kc2b6gKFHpe/7DK52/D28PVow==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/icons": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/icons/-/icons-24.8.3.tgz",
-      "integrity": "sha512-efCXaS5fmWAKomOlTaO6qjl6kA88rv7vW1whYpTYS4Ok40M9MdHN15YH5Fl/cQ+L0DeB2Xc15z0VonmWcx3+/w==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/icons/-/icons-24.8.6.tgz",
+      "integrity": "sha512-g5cfbUE1IM1lPbkoAQ5/rUiaseBU5DloywkukWAXmOHswAiW8dWFo78Hs5LINiIG9c2BlPIZfcfrKbn6cgCwnQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/icon": "~24.8.3"
+        "@vaadin/icon": "~24.8.6"
       }
     },
     "node_modules/@vaadin/input-container": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/input-container/-/input-container-24.8.3.tgz",
-      "integrity": "sha512-ok3w8r3lZSYKEYiuNDUXccgQuF4pDanHvm0pZq2ieLAjylaoZSDhiSIKcBYZYSoEDmPTa5gikXLgWrCrNXMyYw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/input-container/-/input-container-24.8.6.tgz",
+      "integrity": "sha512-lxnrsQCjYjDC+5K17tSuJWCwx4/bn5KCRoKz5HJcXzyXsFj8iKF7+Pv1+OjKzRRHTF27kwjviMAaP+2/V5dEgA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/integer-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/integer-field/-/integer-field-24.8.3.tgz",
-      "integrity": "sha512-CVUwY4eRasywSpyNtpTXV95AK+NR2izCUlYMo4ssrx7apuWqbBrJ/J9DidP5vDOTsSb70EDW7Zo3L8qrque8mA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/integer-field/-/integer-field-24.8.6.tgz",
+      "integrity": "sha512-ZbntjrZaEohzYp1Qn94DVUbFqZdYZy5Xemmspsr4HG6ahobFsMpgdrHjgEjG5q1hah+Cuo5Yr1mYuzxyTxJFug==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/number-field": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3"
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/number-field": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6"
       }
     },
     "node_modules/@vaadin/item": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/item/-/item-24.8.3.tgz",
-      "integrity": "sha512-sPC8QcvlpbEZbG2dd3bSP4FTKluPLjpdKrKti687R0pRIZX+edzowbG8xOY3ehTWXo801pLzxu5HhKfRHd0YaQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/item/-/item-24.8.6.tgz",
+      "integrity": "sha512-ZLgUA/s+9rGw34yUxF8XYpb2SR+xDINT48Sd8d7SFZZKFwlucyeChNKM1MEsa9floKqaFx4x4eGUdiveDdloyw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/list-box": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/list-box/-/list-box-24.8.3.tgz",
-      "integrity": "sha512-QVmbw6J17hFxBPLcK5E3QjH4qo2t6qmJR2H4q22czfifFPLMxJ5EImLwHpNh434s73NCIKSlZqKSKI1q6r5Lpg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/list-box/-/list-box-24.8.6.tgz",
+      "integrity": "sha512-Pw9RhWt2UPwzMpgOU5gfxPCWwnw25ip5gshhGuUh8IsRlqQAHa9iIEgk8mt85hJvoaKQ19HKMWx2qAB7PMJdlA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/lit-renderer": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/lit-renderer/-/lit-renderer-24.8.3.tgz",
-      "integrity": "sha512-3753itYgp/TY81Nm5u7OrCUhsTgkxr19BvVo8O00wHWhQThZOS7bD6+N7pSH83XEG9pv8zQiY24kQBOeSzc0DQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/lit-renderer/-/lit-renderer-24.8.6.tgz",
+      "integrity": "sha512-mrIq+0EV/XEelTaNOxQ0EcSOp+uYRH2tL+nIF/Ct8qCOinndBbaIOeScNlCABB/0IH3ltPmrmtEHxDsExPy4lw==",
       "license": "Apache-2.0",
       "dependencies": {
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/login": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/login/-/login-24.8.3.tgz",
-      "integrity": "sha512-dBxY0gVU+wU89Nti6VLLm3LBTtcFVnG20CuXUywhBdyij1zVIcqQRoeN4VwRJVApdbfKngeyUrnYijegcVkhmg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/login/-/login-24.8.6.tgz",
+      "integrity": "sha512-D+3VYR6BWSAxozNG9Z+NSfC1V3XmxoxKNj6vkLs26eyuBxMkDAtbIO6+eKAfk+73U8PbO1+V4QnHeR2MM23eLA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/password-field": "~24.8.3",
-        "@vaadin/text-field": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/password-field": "~24.8.6",
+        "@vaadin/text-field": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/markdown": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/markdown/-/markdown-24.8.3.tgz",
-      "integrity": "sha512-R6VTyM7iunEcG7pfCi07r4uNO0o3fqOZhcE1LpO8/9zQfW+4WCVHr0bXRgrB2Uciu657W4elbz79pMwLa9eRTg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/markdown/-/markdown-24.8.6.tgz",
+      "integrity": "sha512-g+Hf+IkAnSgWpJ83URzbQ0+n6D4Xt0wh6zPuVv2rLAnFL8/krAhDE/mqPnKZ0HJV+72zJtT2qAvi8Gc+Nva4eg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "dompurify": "^3.2.5",
         "lit": "^3.0.0",
         "marked": "^15.0.11"
       }
     },
     "node_modules/@vaadin/master-detail-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/master-detail-layout/-/master-detail-layout-24.8.3.tgz",
-      "integrity": "sha512-o+GXpJYgwyZeZEPsnqK6qRFiu6YfnmHdnGYOo9srjeFHlDAwXSMmoJj1LQIqmZNNe2IaoTF+z2sX4C/pJKgXTQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/master-detail-layout/-/master-detail-layout-24.8.6.tgz",
+      "integrity": "sha512-cpetSApUbY9altW+FhI0O11gxWptjk35zM2YEUy0ZYsi7tb8+eHvY4k5Az1IDGdijoa++PBwwiW4Qh3Rkgf/HA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/menu-bar": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/menu-bar/-/menu-bar-24.8.3.tgz",
-      "integrity": "sha512-RFdcve68TfX/GbBEyhP6c6d/wF57hMS+3nRlyAyGwUMaqprn+ou+V60I5sQeWCfpigwEmRd7feyjtfKz+3o6Tw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/menu-bar/-/menu-bar-24.8.6.tgz",
+      "integrity": "sha512-m5g1w3XJTir8SIBqVnlGIcMHQXl8j8w3PnW+u9C/MC94Hgms10zYIplYeljS4RMq2wnfos+FO3Gcdp177JJMlg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/context-menu": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/list-box": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/context-menu": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/list-box": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/message-input": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/message-input/-/message-input-24.8.3.tgz",
-      "integrity": "sha512-dHX8xXobFn+2kmXU972+tICaSkQVtvnDofDrUw9L5RsWv9Fgr5O8iCkAPdj9fq3crDgZ88Xt6/mblG5AI/p9yg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/message-input/-/message-input-24.8.6.tgz",
+      "integrity": "sha512-+e6pnKHcJPvOcO71j71MEY75o4T1EKO7FgD0Vpg2h4fhJSfZJkWGrn3Dxckbf9kyyYBZnIqTX6votS9CbHKiXg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/text-area": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/text-area": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/message-list": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/message-list/-/message-list-24.8.3.tgz",
-      "integrity": "sha512-GOHrK+HF7IXfvoK0jIuB4VYW+aa0wk87fiBKvNiREIWYs+WGOYgeXuR2vf/KFwK+K7E/STgtAsHjFgfLuKVnvw==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/message-list/-/message-list-24.8.6.tgz",
+      "integrity": "sha512-pTEQiXiDEzMoeEWCIx03Tr9I8dhiRNrdT0ylyKaKlHxQgYGOA3RbVk4ArXVF+L7zhCyYefax2EjWlaCb2GhpSQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/avatar": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/markdown": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/avatar": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/markdown": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/multi-select-combo-box": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/multi-select-combo-box/-/multi-select-combo-box-24.8.3.tgz",
-      "integrity": "sha512-RE94wVnLQ13MSfLYa2ZkIUvKNVWR7Ey5sKMOx3O9sQU8vKQGiHLE1zDcToRv9FzlErRvUwvTcEBa1D4uMXjzbQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/multi-select-combo-box/-/multi-select-combo-box-24.8.6.tgz",
+      "integrity": "sha512-DaH2oco8QTZ2J09AN8k2XKIQefIS1FnHqevik9CffUaPDSx0jaFYcakK7SKrxXOVnDP/NapHLoDFhaZbfREjEw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/combo-box": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/combo-box": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/notification": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/notification/-/notification-24.8.3.tgz",
-      "integrity": "sha512-m+hX5dUcdd4zPgDLdP2tZaPNRDvl/IFUyVMiw7c+qO2apWKvD2q2QGLhyDQexqdidjvbVMlV6HEu8gPyYlxn0g==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/notification/-/notification-24.8.6.tgz",
+      "integrity": "sha512-NYjn6EcF6fKaq/ogULqrYh1GkJG7u+y9KeqeA4W4cjd0XI0fGPUVvqPoqdgds/6+DZWvjeCIWZqU4I5YZkBBig==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/number-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/number-field/-/number-field-24.8.3.tgz",
-      "integrity": "sha512-P9AYCtExCSJoq00ddn75W+7v5nJASH6kgxfzrw0EZo+5JK/w0dRIdqSiubycE0re6DwXo+EK4pcU9cqJ0MxirA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/number-field/-/number-field-24.8.6.tgz",
+      "integrity": "sha512-oCkN8w1OZnSPNBa/YE+50GuAgkNOhA/IDNVBqTtOD0749IsFdFL5VeT0w9a8wW5v29cWplCc09k4PZYXyNBQdw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/overlay": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/overlay/-/overlay-24.8.3.tgz",
-      "integrity": "sha512-y7RtDslU7J/wuwWVMZDgpXnOBa8fK92wXF29EVtSgwcNoZZnmyAgDgsIn2oM4U5Hxtta/F8uqtPWhXejczWehg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/overlay/-/overlay-24.8.6.tgz",
+      "integrity": "sha512-2nWoqUtW0/y6Q8mIwWK312oSkbOoUjw6+9u8amqBHZLkd8yWj9bvFwsPCrrUPhIlAtLPjXdLjMqCixEsAnTCbA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/password-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/password-field/-/password-field-24.8.3.tgz",
-      "integrity": "sha512-XMY7Cp7KBHqBhQkkU065bpvt5GdjKwPaJI1H8I7YuhbbxGVq3hZ1Hl5NMKfS+vcTj121orOoT/fFe/VkWv006w==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/password-field/-/password-field-24.8.6.tgz",
+      "integrity": "sha512-T3hQLeo+Dy6ElZZKpTzRYT35a3E9MBJt1iomLX2+zoi7oeUr2zJJeS34bOEIVXE4Oh6gKSn+q3NgHEXrXqkwBw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/text-field": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/text-field": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/polymer-legacy-adapter": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/polymer-legacy-adapter/-/polymer-legacy-adapter-24.8.3.tgz",
-      "integrity": "sha512-GN00ZA5TMEmh5Vf6/TpgEpdCsdR2XEXk0LYIuJwAahss/xpaWVPwE25tEmQPnHOAe0JGtnGljR4P0VzlMcjrZQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/polymer-legacy-adapter/-/polymer-legacy-adapter-24.8.6.tgz",
+      "integrity": "sha512-C17ElnaP0m0ae/ZGEBinj+ArcffPj1QZ4MFW0wW98z3XUdunS4HaUaE82OBH0Jcabmb1SkteJX9l/DpDg+Os8Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/popover": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/popover/-/popover-24.8.3.tgz",
-      "integrity": "sha512-2CecNUKJwyAf8UW2+PL//m6tysCUKw+pc9KKyMkxg9jVJGVQnnbJbSrV5qVJYgiDJFywSUDkcAiR8KWB9MsOyg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/popover/-/popover-24.8.6.tgz",
+      "integrity": "sha512-xHYbjzX4lodcip5TvF2zSnzoTrrbKgF3snqjaL8puftrG5DywV8uMvBw4pcRNiwBKkvpjCUfDDXngLuvWxPxpQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/progress-bar": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/progress-bar/-/progress-bar-24.8.3.tgz",
-      "integrity": "sha512-K1DwXf2Y93mnGLy8b1fqepwF7zP1rtLtTTAkehj4yvXO9s3iFoICFDZUMSUiS7fnHvbFaVznYalrDWajNqwdwA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/progress-bar/-/progress-bar-24.8.6.tgz",
+      "integrity": "sha512-62Fpp3sPc54c2L2EzkERsuUNMys4FOb2NWOal/iX1KrRLaXN+ObZ5JUGFZ7RlOlhSfuM03mvJw4wT0+kwzD75w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/radio-group": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/radio-group/-/radio-group-24.8.3.tgz",
-      "integrity": "sha512-cwgW7lHcpOnoh8ItpXXx4v6MwyN2xbjaFURunUWpQz/4ftkRtDB5qVcn8ObFhZfESN9UogVnHCEmZtnGodUHIg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/radio-group/-/radio-group-24.8.6.tgz",
+      "integrity": "sha512-qD9bd4AwDhyv3v0YZ4js0gUeHDz7D20yYp6MU1JFf2N7mTHkIkMuBJXX0ZUMzpmae0IypYngRJewHAWPCDgpCA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/react-components": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/react-components/-/react-components-24.8.3.tgz",
-      "integrity": "sha512-lvU9hdBnsZj+y2dvWTsJtWFZEcVAZtE8E2Hqw6EXvh7ClFjhzxfRoASCb51Bfh676yvaWPNOrd0k1x584cxQxQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/react-components/-/react-components-24.8.6.tgz",
+      "integrity": "sha512-mWFCwKgKTH3DZ73L52itbJyfTmwenctc/c1nheqTiL3KwpyAJr4Ql5NcSSM9DHQgt53KcM1xBTKdohrKE2rGNQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@lit/react": "^1.0.7",
-        "@vaadin/a11y-base": "24.8.3",
-        "@vaadin/accordion": "24.8.3",
-        "@vaadin/app-layout": "24.8.3",
-        "@vaadin/avatar": "24.8.3",
-        "@vaadin/avatar-group": "24.8.3",
-        "@vaadin/button": "24.8.3",
-        "@vaadin/card": "24.8.3",
-        "@vaadin/checkbox": "24.8.3",
-        "@vaadin/checkbox-group": "24.8.3",
-        "@vaadin/combo-box": "24.8.3",
-        "@vaadin/component-base": "24.8.3",
-        "@vaadin/confirm-dialog": "24.8.3",
-        "@vaadin/context-menu": "24.8.3",
-        "@vaadin/custom-field": "24.8.3",
-        "@vaadin/date-picker": "24.8.3",
-        "@vaadin/date-time-picker": "24.8.3",
-        "@vaadin/details": "24.8.3",
-        "@vaadin/dialog": "24.8.3",
-        "@vaadin/email-field": "24.8.3",
-        "@vaadin/field-base": "24.8.3",
-        "@vaadin/field-highlighter": "24.8.3",
-        "@vaadin/form-layout": "24.8.3",
-        "@vaadin/grid": "24.8.3",
-        "@vaadin/horizontal-layout": "24.8.3",
-        "@vaadin/icon": "24.8.3",
-        "@vaadin/icons": "24.8.3",
-        "@vaadin/input-container": "24.8.3",
-        "@vaadin/integer-field": "24.8.3",
-        "@vaadin/item": "24.8.3",
-        "@vaadin/list-box": "24.8.3",
-        "@vaadin/lit-renderer": "24.8.3",
-        "@vaadin/login": "24.8.3",
-        "@vaadin/markdown": "24.8.3",
-        "@vaadin/master-detail-layout": "24.8.3",
-        "@vaadin/menu-bar": "24.8.3",
-        "@vaadin/message-input": "24.8.3",
-        "@vaadin/message-list": "24.8.3",
-        "@vaadin/multi-select-combo-box": "24.8.3",
-        "@vaadin/notification": "24.8.3",
-        "@vaadin/number-field": "24.8.3",
-        "@vaadin/overlay": "24.8.3",
-        "@vaadin/password-field": "24.8.3",
-        "@vaadin/popover": "24.8.3",
-        "@vaadin/progress-bar": "24.8.3",
-        "@vaadin/radio-group": "24.8.3",
-        "@vaadin/scroller": "24.8.3",
-        "@vaadin/select": "24.8.3",
-        "@vaadin/side-nav": "24.8.3",
-        "@vaadin/split-layout": "24.8.3",
-        "@vaadin/tabs": "24.8.3",
-        "@vaadin/tabsheet": "24.8.3",
-        "@vaadin/text-area": "24.8.3",
-        "@vaadin/text-field": "24.8.3",
-        "@vaadin/time-picker": "24.8.3",
-        "@vaadin/tooltip": "24.8.3",
-        "@vaadin/upload": "24.8.3",
-        "@vaadin/vaadin-lumo-styles": "24.8.3",
-        "@vaadin/vaadin-material-styles": "24.8.3",
-        "@vaadin/vaadin-themable-mixin": "24.8.3",
-        "@vaadin/vertical-layout": "24.8.3",
-        "@vaadin/virtual-list": "24.8.3"
+        "@vaadin/a11y-base": "24.8.6",
+        "@vaadin/accordion": "24.8.6",
+        "@vaadin/app-layout": "24.8.6",
+        "@vaadin/avatar": "24.8.6",
+        "@vaadin/avatar-group": "24.8.6",
+        "@vaadin/button": "24.8.6",
+        "@vaadin/card": "24.8.6",
+        "@vaadin/checkbox": "24.8.6",
+        "@vaadin/checkbox-group": "24.8.6",
+        "@vaadin/combo-box": "24.8.6",
+        "@vaadin/component-base": "24.8.6",
+        "@vaadin/confirm-dialog": "24.8.6",
+        "@vaadin/context-menu": "24.8.6",
+        "@vaadin/custom-field": "24.8.6",
+        "@vaadin/date-picker": "24.8.6",
+        "@vaadin/date-time-picker": "24.8.6",
+        "@vaadin/details": "24.8.6",
+        "@vaadin/dialog": "24.8.6",
+        "@vaadin/email-field": "24.8.6",
+        "@vaadin/field-base": "24.8.6",
+        "@vaadin/field-highlighter": "24.8.6",
+        "@vaadin/form-layout": "24.8.6",
+        "@vaadin/grid": "24.8.6",
+        "@vaadin/horizontal-layout": "24.8.6",
+        "@vaadin/icon": "24.8.6",
+        "@vaadin/icons": "24.8.6",
+        "@vaadin/input-container": "24.8.6",
+        "@vaadin/integer-field": "24.8.6",
+        "@vaadin/item": "24.8.6",
+        "@vaadin/list-box": "24.8.6",
+        "@vaadin/lit-renderer": "24.8.6",
+        "@vaadin/login": "24.8.6",
+        "@vaadin/markdown": "24.8.6",
+        "@vaadin/master-detail-layout": "24.8.6",
+        "@vaadin/menu-bar": "24.8.6",
+        "@vaadin/message-input": "24.8.6",
+        "@vaadin/message-list": "24.8.6",
+        "@vaadin/multi-select-combo-box": "24.8.6",
+        "@vaadin/notification": "24.8.6",
+        "@vaadin/number-field": "24.8.6",
+        "@vaadin/overlay": "24.8.6",
+        "@vaadin/password-field": "24.8.6",
+        "@vaadin/popover": "24.8.6",
+        "@vaadin/progress-bar": "24.8.6",
+        "@vaadin/radio-group": "24.8.6",
+        "@vaadin/scroller": "24.8.6",
+        "@vaadin/select": "24.8.6",
+        "@vaadin/side-nav": "24.8.6",
+        "@vaadin/split-layout": "24.8.6",
+        "@vaadin/tabs": "24.8.6",
+        "@vaadin/tabsheet": "24.8.6",
+        "@vaadin/text-area": "24.8.6",
+        "@vaadin/text-field": "24.8.6",
+        "@vaadin/time-picker": "24.8.6",
+        "@vaadin/tooltip": "24.8.6",
+        "@vaadin/upload": "24.8.6",
+        "@vaadin/vaadin-lumo-styles": "24.8.6",
+        "@vaadin/vaadin-material-styles": "24.8.6",
+        "@vaadin/vaadin-themable-mixin": "24.8.6",
+        "@vaadin/vertical-layout": "24.8.6",
+        "@vaadin/virtual-list": "24.8.6"
       },
       "peerDependencies": {
         "@types/react": "^18.2.37 || ^19",
@@ -9048,197 +8763,197 @@
       }
     },
     "node_modules/@vaadin/scroller": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/scroller/-/scroller-24.8.3.tgz",
-      "integrity": "sha512-vUaDX+SvhWreLpGybjnsqgQa/rwrUqcyHNlsM4R+1Ki2h6zmL/iEtk9bDNuswx0XzXYq3rrept7NlkSrUXeQ9w==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/scroller/-/scroller-24.8.6.tgz",
+      "integrity": "sha512-skSvbsjUSY7DD565ygTFliLCjCL+5WRXUE6ErZy0zi0rbMaenfoVSD0yGz5Ryjxk2y4pZqq63Dn8keJDsb9B1w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/select": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/select/-/select-24.8.3.tgz",
-      "integrity": "sha512-Y1AHbzwDMZ+F2X593tjKMOm/JFjcye3IZcE75360eL0GyoQZ9Oy/Y4qqyVfttd/r2urcHoHplsCRoq/fTDOuyQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/select/-/select-24.8.6.tgz",
+      "integrity": "sha512-68CmCfEyx5bN9e63qLxshKcCB6++mNT3fo/IANAU6HyC97i5tTUZXcChO3hILqXJ7pVeR+h8NHudzd1IFPmtoQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.2.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/list-box": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/list-box": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/side-nav": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/side-nav/-/side-nav-24.8.3.tgz",
-      "integrity": "sha512-ztqLqItNtDGFohMgzw1LkEcSlUpb7arZ1UmWuLSt608XphvArTNPgzqbuqohwF8ZulofzieNvoIjYWkii0sH/w==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/side-nav/-/side-nav-24.8.6.tgz",
+      "integrity": "sha512-RD4gI4I8r9FNJZ2FqrpBkbnXVs5fiHOFwOF4fxgfD/lajac8yr/0Nwwktf6CPrCRRafHh78C2uEEk/YUfog2FA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/split-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/split-layout/-/split-layout-24.8.3.tgz",
-      "integrity": "sha512-PFnvLH+UEQF0ph0B/Ejt7Awn/c1TdBxbzyxLXC9wk8S4LY+wGD5XdmVZW017sMvVSs5jh9oaleSGe0vf0FUV0w==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/split-layout/-/split-layout-24.8.6.tgz",
+      "integrity": "sha512-zTm/vCS1xfbmIB2XRiChiREgEGsIAUIJ7w4qM2nZzeGXSePK0ZQm6/2AP3Qsekd6WJJu1kqO/6iTQ2a2DN7TLQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/tabs": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/tabs/-/tabs-24.8.3.tgz",
-      "integrity": "sha512-TGLAnEhjbPduIghR9euIUBQgkBd9TuY3piGU/7jvOr9gcoWm1r2DD85uSa/b43XCyCuNZwgQREWOKKbmzKn+Zg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/tabs/-/tabs-24.8.6.tgz",
+      "integrity": "sha512-F/Aa4o+bvI01Gibw38WgrxJodCc6vSLNs6CMaE72KbD7hmCgjjiDbhY2HHS99/q5sUtALWM0VP54HbqWqCuEkw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/tabsheet": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/tabsheet/-/tabsheet-24.8.3.tgz",
-      "integrity": "sha512-r8Gnmys+06nK6GdgbP9Ym+N4uqGqHEJ/FXdmLlpeOhCO6jpOF+ShpvVjqDu9VZ1fDyvg9VP1y/BuRBPDTGT2yA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/tabsheet/-/tabsheet-24.8.6.tgz",
+      "integrity": "sha512-oNO3T4Gxai3BwUWAveq5MNxAgM+bCu6Z8BwEwps3Hn08ps0GEPM5uv3RZHPW+GrrYP58tlk+OREHDgT1qyk4rw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/scroller": "~24.8.3",
-        "@vaadin/tabs": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/scroller": "~24.8.6",
+        "@vaadin/tabs": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/text-area": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/text-area/-/text-area-24.8.3.tgz",
-      "integrity": "sha512-MiQTGtTNL2Akbn6e1bM7MFaCwxESVTExZG3C/u2bc5/wc+YntUxGSk2hxU5G2BqX662ZfwVmt4skFmZAmofFZA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/text-area/-/text-area-24.8.6.tgz",
+      "integrity": "sha512-GFKGmG1mkF6VrzUk8XT1u3wJexM40BlO9REsDHGQw64y8UBVL9nKyCGVUv0SjJc/y5ECrZKHiKhVpho+QRb+2g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/text-field": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/text-field/-/text-field-24.8.3.tgz",
-      "integrity": "sha512-mJGjLFbbNgC4uhjQ9N1l3pfFBL4C4qRiRQWC/0SgDhwhOV1cyAy+wZ0p6sXpQ8jtgUnrGMg29ryv2bPS3vTtrA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/text-field/-/text-field-24.8.6.tgz",
+      "integrity": "sha512-nLw3Oi0hjHWFhqT0RUDOx6D7aT8drW+PM0vgcCa6Q1I0zZnYUnevtGzyZBOlD+XmveEiXNx3jHhXMwHeu2fOaA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/time-picker": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/time-picker/-/time-picker-24.8.3.tgz",
-      "integrity": "sha512-ehzyBkDdXexHOymPMSko4FA5WG+V1mybcGlic/i20EidXkh4V1xzEnRWM299mqEP/F9NgHejo8M7wKJrRJrybQ==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/time-picker/-/time-picker-24.8.6.tgz",
+      "integrity": "sha512-cxRVPZjprCwx+6+P6b2Ad9m6BFzZpsNAuQO8aL0fcdkIiG8jmKl3/KPNviB7LUlORMhsWr1dJIPU7GiyIKxrLA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/combo-box": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/field-base": "~24.8.3",
-        "@vaadin/input-container": "~24.8.3",
-        "@vaadin/item": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/combo-box": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/field-base": "~24.8.6",
+        "@vaadin/input-container": "~24.8.6",
+        "@vaadin/item": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/tooltip": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/tooltip/-/tooltip-24.8.3.tgz",
-      "integrity": "sha512-X0AEz3/+ZsxK2lpPTv4+3tuLpuE0sC5jkaDjkPXBDt0E/ad1i0AUOa8FgCpBEczYAPhA3WUVkjh/T0/k0K9S8g==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/tooltip/-/tooltip-24.8.6.tgz",
+      "integrity": "sha512-1xSQw5Wq0psKnl+HehmCWa/jKyofQyHGmTcJ3rtWDrqFr/dviIwx1n3TZu9FDeCSIRQxmIAdkErDYmouSdlOwA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/overlay": "~24.8.3",
-        "@vaadin/popover": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/overlay": "~24.8.6",
+        "@vaadin/popover": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/upload": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/upload/-/upload-24.8.3.tgz",
-      "integrity": "sha512-zDoXWDn1zYRivSL3Rs6kfVSaZuj2aLVvbH5tlxXTzj4ewfTxv5A3S6iZdIDQTlkh0Nw1JoXBX1LqjlwiD383dg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/upload/-/upload-24.8.6.tgz",
+      "integrity": "sha512-/1y8UT0UUdrypnyOPTVIejDpk6pPNPbqcPhqRGtCHKUHAAdZKVjCFMe6NT4kzTFqvEICdKCWOtC57yiwPk8WvA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/a11y-base": "~24.8.3",
-        "@vaadin/button": "~24.8.3",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/progress-bar": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/a11y-base": "~24.8.6",
+        "@vaadin/button": "~24.8.6",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/progress-bar": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
@@ -9249,32 +8964,32 @@
       "license": "Apache-2.0"
     },
     "node_modules/@vaadin/vaadin-lumo-styles": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-24.8.3.tgz",
-      "integrity": "sha512-vvcxwwtsrJgQeSeKGgTuMZ6VR8c/vIp7tBwcGg33PKdij83UKZwxMnnZjynvfQHzAxbE+TOa+uoYQJiI096JNg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-24.8.6.tgz",
+      "integrity": "sha512-b1db8UKEtzXPu9FWFwPZcydOkZvW9ApbeImWGBd/kn/gy1eeqwijF7slXdlwM7KrgoJJ/r+Rpok2nRYrbzp3xQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/icon": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3"
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/icon": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6"
       }
     },
     "node_modules/@vaadin/vaadin-material-styles": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-material-styles/-/vaadin-material-styles-24.8.3.tgz",
-      "integrity": "sha512-shg4u8qnKh9k6QhakTRrMNvxpaQSipWxIha3GFpckDi937j3mQNd8Fi6Fe9r+4OL362fjYK0679HeaTwC+GtKA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-material-styles/-/vaadin-material-styles-24.8.6.tgz",
+      "integrity": "sha512-69MwODqJ6ksiocutIG3dCTbPwrYKrZGN/To9YtYQzTuDt/3JsjmIRG2VLdvUVicKbdxnr6ZRRlPHoKGF5RS0RA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3"
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6"
       }
     },
     "node_modules/@vaadin/vaadin-themable-mixin": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-themable-mixin/-/vaadin-themable-mixin-24.8.3.tgz",
-      "integrity": "sha512-aYyMzxDF3OsDKmlxpuJNJIVPn8Yi4f/JJBmSOUUBrLmE4Z3+Ncr6F0aTMGVeeRbGDM7KAdJTYO5mM/ahJIxU+A==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/vaadin-themable-mixin/-/vaadin-themable-mixin-24.8.6.tgz",
+      "integrity": "sha512-CSJYyExRRk4o7ehjtlnGlhjXJgLAHqRTvXL3891STIB4syAgGuOFiHqWyyKr7CV6VFqa9DIHHkAXeZ9OeeIEVg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
@@ -9296,32 +9011,32 @@
       }
     },
     "node_modules/@vaadin/vertical-layout": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/vertical-layout/-/vertical-layout-24.8.3.tgz",
-      "integrity": "sha512-MjN36TbsjuKkc0X1B0bzXpMn8OaJiSaTss/KtK2iuuP9VZ/Ef8WWCzcQR165pwmFBRmsyJLoc+r2cH2z4XXAWg==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/vertical-layout/-/vertical-layout-24.8.6.tgz",
+      "integrity": "sha512-o5z9QYGaXghnspuzNWt20+4Xa5Fbdzlhs4Xuwj7CriS8+sXIi8ELuDpvBc0w3RPbWV7jm80PZciVAQWXFoTipQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
     "node_modules/@vaadin/virtual-list": {
-      "version": "24.8.3",
-      "resolved": "https://registry.npmjs.org/@vaadin/virtual-list/-/virtual-list-24.8.3.tgz",
-      "integrity": "sha512-ooXCM7a3VK31nmw28k9Fezbobk/qrL8+6L1ZMDRk7FD4aNKcyVUlU3oNU8uNaKl41Wvn+aEURnf9nLEl/pJnpA==",
+      "version": "24.8.6",
+      "resolved": "https://registry.npmjs.org/@vaadin/virtual-list/-/virtual-list-24.8.6.tgz",
+      "integrity": "sha512-H/5781WZunm3nGdfJ6PO1IWUUnRvdpKoJA+tmO6Ifdhe0j9weLSj5bczFrYcr/LMMGjXvWJdTN6oW3sp+jJN8A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@open-wc/dedupe-mixin": "^1.3.0",
         "@polymer/polymer": "^3.0.0",
-        "@vaadin/component-base": "~24.8.3",
-        "@vaadin/lit-renderer": "~24.8.3",
-        "@vaadin/vaadin-lumo-styles": "~24.8.3",
-        "@vaadin/vaadin-material-styles": "~24.8.3",
-        "@vaadin/vaadin-themable-mixin": "~24.8.3",
+        "@vaadin/component-base": "~24.8.6",
+        "@vaadin/lit-renderer": "~24.8.6",
+        "@vaadin/vaadin-lumo-styles": "~24.8.6",
+        "@vaadin/vaadin-material-styles": "~24.8.6",
+        "@vaadin/vaadin-themable-mixin": "~24.8.6",
         "lit": "^3.0.0"
       }
     },
@@ -14735,47 +14450,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rollup": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz",
-      "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/estree": "1.0.6"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.28.1",
-        "@rollup/rollup-android-arm64": "4.28.1",
-        "@rollup/rollup-darwin-arm64": "4.28.1",
-        "@rollup/rollup-darwin-x64": "4.28.1",
-        "@rollup/rollup-freebsd-arm64": "4.28.1",
-        "@rollup/rollup-freebsd-x64": "4.28.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.28.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.28.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.28.1",
-        "@rollup/rollup-linux-arm64-musl": "4.28.1",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.28.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.28.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.28.1",
-        "@rollup/rollup-linux-x64-gnu": "4.28.1",
-        "@rollup/rollup-linux-x64-musl": "4.28.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.28.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.28.1",
-        "@rollup/rollup-win32-x64-msvc": "4.28.1",
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/rollup-plugin-brotli": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/rollup-plugin-brotli/-/rollup-plugin-brotli-3.1.0.tgz",
diff --git a/app/package.json b/app/package.json
index 4d7345d..083306a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gameyfin",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "dependencies": {
     "@heroui/react": "2.7.9",
@@ -9,22 +9,22 @@
     "@polymer/polymer": "3.5.2",
     "@react-stately/data": "^3.12.2",
     "@react-types/shared": "^3.28.0",
-    "@vaadin/bundles": "24.8.3",
+    "@vaadin/bundles": "24.8.6",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-file-router": "24.8.2",
-    "@vaadin/hilla-frontend": "24.8.2",
-    "@vaadin/hilla-lit-form": "24.8.2",
-    "@vaadin/hilla-react-auth": "24.8.2",
-    "@vaadin/hilla-react-crud": "24.8.2",
-    "@vaadin/hilla-react-form": "24.8.2",
-    "@vaadin/hilla-react-i18n": "24.8.2",
-    "@vaadin/hilla-react-signals": "24.8.2",
-    "@vaadin/polymer-legacy-adapter": "24.8.3",
-    "@vaadin/react-components": "24.8.3",
+    "@vaadin/hilla-file-router": "24.8.7",
+    "@vaadin/hilla-frontend": "24.8.7",
+    "@vaadin/hilla-lit-form": "24.8.7",
+    "@vaadin/hilla-react-auth": "24.8.7",
+    "@vaadin/hilla-react-crud": "24.8.7",
+    "@vaadin/hilla-react-form": "24.8.7",
+    "@vaadin/hilla-react-i18n": "24.8.7",
+    "@vaadin/hilla-react-signals": "24.8.7",
+    "@vaadin/polymer-legacy-adapter": "24.8.6",
+    "@vaadin/react-components": "24.8.6",
     "@vaadin/vaadin-development-mode-detector": "2.0.7",
-    "@vaadin/vaadin-lumo-styles": "24.8.3",
-    "@vaadin/vaadin-material-styles": "24.8.3",
-    "@vaadin/vaadin-themable-mixin": "24.8.3",
+    "@vaadin/vaadin-lumo-styles": "24.8.6",
+    "@vaadin/vaadin-material-styles": "24.8.6",
+    "@vaadin/vaadin-themable-mixin": "24.8.6",
     "@vaadin/vaadin-usage-statistics": "2.1.3",
     "classnames": "^2.5.1",
     "construct-style-sheets-polyfill": "3.1.0",
@@ -61,17 +61,17 @@
     "@types/node": "^22.4.0",
     "@types/react": "18.3.23",
     "@types/react-dom": "18.3.7",
-    "@vaadin/hilla-generator-cli": "24.8.2",
-    "@vaadin/hilla-generator-core": "24.8.2",
-    "@vaadin/hilla-generator-plugin-backbone": "24.8.2",
-    "@vaadin/hilla-generator-plugin-barrel": "24.8.2",
-    "@vaadin/hilla-generator-plugin-client": "24.8.2",
-    "@vaadin/hilla-generator-plugin-model": "24.8.2",
-    "@vaadin/hilla-generator-plugin-push": "24.8.2",
-    "@vaadin/hilla-generator-plugin-signals": "24.8.2",
-    "@vaadin/hilla-generator-plugin-subtypes": "24.8.2",
-    "@vaadin/hilla-generator-plugin-transfertypes": "24.8.2",
-    "@vaadin/hilla-generator-utils": "24.8.2",
+    "@vaadin/hilla-generator-cli": "24.8.7",
+    "@vaadin/hilla-generator-core": "24.8.7",
+    "@vaadin/hilla-generator-plugin-backbone": "24.8.7",
+    "@vaadin/hilla-generator-plugin-barrel": "24.8.7",
+    "@vaadin/hilla-generator-plugin-client": "24.8.7",
+    "@vaadin/hilla-generator-plugin-model": "24.8.7",
+    "@vaadin/hilla-generator-plugin-push": "24.8.7",
+    "@vaadin/hilla-generator-plugin-signals": "24.8.7",
+    "@vaadin/hilla-generator-plugin-subtypes": "24.8.7",
+    "@vaadin/hilla-generator-plugin-transfertypes": "24.8.7",
+    "@vaadin/hilla-generator-utils": "24.8.7",
     "@vitejs/plugin-react": "4.5.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "async": "3.2.6",
@@ -142,85 +142,85 @@
     "valtio": "$valtio",
     "valtio-reactive": "$valtio-reactive",
     "fzf": "$fzf",
-    "@vaadin/a11y-base": "24.8.3",
-    "@vaadin/accordion": "24.8.3",
-    "@vaadin/app-layout": "24.8.3",
-    "@vaadin/avatar": "24.8.3",
-    "@vaadin/avatar-group": "24.8.3",
-    "@vaadin/button": "24.8.3",
-    "@vaadin/card": "24.8.3",
-    "@vaadin/checkbox": "24.8.3",
-    "@vaadin/checkbox-group": "24.8.3",
-    "@vaadin/combo-box": "24.8.3",
-    "@vaadin/component-base": "24.8.3",
-    "@vaadin/confirm-dialog": "24.8.3",
-    "@vaadin/context-menu": "24.8.3",
-    "@vaadin/custom-field": "24.8.3",
-    "@vaadin/date-picker": "24.8.3",
-    "@vaadin/date-time-picker": "24.8.3",
-    "@vaadin/details": "24.8.3",
-    "@vaadin/dialog": "24.8.3",
-    "@vaadin/email-field": "24.8.3",
-    "@vaadin/field-base": "24.8.3",
-    "@vaadin/field-highlighter": "24.8.3",
-    "@vaadin/form-layout": "24.8.3",
-    "@vaadin/grid": "24.8.3",
-    "@vaadin/horizontal-layout": "24.8.3",
-    "@vaadin/icon": "24.8.3",
-    "@vaadin/icons": "24.8.3",
-    "@vaadin/input-container": "24.8.3",
-    "@vaadin/integer-field": "24.8.3",
-    "@vaadin/item": "24.8.3",
-    "@vaadin/list-box": "24.8.3",
-    "@vaadin/lit-renderer": "24.8.3",
-    "@vaadin/login": "24.8.3",
-    "@vaadin/markdown": "24.8.3",
-    "@vaadin/master-detail-layout": "24.8.3",
-    "@vaadin/menu-bar": "24.8.3",
-    "@vaadin/message-input": "24.8.3",
-    "@vaadin/message-list": "24.8.3",
-    "@vaadin/multi-select-combo-box": "24.8.3",
-    "@vaadin/notification": "24.8.3",
-    "@vaadin/number-field": "24.8.3",
-    "@vaadin/overlay": "24.8.3",
-    "@vaadin/password-field": "24.8.3",
-    "@vaadin/popover": "24.8.3",
-    "@vaadin/progress-bar": "24.8.3",
-    "@vaadin/radio-group": "24.8.3",
-    "@vaadin/scroller": "24.8.3",
-    "@vaadin/select": "24.8.3",
-    "@vaadin/side-nav": "24.8.3",
-    "@vaadin/split-layout": "24.8.3",
-    "@vaadin/tabs": "24.8.3",
-    "@vaadin/tabsheet": "24.8.3",
-    "@vaadin/text-area": "24.8.3",
-    "@vaadin/text-field": "24.8.3",
-    "@vaadin/time-picker": "24.8.3",
-    "@vaadin/tooltip": "24.8.3",
-    "@vaadin/upload": "24.8.3",
+    "@vaadin/a11y-base": "24.8.6",
+    "@vaadin/accordion": "24.8.6",
+    "@vaadin/app-layout": "24.8.6",
+    "@vaadin/avatar": "24.8.6",
+    "@vaadin/avatar-group": "24.8.6",
+    "@vaadin/button": "24.8.6",
+    "@vaadin/card": "24.8.6",
+    "@vaadin/checkbox": "24.8.6",
+    "@vaadin/checkbox-group": "24.8.6",
+    "@vaadin/combo-box": "24.8.6",
+    "@vaadin/component-base": "24.8.6",
+    "@vaadin/confirm-dialog": "24.8.6",
+    "@vaadin/context-menu": "24.8.6",
+    "@vaadin/custom-field": "24.8.6",
+    "@vaadin/date-picker": "24.8.6",
+    "@vaadin/date-time-picker": "24.8.6",
+    "@vaadin/details": "24.8.6",
+    "@vaadin/dialog": "24.8.6",
+    "@vaadin/email-field": "24.8.6",
+    "@vaadin/field-base": "24.8.6",
+    "@vaadin/field-highlighter": "24.8.6",
+    "@vaadin/form-layout": "24.8.6",
+    "@vaadin/grid": "24.8.6",
+    "@vaadin/horizontal-layout": "24.8.6",
+    "@vaadin/icon": "24.8.6",
+    "@vaadin/icons": "24.8.6",
+    "@vaadin/input-container": "24.8.6",
+    "@vaadin/integer-field": "24.8.6",
+    "@vaadin/item": "24.8.6",
+    "@vaadin/list-box": "24.8.6",
+    "@vaadin/lit-renderer": "24.8.6",
+    "@vaadin/login": "24.8.6",
+    "@vaadin/markdown": "24.8.6",
+    "@vaadin/master-detail-layout": "24.8.6",
+    "@vaadin/menu-bar": "24.8.6",
+    "@vaadin/message-input": "24.8.6",
+    "@vaadin/message-list": "24.8.6",
+    "@vaadin/multi-select-combo-box": "24.8.6",
+    "@vaadin/notification": "24.8.6",
+    "@vaadin/number-field": "24.8.6",
+    "@vaadin/overlay": "24.8.6",
+    "@vaadin/password-field": "24.8.6",
+    "@vaadin/popover": "24.8.6",
+    "@vaadin/progress-bar": "24.8.6",
+    "@vaadin/radio-group": "24.8.6",
+    "@vaadin/scroller": "24.8.6",
+    "@vaadin/select": "24.8.6",
+    "@vaadin/side-nav": "24.8.6",
+    "@vaadin/split-layout": "24.8.6",
+    "@vaadin/tabs": "24.8.6",
+    "@vaadin/tabsheet": "24.8.6",
+    "@vaadin/text-area": "24.8.6",
+    "@vaadin/text-field": "24.8.6",
+    "@vaadin/time-picker": "24.8.6",
+    "@vaadin/tooltip": "24.8.6",
+    "@vaadin/upload": "24.8.6",
     "@vaadin/router": "2.0.0",
-    "@vaadin/vertical-layout": "24.8.3",
-    "@vaadin/virtual-list": "24.8.3"
+    "@vaadin/vertical-layout": "24.8.6",
+    "@vaadin/virtual-list": "24.8.6"
   },
   "vaadin": {
     "dependencies": {
       "@polymer/polymer": "3.5.2",
-      "@vaadin/bundles": "24.8.3",
+      "@vaadin/bundles": "24.8.6",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.8.2",
-      "@vaadin/hilla-frontend": "24.8.2",
-      "@vaadin/hilla-lit-form": "24.8.2",
-      "@vaadin/hilla-react-auth": "24.8.2",
-      "@vaadin/hilla-react-crud": "24.8.2",
-      "@vaadin/hilla-react-form": "24.8.2",
-      "@vaadin/hilla-react-i18n": "24.8.2",
-      "@vaadin/hilla-react-signals": "24.8.2",
-      "@vaadin/polymer-legacy-adapter": "24.8.3",
-      "@vaadin/react-components": "24.8.3",
+      "@vaadin/hilla-file-router": "24.8.7",
+      "@vaadin/hilla-frontend": "24.8.7",
+      "@vaadin/hilla-lit-form": "24.8.7",
+      "@vaadin/hilla-react-auth": "24.8.7",
+      "@vaadin/hilla-react-crud": "24.8.7",
+      "@vaadin/hilla-react-form": "24.8.7",
+      "@vaadin/hilla-react-i18n": "24.8.7",
+      "@vaadin/hilla-react-signals": "24.8.7",
+      "@vaadin/polymer-legacy-adapter": "24.8.6",
+      "@vaadin/react-components": "24.8.6",
       "@vaadin/vaadin-development-mode-detector": "2.0.7",
-      "@vaadin/vaadin-lumo-styles": "24.8.3",
-      "@vaadin/vaadin-material-styles": "24.8.3",
-      "@vaadin/vaadin-themable-mixin": "24.8.3",
+      "@vaadin/vaadin-lumo-styles": "24.8.6",
+      "@vaadin/vaadin-material-styles": "24.8.6",
+      "@vaadin/vaadin-themable-mixin": "24.8.6",
       "@vaadin/vaadin-usage-statistics": "2.1.3",
       "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.29.3",
@@ -236,17 +236,17 @@
       "@rollup/pluginutils": "5.1.4",
       "@types/react": "18.3.23",
       "@types/react-dom": "18.3.7",
-      "@vaadin/hilla-generator-cli": "24.8.2",
-      "@vaadin/hilla-generator-core": "24.8.2",
-      "@vaadin/hilla-generator-plugin-backbone": "24.8.2",
-      "@vaadin/hilla-generator-plugin-barrel": "24.8.2",
-      "@vaadin/hilla-generator-plugin-client": "24.8.2",
-      "@vaadin/hilla-generator-plugin-model": "24.8.2",
-      "@vaadin/hilla-generator-plugin-push": "24.8.2",
-      "@vaadin/hilla-generator-plugin-signals": "24.8.2",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.8.2",
-      "@vaadin/hilla-generator-plugin-transfertypes": "24.8.2",
-      "@vaadin/hilla-generator-utils": "24.8.2",
+      "@vaadin/hilla-generator-cli": "24.8.7",
+      "@vaadin/hilla-generator-core": "24.8.7",
+      "@vaadin/hilla-generator-plugin-backbone": "24.8.7",
+      "@vaadin/hilla-generator-plugin-barrel": "24.8.7",
+      "@vaadin/hilla-generator-plugin-client": "24.8.7",
+      "@vaadin/hilla-generator-plugin-model": "24.8.7",
+      "@vaadin/hilla-generator-plugin-push": "24.8.7",
+      "@vaadin/hilla-generator-plugin-signals": "24.8.7",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.8.7",
+      "@vaadin/hilla-generator-plugin-transfertypes": "24.8.7",
+      "@vaadin/hilla-generator-utils": "24.8.7",
       "@vitejs/plugin-react": "4.5.0",
       "async": "3.2.6",
       "glob": "11.0.2",
@@ -263,6 +263,6 @@
       "workbox-precaching": "7.3.0"
     },
     "disableUsageStatistics": true,
-    "hash": "962eccc3fa0735d5234901be4f9e384096113c45bec22564a53688096d62aef4"
+    "hash": "e499c8893c397649c698f302e100ee1e48833c88e57bd0829fbf86dc5a14cfd8"
   }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/frontend/App.tsx b/app/src/main/frontend/App.tsx
index 01f759e..4cee138 100644
--- a/app/src/main/frontend/App.tsx
+++ b/app/src/main/frontend/App.tsx
@@ -15,6 +15,7 @@ import {initializePluginState} from "Frontend/state/PluginState";
 import {isAdmin} from "Frontend/util/utils";
 import {useRouteMetadata} from "Frontend/util/routing";
 import {useEffect} from "react";
+import {initializeGameRequestState} from "Frontend/state/GameRequestState";
 
 export default function App() {
     client.middlewares = [ErrorHandlingMiddleware];
@@ -45,10 +46,11 @@ function ViewWithAuth() {
 
         initializeLibraryState();
         initializeGameState();
+        initializeGameRequestState();
+        initializePluginState();
 
         if (isAdmin(auth)) {
             initializeScanState();
-            initializePluginState();
         }
     }, [auth]);
 
diff --git a/app/src/main/frontend/components/administration/GameRequestManagement.tsx b/app/src/main/frontend/components/administration/GameRequestManagement.tsx
new file mode 100644
index 0000000..5e87a32
--- /dev/null
+++ b/app/src/main/frontend/components/administration/GameRequestManagement.tsx
@@ -0,0 +1,49 @@
+import React from "react";
+import withConfigPage from "Frontend/components/administration/withConfigPage";
+import * as Yup from 'yup';
+import ConfigFormField from "Frontend/components/administration/ConfigFormField";
+import Section from "Frontend/components/general/Section";
+import {Button} from "@heroui/react";
+import {useNavigate} from "react-router";
+
+function GameRequestManagementLayout({getConfig, formik}: any) {
+    const navigate = useNavigate();
+
+    return (
+        <div className="flex flex-col">
+            <div className="flex flex-row">
+                <div className="flex flex-col flex-1">
+                    <Section title="Game requests configuration"/>
+                    <ConfigFormField configElement={getConfig("requests.games.enabled")}/>
+
+                    <Section title="Permissions"/>
+                    <div className="flex flex-row items-center gap-4">
+                        <ConfigFormField
+                            configElement={getConfig("requests.games.allow-guests-to-request-games")}
+                            isDisabled={!formik.values.library["allow-public-access"]}/>
+                        <ConfigFormField configElement={getConfig("requests.games.max-open-requests-per-user")}/>
+                    </div>
+
+                    <Button onPress={() => navigate("/requests")}>
+                        Manage game requests
+                    </Button>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+const validationSchema = Yup.object({
+    requests: Yup.object({
+        games: Yup.object({
+            enabled: Yup.boolean().required("Required"),
+            "allow-guests-to-request-games": Yup.boolean().required("Required"),
+            "max-open-requests-per-user": Yup.number()
+                .min(0, "Must be at least 0")
+                .max(Number.MAX_SAFE_INTEGER, `Must be lower than ${Number.MAX_SAFE_INTEGER}`)
+                .required("Required"),
+        }).required("Required"),
+    }).required("Required"),
+});
+
+export const GameRequestManagement = withConfigPage(GameRequestManagementLayout, "Game Requests", validationSchema);
\ No newline at end of file
diff --git a/app/src/main/frontend/components/administration/SsoManagement.tsx b/app/src/main/frontend/components/administration/SsoManagement.tsx
index 7db75e9..f873d8b 100644
--- a/app/src/main/frontend/components/administration/SsoManagement.tsx
+++ b/app/src/main/frontend/components/administration/SsoManagement.tsx
@@ -49,7 +49,7 @@ function SsoManagementLayout({getConfig, formik, setSaveMessage}: any) {
                     <ConfigFormField configElement={getConfig("sso.oidc.enabled")}/>
 
                     <Section title="SSO user handling"/>
-                    <div className="flex flex-row items-baseline">
+                    <div className="flex flex-row items-baseline mb-4">
                         <CheckboxGroup className="flex flex-col flex-1 items-baseline gap-2"
                                        value={["auto-register-new-users"]}>
                             <div className="flex flex-row gap-2">
@@ -70,6 +70,13 @@ function SsoManagementLayout({getConfig, formik, setSaveMessage}: any) {
                                              !formik.values.sso.oidc["auto-register-new-users"]}/>
                     </div>
 
+                    <div className="flex flex-row items-center gap-4">
+                        <ConfigFormField configElement={getConfig("sso.oidc.roles-claim")}
+                                         isDisabled={!formik.values.sso.oidc.enabled}/>
+                        <ConfigFormField configElement={getConfig("sso.oidc.oauth-scopes")}
+                                         isDisabled={!formik.values.sso.oidc.enabled}/>
+                    </div>
+
                     <Section title="SSO provider configuration"/>
                     <ConfigFormField configElement={getConfig("sso.oidc.client-id")}
                                      isDisabled={!formik.values.sso.oidc.enabled}/>
diff --git a/app/src/main/frontend/components/administration/SystemManagement.tsx b/app/src/main/frontend/components/administration/SystemManagement.tsx
index 0057fde..54246ed 100644
--- a/app/src/main/frontend/components/administration/SystemManagement.tsx
+++ b/app/src/main/frontend/components/administration/SystemManagement.tsx
@@ -1,14 +1,25 @@
 import React from "react";
 import {SystemEndpoint} from "Frontend/generated/endpoints";
 import withConfigPage from "Frontend/components/administration/withConfigPage";
-import {Button} from "@heroui/react";
+import {addToast, Button} from "@heroui/react";
 import Section from "Frontend/components/general/Section";
 
 function SystemManagementLayout() {
+
+    function restart() {
+        SystemEndpoint.restart().then(() =>
+            addToast({
+                title: "Restarting",
+                description: "Gameyfin is restarting. This may take a few moments.",
+                color: "success"
+            })
+        );
+    }
+
     return (
         <div className="flex flex-col mt-4">
             <Section title="Restart Gameyfin"/>
-            <Button onPress={() => SystemEndpoint.restart()}>Restart</Button>
+            <Button onPress={restart}>Restart</Button>
         </div>
     );
 }
diff --git a/app/src/main/frontend/components/administration/UserManagement.tsx b/app/src/main/frontend/components/administration/UserManagement.tsx
index 4c38313..99a4f69 100644
--- a/app/src/main/frontend/components/administration/UserManagement.tsx
+++ b/app/src/main/frontend/components/administration/UserManagement.tsx
@@ -3,16 +3,16 @@ import ConfigFormField from "Frontend/components/administration/ConfigFormField"
 import withConfigPage from "Frontend/components/administration/withConfigPage";
 import Section from "Frontend/components/general/Section";
 import {UserEndpoint} from "Frontend/generated/endpoints";
-import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto";
 import {UserManagementCard} from "Frontend/components/general/cards/UserManagementCard";
 import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
 import {Info, UserPlus} from "@phosphor-icons/react";
 import {Button, Divider, Tooltip, useDisclosure} from "@heroui/react";
 import InviteUserModal from "Frontend/components/general/modals/InviteUserModal";
+import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto";
 
 function UserManagementLayout({getConfig, formik}: any) {
     const inviteUserModal = useDisclosure();
-    const [users, setUsers] = useState<UserInfoDto[]>([]);
+    const [users, setUsers] = useState<ExtendedUserInfoDto[]>([]);
 
     useEffect(() => {
         UserEndpoint.getAllUsers().then(
diff --git a/app/src/main/frontend/components/general/Avatar.tsx b/app/src/main/frontend/components/general/Avatar.tsx
index 78df1de..7f1d217 100644
--- a/app/src/main/frontend/components/general/Avatar.tsx
+++ b/app/src/main/frontend/components/general/Avatar.tsx
@@ -15,13 +15,22 @@ const Avatar = ({...props}) => {
     }
 
     // TODO: Check if avatar can be loaded from SSO
-    return (
-        <NextUiAvatar
-            showFallback
-            src={`/images/avatar?username=${username}`}
-            {...props}
-        />
-    );
+    if (auth.state.user?.hasAvatar) {
+        return (
+            <NextUiAvatar
+                showFallback
+                src={`/images/avatar?username=${username}`}
+                {...props}
+            />
+        );
+    } else {
+        return (
+            <NextUiAvatar
+                showFallback
+                {...props}
+            />
+        );
+    }
 }
 
 export default Avatar;
\ No newline at end of file
diff --git a/app/src/main/frontend/components/general/cards/UserManagementCard.tsx b/app/src/main/frontend/components/general/cards/UserManagementCard.tsx
index 5521e35..5d75a38 100644
--- a/app/src/main/frontend/components/general/cards/UserManagementCard.tsx
+++ b/app/src/main/frontend/components/general/cards/UserManagementCard.tsx
@@ -1,17 +1,17 @@
-import {Card, Dropdown, DropdownItem, DropdownMenu, DropdownTrigger, useDisclosure} from "@heroui/react";
+import {Button, Card, Dropdown, DropdownItem, DropdownMenu, DropdownTrigger, useDisclosure} from "@heroui/react";
 import {DotsThreeVertical} from "@phosphor-icons/react";
-import {useEffect, useState} from "react";
+import React, {useEffect, useState} from "react";
 import {MessageEndpoint, PasswordResetEndpoint, UserEndpoint} from "Frontend/generated/endpoints";
 import {AvatarEndpoint} from "Frontend/endpoints/endpoints";
 import Avatar from "Frontend/components/general/Avatar";
 import ConfirmUserDeletionModal from "Frontend/components/general/modals/ConfirmUserDeletionModal";
 import PasswordResetTokenModal from "Frontend/components/general/modals/PasswortResetTokenModal";
 import TokenDto from "Frontend/generated/org/gameyfin/app/shared/token/TokenDto";
-import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto";
 import RoleChip from "Frontend/components/general/RoleChip";
 import AssignRolesModal from "Frontend/components/general/modals/AssignRolesModal";
+import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto";
 
-export function UserManagementCard({user}: { user: UserInfoDto }) {
+export function UserManagementCard({user}: { user: ExtendedUserInfoDto }) {
     const userDeletionConfirmationModal = useDisclosure();
     const passwordResetTokenModal = useDisclosure();
     const roleAssignmentModal = useDisclosure();
@@ -108,6 +108,27 @@ export function UserManagementCard({user}: { user: UserInfoDto }) {
         <>
             <Card
                 className={`flex flex-row justify-between p-2 ${userEnabled ? "" : "bg-warning/25"} ${user.managedBySso ? "text-foreground/50" : ""}`}>
+                <div className="absolute right-0 top-0">
+                    <Dropdown placement="bottom-end" size="sm" backdrop="opaque">
+                        <DropdownTrigger>
+                            <Button isIconOnly variant="light">
+                                <DotsThreeVertical/>
+                            </Button>
+                        </DropdownTrigger>
+                        <DropdownMenu aria-label="Static Actions" items={dropdownItems} disabledKeys={disabledKeys}>
+                            {(item) => (
+                                <DropdownItem
+                                    key={item.key}
+                                    onPress={item.onPress}
+                                    color={item.key === "delete" ? "danger" : "default"}
+                                    className={item.key === "delete" ? "text-danger" : ""}
+                                >
+                                    {item.label}
+                                </DropdownItem>
+                            )}
+                        </DropdownMenu>
+                    </Dropdown>
+                </div>
                 <div className="flex flex-row items-center gap-4">
                     <Avatar username={user.username}
                             name={user.username?.charAt(0)}
@@ -118,30 +139,12 @@ export function UserManagementCard({user}: { user: UserInfoDto }) {
                             }}/>
                     <div className="flex flex-col gap-1">
                         <p className="font-semibold">{user.username}</p>
-                        <p className="text-sm">{user.email}</p>
+                        <p className="text-sm max-w-44 truncate" title={user.email}>{user.email}</p>
                         {user.roles?.map((role) => (
-                            <RoleChip role={role as string}/>
+                            <RoleChip key={role} role={role as string}/>
                         ))}
                     </div>
                 </div>
-
-                <Dropdown placement="bottom-end" size="sm" backdrop="opaque">
-                    <DropdownTrigger>
-                        <DotsThreeVertical cursor="pointer"/>
-                    </DropdownTrigger>
-                    <DropdownMenu aria-label="Static Actions" items={dropdownItems} disabledKeys={disabledKeys}>
-                        {(item) => (
-                            <DropdownItem
-                                key={item.key}
-                                onPress={item.onPress}
-                                color={item.key === "delete" ? "danger" : "default"}
-                                className={item.key === "delete" ? "text-danger" : ""}
-                            >
-                                {item.label}
-                            </DropdownItem>
-                        )}
-                    </DropdownMenu>
-                </Dropdown>
             </Card>
             <ConfirmUserDeletionModal isOpen={userDeletionConfirmationModal.isOpen}
                                       onOpenChange={userDeletionConfirmationModal.onOpenChange}
diff --git a/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx b/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx
index 58598c1..2fda413 100644
--- a/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx
+++ b/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx
@@ -12,14 +12,14 @@ import {
     SelectItem
 } from "@heroui/react";
 import {UserEndpoint} from "Frontend/generated/endpoints";
-import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto";
 import RoleChip from "Frontend/components/general/RoleChip";
 import RoleAssignmentResult from "Frontend/generated/org/gameyfin/app/users/enums/RoleAssignmentResult";
+import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto";
 
 interface AssignRolesModalProps {
     isOpen: boolean;
     onOpenChange: () => void;
-    user: UserInfoDto;
+    user: ExtendedUserInfoDto;
 }
 
 interface Role {
diff --git a/app/src/main/frontend/components/general/modals/MatchGameModal.tsx b/app/src/main/frontend/components/general/modals/MatchGameModal.tsx
index f484648..6343ece 100644
--- a/app/src/main/frontend/components/general/modals/MatchGameModal.tsx
+++ b/app/src/main/frontend/components/general/modals/MatchGameModal.tsx
@@ -21,7 +21,7 @@ import {useSnapshot} from "valtio/react";
 import {pluginState} from "Frontend/state/PluginState";
 import PluginDto from "Frontend/generated/org/gameyfin/app/core/plugins/dto/PluginDto";
 
-interface EditGameMetadataModalProps {
+interface MatchGameModalProps {
     path: string;
     libraryId: number;
     replaceGameId?: number;
@@ -37,7 +37,7 @@ export default function MatchGameModal({
                                            initialSearchTerm,
                                            isOpen,
                                            onOpenChange
-                                       }: EditGameMetadataModalProps) {
+                                       }: MatchGameModalProps) {
     const [searchTerm, setSearchTerm] = useState("");
     const [searchResults, setSearchResults] = useState<GameSearchResultDto[]>([]);
     const [isSearching, setIsSearching] = useState(false);
diff --git a/app/src/main/frontend/components/general/modals/RequestGameModal.tsx b/app/src/main/frontend/components/general/modals/RequestGameModal.tsx
new file mode 100644
index 0000000..19d09f0
--- /dev/null
+++ b/app/src/main/frontend/components/general/modals/RequestGameModal.tsx
@@ -0,0 +1,168 @@
+import {
+    addToast,
+    Button,
+    Input,
+    Modal,
+    ModalBody,
+    ModalContent,
+    Table,
+    TableBody,
+    TableCell,
+    TableColumn,
+    TableHeader,
+    TableRow,
+    Tooltip
+} from "@heroui/react";
+import React, {useEffect, useState} from "react";
+import {ArrowRight, MagnifyingGlass} from "@phosphor-icons/react";
+import {GameEndpoint, GameRequestEndpoint} from "Frontend/generated/endpoints";
+import GameSearchResultDto from "Frontend/generated/org/gameyfin/app/games/dto/GameSearchResultDto";
+import PluginIcon from "../plugin/PluginIcon";
+import {useSnapshot} from "valtio/react";
+import {pluginState} from "Frontend/state/PluginState";
+import PluginDto from "Frontend/generated/org/gameyfin/app/core/plugins/dto/PluginDto";
+import GameRequestCreationDto from "Frontend/generated/org/gameyfin/app/requests/dto/GameRequestCreationDto";
+
+interface RequestGameModalProps {
+    isOpen: boolean;
+    onOpenChange: () => void;
+}
+
+export default function RequestGameModal({
+                                             isOpen,
+                                             onOpenChange
+                                         }: RequestGameModalProps) {
+    const [searchTerm, setSearchTerm] = useState("");
+    const [searchResults, setSearchResults] = useState<GameSearchResultDto[]>([]);
+    const [isSearching, setIsSearching] = useState(false);
+    const [isRequesting, setIsRequesting] = useState<string | null>(null);
+
+    const plugins = useSnapshot(pluginState).state;
+
+    useEffect(() => {
+        setSearchTerm("");
+        setSearchResults([]);
+    }, [isOpen]);
+
+    async function requestGame(game: GameSearchResultDto) {
+        const request: GameRequestCreationDto = {
+            title: game.title,
+            release: game.release
+        }
+
+        try {
+            await GameRequestEndpoint.create(request);
+
+            addToast({
+                title: "Request submitted",
+                description: `Your request for "${game.title}" has been submitted.`,
+                color: "success"
+            });
+        } catch (e) {
+            setIsSearching(false);
+            setIsRequesting(null);
+        }
+    }
+
+    async function search() {
+        setIsSearching(true);
+        const results = await GameEndpoint.getPotentialMatches(searchTerm);
+        setSearchResults(results);
+        setIsSearching(false);
+    }
+
+    return (
+        <Modal isOpen={isOpen} onOpenChange={onOpenChange}
+               hideCloseButton
+               isDismissable={!isSearching && !isRequesting}
+               isKeyboardDismissDisabled={!isSearching && !isRequesting}
+               backdrop="opaque" size="5xl">
+            <ModalContent>
+                {(onClose) => (
+                    <ModalBody className="my-4">
+                        <div className="flex flex-col items-center">
+                            <h2 className="text-xl font-semibold">Request a game</h2>
+                        </div>
+                        <div className="flex flex-row gap-2 mb-4">
+                            <Input value={searchTerm}
+                                   onValueChange={setSearchTerm}
+                                   onKeyDown={async (e) => {
+                                       if (e.key === "Enter") {
+                                           e.preventDefault();
+                                           await search();
+                                       }
+                                   }}
+                            />
+                            <Button isIconOnly onPress={search} color="primary" isLoading={isSearching}>
+                                <MagnifyingGlass/>
+                            </Button>
+                        </div>
+
+                        <div>
+                            <Table removeWrapper isStriped isHeaderSticky
+                                   classNames={{
+                                       base: "h-80 overflow-y-auto",
+                                   }}
+                            >
+                                <TableHeader>
+                                    <TableColumn>Title & Release</TableColumn>
+                                    <TableColumn>Developer(s)</TableColumn>
+                                    <TableColumn>Publisher(s)</TableColumn>
+                                    {/* width={1} keeps the column as far to the right as possible*/}
+                                    <TableColumn>Sources</TableColumn>
+                                    <TableColumn width={1}> </TableColumn>
+                                </TableHeader>
+                                <TableBody emptyContent="Your search did not match any games." items={searchResults}>
+                                    {(item) => (
+                                        <TableRow key={item.id}>
+                                            <TableCell>
+                                                {item.title} ({item.release ? new Date(item.release).getFullYear() : "unknown"})
+                                            </TableCell>
+                                            <TableCell>
+                                                <div className="flex flex-col">
+                                                    {item.developers ? item.developers.map(
+                                                        developer => <p>{developer}</p>
+                                                    ) : "unknown"}
+                                                </div>
+                                            </TableCell>
+                                            <TableCell>
+                                                <div className="flex flex-col">
+                                                    {item.publishers ? item.publishers.map(
+                                                        publisher => <p>{publisher}</p>
+                                                    ) : "unknown"}
+                                                </div>
+                                            </TableCell>
+                                            <TableCell>
+                                                <div className="flex flex-row gap-2">
+                                                    {Object.values(item.originalIds).map(
+                                                        originalId => <PluginIcon
+                                                            plugin={plugins[originalId.pluginId] as PluginDto}/>
+                                                    )}
+                                                </div>
+                                            </TableCell>
+                                            <TableCell>
+                                                <Tooltip content="Pick this result">
+                                                    <Button isIconOnly size="sm"
+                                                            isDisabled={isRequesting !== null}
+                                                            isLoading={isRequesting === item.id}
+                                                            onPress={async () => {
+                                                                setIsRequesting(item.id);
+                                                                await requestGame(item);
+                                                                setIsRequesting(null);
+                                                                onClose();
+                                                            }}>
+                                                        <ArrowRight/>
+                                                    </Button>
+                                                </Tooltip>
+                                            </TableCell>
+                                        </TableRow>
+                                    )}
+                                </TableBody>
+                            </Table>
+                        </div>
+                    </ModalBody>
+                )}
+            </ModalContent>
+        </Modal>
+    );
+}
\ No newline at end of file
diff --git a/app/src/main/frontend/routes.tsx b/app/src/main/frontend/routes.tsx
index 75a9ccc..d06ef14 100644
--- a/app/src/main/frontend/routes.tsx
+++ b/app/src/main/frontend/routes.tsx
@@ -24,6 +24,8 @@ import RecentlyAddedView from "Frontend/views/RecentlyAddedView";
 import LibraryView from "Frontend/views/LibraryView";
 import {RouterConfigurationBuilder} from "@vaadin/hilla-file-router/runtime.js";
 import ErrorView from "Frontend/views/ErrorView";
+import GameRequestView from "Frontend/views/GameRequestView";
+import {GameRequestManagement} from "Frontend/components/administration/GameRequestManagement";
 
 export const {router, routes} = new RouterConfigurationBuilder()
     .withReactRoutes([
@@ -47,6 +49,11 @@ export const {router, routes} = new RouterConfigurationBuilder()
                             element: <RecentlyAddedView/>,
                             handle: {title: 'Recently Added'}
                         },
+                        {
+                            path: '/requests',
+                            element: <GameRequestView/>,
+                            handle: {title: 'Game requests'}
+                        },
                         {
                             path: 'library/:libraryId',
                             element: <LibraryView/>
@@ -87,6 +94,11 @@ export const {router, routes} = new RouterConfigurationBuilder()
                                     element: <LibraryManagementView/>,
                                     handle: {title: 'Administration - Library'}
                                 },
+                                {
+                                    path: 'requests',
+                                    element: <GameRequestManagement/>,
+                                    handle: {title: 'Administration - Game Requests'}
+                                },
                                 {
                                     path: 'users',
                                     element: <UserManagement/>,
diff --git a/app/src/main/frontend/state/GameRequestState.ts b/app/src/main/frontend/state/GameRequestState.ts
new file mode 100644
index 0000000..bdf0dfa
--- /dev/null
+++ b/app/src/main/frontend/state/GameRequestState.ts
@@ -0,0 +1,56 @@
+import {Subscription} from "@vaadin/hilla-frontend";
+import {proxy} from "valtio/index";
+import {GameRequestEndpoint} from "Frontend/generated/endpoints";
+import GameRequestEvent from "Frontend/generated/org/gameyfin/app/requests/dto/GameRequestEvent";
+import GameRequestDto from "Frontend/generated/org/gameyfin/app/requests/dto/GameRequestDto";
+
+type GameRequestState = {
+    subscription?: Subscription<GameRequestEvent[]>;
+    isLoaded: boolean;
+    state: Record<number, GameRequestDto>;
+    gameRequests: GameRequestDto[];
+};
+
+export const gameRequestState = proxy<GameRequestState>({
+    get isLoaded() {
+        return this.subscription != null;
+    },
+    state: {},
+    get gameRequests() {
+        return Object.values<GameRequestDto>(this.state);
+    }
+});
+
+/** Subscribe to and process state updates from backend **/
+export async function initializeGameRequestState() {
+    if (gameRequestState.isLoaded) return;
+
+    // Fetch initial game request list
+    const initialEntries = await GameRequestEndpoint.getAll();
+    initialEntries.forEach((gameRequest: GameRequestDto) => {
+        gameRequestState.state[gameRequest.id] = gameRequest;
+    });
+
+    // Subscribe to real-time updates
+    gameRequestState.subscription = GameRequestEndpoint.subscribe().onNext((gameRequestEvents: GameRequestEvent[]) => {
+        gameRequestEvents.forEach((gameRequestEvent: GameRequestEvent) => {
+            switch (gameRequestEvent.type) {
+                case "created":
+                case "updated":
+                    //@ts-ignore
+                    gameRequestState.state[gameRequestEvent.gameRequest.id] = gameRequestEvent.gameRequest;
+                    break;
+                case "deleted":
+                    //@ts-ignore
+                    delete gameRequestState.state[gameRequestEvent.gameRequestId];
+                    break;
+            }
+        })
+    });
+}
+
+
+
+
+
+
diff --git a/app/src/main/frontend/views/AdministrationView.tsx b/app/src/main/frontend/views/AdministrationView.tsx
index 456bdb5..b20d14d 100644
--- a/app/src/main/frontend/views/AdministrationView.tsx
+++ b/app/src/main/frontend/views/AdministrationView.tsx
@@ -1,4 +1,4 @@
-import {Envelope, GameController, LockKey, Log, Plug, Users, Wrench} from "@phosphor-icons/react";
+import {Disc, Envelope, GameController, LockKey, Log, Plug, Users, Wrench} from "@phosphor-icons/react";
 import withSideMenu, {MenuItem} from "Frontend/components/general/withSideMenu";
 
 const menuItems: MenuItem[] = [
@@ -7,6 +7,11 @@ const menuItems: MenuItem[] = [
         url: "libraries",
         icon: <GameController/>
     },
+    {
+        title: "Game Requests",
+        url: "requests",
+        icon: <Disc/>
+    },
     {
         title: "Users",
         url: "users",
diff --git a/app/src/main/frontend/views/GameRequestView.tsx b/app/src/main/frontend/views/GameRequestView.tsx
new file mode 100644
index 0000000..03a784a
--- /dev/null
+++ b/app/src/main/frontend/views/GameRequestView.tsx
@@ -0,0 +1,301 @@
+import {
+    Button,
+    Chip,
+    Input,
+    Pagination,
+    Select,
+    SelectItem,
+    SortDescriptor,
+    Table,
+    TableBody,
+    TableCell,
+    TableColumn,
+    TableHeader,
+    TableRow,
+    Tooltip,
+    useDisclosure
+} from "@heroui/react";
+import RequestGameModal from "Frontend/components/general/modals/RequestGameModal";
+import {ArrowUp, Check, Info, PlusCircle, Trash, X} from "@phosphor-icons/react";
+import React, {useEffect, useMemo, useState} from "react";
+import {useAuth} from "Frontend/util/auth";
+import {ConfigEndpoint, GameRequestEndpoint} from "Frontend/generated/endpoints";
+import {gameRequestState} from "Frontend/state/GameRequestState";
+import {useSnapshot} from "valtio/react";
+import GameRequestDto from "Frontend/generated/org/gameyfin/app/requests/dto/GameRequestDto";
+import GameRequestStatus from "Frontend/generated/org/gameyfin/app/requests/status/GameRequestStatus";
+import {isAdmin} from "Frontend/util/utils";
+import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
+
+export default function GameRequestView() {
+    const rowsPerPage = 25;
+
+    const auth = useAuth();
+    const requestGameModal = useDisclosure();
+    const gameRequests = useSnapshot(gameRequestState).gameRequests;
+
+    const [areGameRequestsEnabled, setAreGameRequestsEnabled] = useState(false);
+
+    useEffect(() => {
+        ConfigEndpoint.areGameRequestsEnabled().then(setAreGameRequestsEnabled);
+    }, []);
+
+    const [searchTerm, setSearchTerm] = useState("");
+    const [filters, setFilters] = useState<"all" | GameRequestStatus[]>([GameRequestStatus.PENDING, GameRequestStatus.APPROVED, GameRequestStatus.REJECTED]);
+    const [sortDescriptor, setSortDescriptor] = useState<SortDescriptor>({column: "votes", direction: "descending"});
+
+    const [page, setPage] = useState(1);
+    const pages = useMemo(() => {
+        return Math.ceil(getFilteredRequests().length / rowsPerPage);
+    }, [gameRequests, filters]);
+
+    const filteredItems = useMemo(() => {
+        return getFilteredRequests();
+    }, [gameRequests, filters, searchTerm]);
+
+    const sortedItems = useMemo(() => {
+        return (filteredItems as GameRequestDto[]).slice().sort((a, b) => {
+            let cmp: number;
+
+            switch (sortDescriptor.column) {
+                case "title":
+                    cmp = a.title.localeCompare(b.title);
+                    break;
+                case "votes":
+                    cmp = a.voters.length - b.voters.length;
+                    if (cmp === 0) {
+                        // If votes are equal, sort by creation date (newest first)
+                        cmp = new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+                    }
+                    break;
+                case "status":
+                    const statusOrder = {
+                        [GameRequestStatus.PENDING]: 1,
+                        [GameRequestStatus.APPROVED]: 2,
+                        [GameRequestStatus.REJECTED]: 3,
+                        [GameRequestStatus.FULFILLED]: 4
+                    };
+                    cmp = (statusOrder[a.status] || 99) - (statusOrder[b.status] || 99);
+                    break;
+                case "createdAt":
+                    cmp = new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+                    break;
+                case "updatedAt":
+                    cmp = new Date(a.updatedAt).getTime() - new Date(b.updatedAt).getTime();
+                    break;
+                default:
+                    return 0; // No sorting if the column is not recognized
+            }
+
+            if (sortDescriptor.direction === "descending") {
+                cmp *= -1; // Reverse the comparison if sorting in descending order
+            }
+
+            return cmp;
+        });
+    }, [filteredItems, sortDescriptor]);
+
+    const pagedItems = useMemo(() => {
+        const start = (page - 1) * rowsPerPage;
+        const end = start + rowsPerPage;
+        return sortedItems.slice(start, end);
+    }, [page, sortedItems]);
+
+    function getFilteredRequests() {
+        let filteredRequests = (gameRequests as GameRequestDto[]).filter((gameRequest) => {
+            return gameRequest.title.toLowerCase().includes(searchTerm.toLowerCase()) ||
+                (gameRequest.requester && gameRequest.requester.username.toLowerCase().includes(searchTerm.toLowerCase()));
+        });
+
+        filteredRequests = filteredRequests.filter((gameRequest) => {
+            return filters.includes(gameRequest.status);
+        });
+
+        return filteredRequests;
+    }
+
+    async function toggleVote(gameRequestId: number) {
+        await GameRequestEndpoint.toggleVote(gameRequestId);
+    }
+
+    async function toggleApprove(gameRequest: GameRequestDto) {
+        if (gameRequest.status == GameRequestStatus.FULFILLED) return;
+        const newStatus = gameRequest.status === GameRequestStatus.APPROVED ? GameRequestStatus.PENDING : GameRequestStatus.APPROVED;
+        await GameRequestEndpoint.changeStatus(gameRequest.id, newStatus);
+    }
+
+    async function toggleReject(gameRequest: GameRequestDto) {
+        if (gameRequest.status == GameRequestStatus.FULFILLED) return;
+        const newStatus = gameRequest.status === GameRequestStatus.REJECTED ? GameRequestStatus.PENDING : GameRequestStatus.REJECTED;
+        await GameRequestEndpoint.changeStatus(gameRequest.id, newStatus);
+    }
+
+    async function deleteRequest(gameRequestId: number) {
+        await GameRequestEndpoint.delete(gameRequestId);
+    }
+
+    function hasUserVotedForRequest(gameRequest: GameRequestDto): boolean {
+        if (!auth.state.user) return false;
+        return gameRequest.voters.map(v => v.id).includes(auth.state.user.id);
+    }
+
+    function statusToBadge(status: GameRequestStatus) {
+        switch (status) {
+            case GameRequestStatus.APPROVED:
+                return <Chip size="sm" radius="sm"
+                             className="text-xs bg-success-300 text-success-foreground">Approved</Chip>;
+            case GameRequestStatus.FULFILLED:
+                return <Chip size="sm" radius="sm" className="text-xs bg-success">Fulfilled</Chip>;
+            case GameRequestStatus.REJECTED:
+                return <Chip size="sm" radius="sm"
+                             className="text-xs bg-danger-300 text-danger-foreground">Rejected</Chip>;
+            case GameRequestStatus.PENDING:
+            default:
+                return <Chip size="sm" radius="sm" className="text-xs">Pending</Chip>;
+        }
+    }
+
+    return (<>
+        <div className="flex flex-row justify-between mb-8">
+            <h1 className="text-2xl font-bold">Game Requests</h1>
+            <div className="flex flex-row items-center gap-4">
+                {!areGameRequestsEnabled &&
+                    <SmallInfoField icon={Info}
+                                    message="Request submission is disabled"
+                                    className="text-foreground/70"/>
+                }
+                <Button className="w-fit"
+                        color="primary"
+                        startContent={<PlusCircle weight="fill"/>}
+                        onPress={requestGameModal.onOpen}
+                        isDisabled={!areGameRequestsEnabled}>
+                    Request a Game
+                </Button>
+            </div>
+        </div>
+
+
+        <div className="flex flex-row gap-2 justify-between mb-4">
+            <Input
+                className="w-96"
+                isClearable
+                placeholder="Search"
+                value={searchTerm}
+                onChange={(e) => setSearchTerm(e.target.value)}
+                onClear={() => setSearchTerm("")}
+            />
+            <Select
+                selectedKeys={filters}
+                onSelectionChange={keys => setFilters(Array.from(keys) as any)}
+                selectionMode="multiple"
+                className="w-64"
+            >
+                <SelectItem key={GameRequestStatus.PENDING}>Pending</SelectItem>
+                <SelectItem key={GameRequestStatus.APPROVED}>Approved</SelectItem>
+                <SelectItem key={GameRequestStatus.REJECTED}>Rejected</SelectItem>
+                <SelectItem key={GameRequestStatus.FULFILLED}>Fulfilled</SelectItem>
+            </Select>
+        </div>
+
+        <Table removeWrapper isStriped
+               sortDescriptor={sortDescriptor}
+               onSortChange={setSortDescriptor}
+               bottomContent={
+                   <div className="flex w-full justify-center sticky">
+                       {pagedItems.length > 0 &&
+                           <Pagination
+                               isCompact
+                               showControls
+                               showShadow
+                               color="primary"
+                               page={page}
+                               total={pages}
+                               onChange={(page) => setPage(page)}
+                           />}
+                   </div>
+               }
+        >
+            <TableHeader>
+                <TableColumn key="title" allowsSorting>Title & Release</TableColumn>
+                <TableColumn>Submitted by</TableColumn>
+                <TableColumn key="createdAt" allowsSorting>Submitted</TableColumn>
+                <TableColumn key="updatedAt" allowsSorting>Updated</TableColumn>
+                <TableColumn key="status" allowsSorting>Status</TableColumn>
+                {/* width={1} keeps the column as far to the right as possible*/}
+                <TableColumn key="votes" allowsSorting width={1}>Votes</TableColumn>
+            </TableHeader>
+            <TableBody emptyContent="Your search did not match any requests." items={pagedItems}>
+                {(item) => (
+                    <TableRow key={item.id}>
+                        <TableCell>
+                            {item.title} ({item.release ? new Date(item.release).getFullYear() : "unknown"})
+                        </TableCell>
+                        <TableCell>
+                            <p className="text-foreground/70">
+                                {item.requester ?
+                                    item.requester.username :
+                                    "Guest"
+                                }
+                            </p>
+                        </TableCell>
+                        <TableCell>
+                            {new Date(item.createdAt).toLocaleDateString()}
+                        </TableCell>
+                        <TableCell>
+                            {new Date(item.updatedAt).toLocaleDateString()}
+                        </TableCell>
+                        <TableCell className="min-w-24">
+                            {statusToBadge(item.status)}
+                        </TableCell>
+                        <TableCell>
+                            <div className="flex flex-row gap-2">
+                                <Tooltip content="Vote for this request">
+                                    <Button size="sm"
+                                            variant={hasUserVotedForRequest(item as GameRequestDto) ? "solid" : "bordered"}
+                                            color={hasUserVotedForRequest(item as GameRequestDto) ? "primary" : "default"}
+                                            isDisabled={!auth.state.user || item.status === GameRequestStatus.FULFILLED}
+                                            startContent={<ArrowUp/>}
+                                            onPress={async () => await toggleVote(item.id)}>
+                                        {item.voters.length}
+                                    </Button>
+                                </Tooltip>
+                                {isAdmin(auth) && <div className="flex flex-row gap-2">
+                                    <Tooltip content="Approve this request">
+                                        <Button size="sm" isIconOnly
+                                                variant={item.status === GameRequestStatus.APPROVED ? "solid" : "bordered"}
+                                                color={item.status === GameRequestStatus.APPROVED ? "primary" : "default"}
+                                                isDisabled={item.status === GameRequestStatus.FULFILLED}
+                                                onPress={async () => await toggleApprove(item as GameRequestDto)}>
+                                            <Check/>
+                                        </Button>
+                                    </Tooltip>
+                                    <Tooltip content="Reject this request">
+                                        <Button size="sm" isIconOnly
+                                                variant={item.status === GameRequestStatus.REJECTED ? "solid" : "bordered"}
+                                                color={item.status === GameRequestStatus.REJECTED ? "primary" : "default"}
+                                                isDisabled={item.status === GameRequestStatus.FULFILLED}
+                                                onPress={async () => await toggleReject(item as GameRequestDto)}>
+                                            <X/>
+                                        </Button>
+                                    </Tooltip>
+                                </div>}
+                                {(isAdmin(auth) || (auth.state.user && item.requester && auth.state.user.id === item.requester.id)) &&
+                                    <Tooltip content="Delete this request">
+                                        <Button size="sm" isIconOnly
+                                                color="danger"
+                                                onPress={async () => await deleteRequest(item.id)}>
+                                            <Trash/>
+                                        </Button>
+                                    </Tooltip>
+                                }
+                            </div>
+                        </TableCell>
+                    </TableRow>
+                )}
+            </TableBody>
+        </Table>
+
+        <RequestGameModal isOpen={requestGameModal.isOpen}
+                          onOpenChange={requestGameModal.onOpenChange}/>
+    </>)
+}
\ No newline at end of file
diff --git a/app/src/main/frontend/views/GameView.tsx b/app/src/main/frontend/views/GameView.tsx
index 4ef6d24..44ac19e 100644
--- a/app/src/main/frontend/views/GameView.tsx
+++ b/app/src/main/frontend/views/GameView.tsx
@@ -46,7 +46,7 @@ export default function GameView() {
             }, {} as Record<string, ComboButtonOption>);
             setDownloadOptions(options);
         });
-    }, []);
+    }, [gameId]);
 
     useEffect(() => {
         if (state.isLoaded && (!gameId || !state.state[parseInt(gameId)])) {
diff --git a/app/src/main/frontend/views/MainLayout.tsx b/app/src/main/frontend/views/MainLayout.tsx
index a0d632e..4a00641 100644
--- a/app/src/main/frontend/views/MainLayout.tsx
+++ b/app/src/main/frontend/views/MainLayout.tsx
@@ -5,7 +5,7 @@ import GameyfinLogo from "Frontend/components/theming/GameyfinLogo";
 import * as PackageJson from "../../../../package.json";
 import {Outlet, useLocation, useNavigate} from "react-router";
 import {useAuth} from "Frontend/util/auth";
-import {ArrowLeft, DiceSix, Heart, House, ListMagnifyingGlass, SignIn} from "@phosphor-icons/react";
+import {ArrowLeft, DiceSix, Disc, Heart, House, ListMagnifyingGlass, SignIn} from "@phosphor-icons/react";
 import Confetti, {ConfettiProps} from "react-confetti-boom";
 import {useTheme} from "next-themes";
 import {useUserPreferenceService} from "Frontend/util/user-preference-service";
@@ -93,10 +93,26 @@ export default function MainLayout() {
                         </Button>
                     </Tooltip>
                 </NavbarContent>}
-                <NavbarContent justify="end">
+                <NavbarContent justify="end" className="items-center">
+                    {auth.state.user &&
+                        <NavbarItem>
+                            <Tooltip content="Request a game" placement="bottom">
+                                <Button color="primary"
+                                        isDisabled={window.location.pathname.startsWith("/requests")}
+                                        onPress={() => navigate("/requests")}
+                                        startContent={<Disc weight="fill"/>}>
+                                    Requests
+                                </Button>
+                            </Tooltip>
+                        </NavbarItem>
+                    }
                     {isAdmin(auth) &&
                         <NavbarItem>
-                            <ScanProgressPopover/>
+                            <Tooltip content="View library scan results" placement="bottom">
+                                <div>
+                                    <ScanProgressPopover/>
+                                </div>
+                            </Tooltip>
                         </NavbarItem>
                     }
                     {auth.state.user &&
diff --git a/app/src/main/kotlin/org/gameyfin/app/config/ConfigEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/config/ConfigEndpoint.kt
index 50ddede..395c038 100644
--- a/app/src/main/kotlin/org/gameyfin/app/config/ConfigEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/config/ConfigEndpoint.kt
@@ -55,4 +55,8 @@ class ConfigEndpoint(
     @DynamicPublicAccess
     @AnonymousAllowed
     fun isPublicAccessEnabled(): Boolean = configService.get(ConfigProperties.Libraries.AllowPublicAccess) == true
+
+    @DynamicPublicAccess
+    @AnonymousAllowed
+    fun areGameRequestsEnabled(): Boolean = configService.get(ConfigProperties.Requests.Games.Enabled) == true
 }
diff --git a/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt b/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt
index 23e928e..aed0e99 100644
--- a/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/config/ConfigProperties.kt
@@ -103,6 +103,32 @@ sealed class ConfigProperties<T : Serializable>(
         }
     }
 
+    /** Requests */
+    sealed class Requests {
+        sealed class Games {
+            data object Enabled : ConfigProperties<Boolean>(
+                Boolean::class,
+                "requests.games.enabled",
+                "Enable submission of game requests",
+                true
+            )
+
+            data object AllowGuestsToRequestGames : ConfigProperties<Boolean>(
+                Boolean::class,
+                "requests.games.allow-guests-to-request-games",
+                "Allow guests (not logged in) to create game requests",
+                false
+            )
+
+            data object MaxOpenRequestsPerUser : ConfigProperties<Int>(
+                Int::class,
+                "requests.games.max-open-requests-per-user",
+                "Maximum number of pending requests per user. Set to 0 for unlimited.",
+                10
+            )
+        }
+    }
+
     /** User management */
     sealed class Users {
         sealed class SignUps {
@@ -147,6 +173,20 @@ sealed class ConfigProperties<T : Serializable>(
                 true
             )
 
+            data object RolesClaim : ConfigProperties<String>(
+                String::class,
+                "sso.oidc.roles-claim",
+                "JWT claim to extract roles from",
+                "roles"
+            )
+
+            data object OAuthScopes : ConfigProperties<Array<String>>(
+                Array<String>::class,
+                "sso.oidc.oauth-scopes",
+                "OAuth2 scopes to request",
+                arrayOf("openid", "profile", "email", "roles")
+            )
+
             data object ClientId : ConfigProperties<String>(
                 String::class,
                 "sso.oidc.client-id",
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/Role.kt b/app/src/main/kotlin/org/gameyfin/app/core/Role.kt
index 0401300..76b33a4 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/Role.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/Role.kt
@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonValue
 import org.gameyfin.app.users.RoleService
 import java.lang.Enum
+import kotlin.Int
+import kotlin.String
 
 enum class Role(val roleName: String, val powerLevel: Int) {
 
@@ -21,12 +23,12 @@ enum class Role(val roleName: String, val powerLevel: Int) {
         @JsonCreator
         @JvmStatic
         fun fromValue(value: String): Role? {
-            val enumString = value.removePrefix(RoleService.Companion.INTERNAL_ROLE_PREFIX)
+            val enumString = value.removePrefix(RoleService.INTERNAL_ROLE_PREFIX)
             return entries.find { it.roleName == enumString }
         }
 
         fun safeValueOf(type: String): Role? {
-            val enumString = type.removePrefix(RoleService.Companion.INTERNAL_ROLE_PREFIX)
+            val enumString = type.removePrefix(RoleService.INTERNAL_ROLE_PREFIX)
             return Enum.valueOf(Role::class.java, enumString)
         }
     }
@@ -34,9 +36,9 @@ enum class Role(val roleName: String, val powerLevel: Int) {
     // necessary for the ability to use the Roles class in the @RolesAllowed annotation
     class Names {
         companion object {
-            const val SUPERADMIN = "${RoleService.Companion.INTERNAL_ROLE_PREFIX}SUPERADMIN"
-            const val ADMIN = "${RoleService.Companion.INTERNAL_ROLE_PREFIX}ADMIN"
-            const val USER = "${RoleService.Companion.INTERNAL_ROLE_PREFIX}USER"
+            const val SUPERADMIN = "${RoleService.INTERNAL_ROLE_PREFIX}SUPERADMIN"
+            const val ADMIN = "${RoleService.INTERNAL_ROLE_PREFIX}ADMIN"
+            const val USER = "${RoleService.INTERNAL_ROLE_PREFIX}USER"
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/events/Events.kt b/app/src/main/kotlin/org/gameyfin/app/core/events/Events.kt
index 1e30da0..f201ef6 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/events/Events.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/events/Events.kt
@@ -1,5 +1,6 @@
 package org.gameyfin.app.core.events
 
+import org.gameyfin.app.games.entities.Game
 import org.gameyfin.app.shared.token.Token
 import org.gameyfin.app.shared.token.TokenType
 import org.gameyfin.app.users.entities.User
@@ -23,4 +24,6 @@ class PasswordResetRequestEvent(source: Any, val token: Token<TokenType.Password
 
 class AccountDeletedEvent(source: Any, val user: User, val baseUrl: String) : ApplicationEvent(source)
 
-class LibraryScanScheduleUpdatedEvent(source: Any) : ApplicationEvent(source)
\ No newline at end of file
+class LibraryScanScheduleUpdatedEvent(source: Any) : ApplicationEvent(source)
+
+class GameCreatedEvent(source: Any, val game: Game) : ApplicationEvent(source)
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/filesystem/FilesystemService.kt b/app/src/main/kotlin/org/gameyfin/app/core/filesystem/FilesystemService.kt
index f126d77..3d81dab 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/filesystem/FilesystemService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/filesystem/FilesystemService.kt
@@ -1,10 +1,10 @@
 package org.gameyfin.app.core.filesystem
 
-import org.gameyfin.app.config.ConfigService
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.io.FilenameUtils
 import org.gameyfin.app.config.ConfigProperties
-import org.gameyfin.app.libraries.Library
+import org.gameyfin.app.config.ConfigService
+import org.gameyfin.app.libraries.entities.Library
 import org.springframework.stereotype.Service
 import java.io.File
 import java.nio.file.FileSystems
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/plugins/PluginEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/core/plugins/PluginEndpoint.kt
index 94be2f4..049db72 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/plugins/PluginEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/plugins/PluginEndpoint.kt
@@ -1,41 +1,46 @@
 package org.gameyfin.app.core.plugins
 
+import com.vaadin.flow.server.auth.AnonymousAllowed
 import com.vaadin.hilla.Endpoint
-import jakarta.annotation.security.PermitAll
 import jakarta.annotation.security.RolesAllowed
 import org.gameyfin.app.core.Role
+import org.gameyfin.app.core.annotations.DynamicPublicAccess
 import org.gameyfin.app.core.plugins.dto.PluginUpdateDto
-import org.gameyfin.app.core.security.isCurrentUserAdmin
 import org.gameyfin.pluginapi.core.config.PluginConfigValidationResult
 import reactor.core.publisher.Flux
 
 @Endpoint
-@RolesAllowed(Role.Names.ADMIN)
+@DynamicPublicAccess
+@AnonymousAllowed
 class PluginEndpoint(
     private val pluginService: PluginService,
 ) {
 
-    @PermitAll
     fun subscribe(): Flux<List<PluginUpdateDto>> {
-        return if (isCurrentUserAdmin()) PluginService.subscribe()
-        else Flux.empty()
+        return PluginService.subscribe()
     }
 
     fun getAll() = pluginService.getAll().sortedByDescending { it.priority }
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun enablePlugin(pluginId: String) = pluginService.enablePlugin(pluginId)
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun disablePlugin(pluginId: String) = pluginService.disablePlugin(pluginId)
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun setPluginPriorities(pluginPriorities: Map<String, Int>) =
         pluginService.setPluginPriorities(pluginPriorities)
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun validatePluginConfig(pluginId: String): PluginConfigValidationResult =
         pluginService.validatePluginConfig(pluginId, true)
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun validateNewConfig(pluginId: String, config: Map<String, String>): PluginConfigValidationResult =
         pluginService.validatePluginConfig(pluginId, config)
 
+    @RolesAllowed(Role.Names.ADMIN)
     fun updateConfig(pluginId: String, updatedConfig: Map<String, String>) =
         pluginService.updateConfig(pluginId, updatedConfig)
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/plugins/dto/ExternalProviderIdDto.kt b/app/src/main/kotlin/org/gameyfin/app/core/plugins/dto/ExternalProviderIdDto.kt
new file mode 100644
index 0000000..5881d5c
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/core/plugins/dto/ExternalProviderIdDto.kt
@@ -0,0 +1,10 @@
+package org.gameyfin.app.core.plugins.dto
+
+class ExternalProviderIdDto(
+    val pluginId: String,
+    val externalProviderId: String,
+) {
+    override fun toString(): String {
+        return "$pluginId:$externalProviderId"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt
index 08df09c..23933d9 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityConfig.kt
@@ -53,6 +53,7 @@ class SecurityConfig(
                 .requestMatchers("/game/**").access(DynamicPublicAccessAuthorizationManager(config))
                 .requestMatchers("/library/**").access(DynamicPublicAccessAuthorizationManager(config))
                 .requestMatchers("/search/**").access(DynamicPublicAccessAuthorizationManager(config))
+                .requestMatchers("/requests/**").access(DynamicPublicAccessAuthorizationManager(config))
                 .requestMatchers("/download/**").access(DynamicPublicAccessAuthorizationManager(config))
         }
 
@@ -98,7 +99,7 @@ class SecurityConfig(
         val clientRegistration = ClientRegistration.withRegistrationId(SSO_PROVIDER_KEY)
             .clientId(config.get(ConfigProperties.SSO.OIDC.ClientId))
             .clientSecret(config.get(ConfigProperties.SSO.OIDC.ClientSecret))
-            .scope("openid", "profile", "email")
+            .scope(config.get(ConfigProperties.SSO.OIDC.OAuthScopes)?.toList())
             .userNameAttributeName("preferred_username")
             .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
             .issuerUri(config.get(ConfigProperties.SSO.OIDC.IssuerUrl))
diff --git a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityUtils.kt b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityUtils.kt
index 1b0adf1..385162b 100644
--- a/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityUtils.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/core/security/SecurityUtils.kt
@@ -1,9 +1,17 @@
 package org.gameyfin.app.core.security
 
 import org.gameyfin.app.core.Role
+import org.springframework.security.core.Authentication
 import org.springframework.security.core.context.SecurityContextHolder
 
+fun getCurrentAuth(): Authentication? {
+    return SecurityContextHolder.getContext().authentication
+}
+
 fun isCurrentUserAdmin(): Boolean {
-    return SecurityContextHolder.getContext().authentication?.authorities?.any { it.authority == Role.Names.ADMIN || it.authority == Role.Names.SUPERADMIN }
-        ?: false
+    return getCurrentAuth()?.isAdmin() ?: false
+}
+
+fun Authentication.isAdmin(): Boolean {
+    return this.authorities?.any { it.authority == Role.Names.ADMIN || it.authority == Role.Names.SUPERADMIN } ?: false
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/GameEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/games/GameEndpoint.kt
index 5ecd8dd..e7ec428 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/GameEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/GameEndpoint.kt
@@ -5,8 +5,12 @@ import com.vaadin.hilla.Endpoint
 import jakarta.annotation.security.RolesAllowed
 import org.gameyfin.app.core.Role
 import org.gameyfin.app.core.annotations.DynamicPublicAccess
+import org.gameyfin.app.core.plugins.dto.ExternalProviderIdDto
 import org.gameyfin.app.core.security.isCurrentUserAdmin
-import org.gameyfin.app.games.dto.*
+import org.gameyfin.app.games.dto.GameDto
+import org.gameyfin.app.games.dto.GameEvent
+import org.gameyfin.app.games.dto.GameSearchResultDto
+import org.gameyfin.app.games.dto.GameUpdateDto
 import org.gameyfin.app.libraries.LibraryCoreService
 import org.gameyfin.app.libraries.LibraryService
 import reactor.core.publisher.Flux
@@ -30,6 +34,10 @@ class GameEndpoint(
 
     fun getAll(): List<GameDto> = gameService.getAll()
 
+    fun getPotentialMatches(searchTerm: String): List<GameSearchResultDto> {
+        return gameService.getPotentialMatches(searchTerm)
+    }
+
     @RolesAllowed(Role.Names.ADMIN)
     fun updateGame(game: GameUpdateDto) = gameService.edit(game)
 
@@ -40,12 +48,12 @@ class GameEndpoint(
     }
 
     @RolesAllowed(Role.Names.ADMIN)
-    fun getPotentialMatches(searchTerm: String): List<GameSearchResultDto> {
-        return gameService.getPotentialMatches(searchTerm)
-    }
-
-    @RolesAllowed(Role.Names.ADMIN)
-    fun matchManually(originalIds: Map<String, OriginalIdDto>, path: String, libraryId: Long, replaceGameId: Long?) {
+    fun matchManually(
+        originalIds: Map<String, ExternalProviderIdDto>,
+        path: String,
+        libraryId: Long,
+        replaceGameId: Long?
+    ) {
         val library = libraryService.getById(libraryId)
         val game = gameService.matchManually(originalIds, Path.of(path), library, replaceGameId)
         if (game != null) {
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/GameService.kt b/app/src/main/kotlin/org/gameyfin/app/games/GameService.kt
index 751082e..b6d3d97 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/GameService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/GameService.kt
@@ -12,20 +12,21 @@ import org.gameyfin.app.core.alphaNumeric
 import org.gameyfin.app.core.filesystem.FilesystemService
 import org.gameyfin.app.core.filterValuesNotNull
 import org.gameyfin.app.core.plugins.PluginService
+import org.gameyfin.app.core.plugins.dto.ExternalProviderIdDto
 import org.gameyfin.app.core.plugins.management.GameyfinPluginDescriptor
 import org.gameyfin.app.core.plugins.management.GameyfinPluginManager
 import org.gameyfin.app.core.plugins.management.PluginManagementEntry
 import org.gameyfin.app.core.replaceRomanNumerals
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.games.dto.*
 import org.gameyfin.app.games.entities.*
 import org.gameyfin.app.games.extensions.toDtos
 import org.gameyfin.app.games.repositories.GameRepository
-import org.gameyfin.app.libraries.Library
+import org.gameyfin.app.libraries.entities.Library
 import org.gameyfin.app.media.ImageService
 import org.gameyfin.app.users.UserService
 import org.gameyfin.pluginapi.gamemetadata.*
 import org.springframework.data.repository.findByIdOrNull
-import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.oauth2.core.oidc.user.OidcUser
 import org.springframework.stereotype.Service
@@ -149,11 +150,10 @@ class GameService(
         val existingGame = gameRepository.findByIdOrNull(gameUpdateDto.id)
             ?: throw IllegalArgumentException("Game with ID $gameUpdateDto.id not found")
 
-        val userDetails = SecurityContextHolder.getContext().authentication.principal
-        val user = when (userDetails) {
+        val user = when (val userDetails = getCurrentAuth()?.principal) {
             is UserDetails -> userService.getByUsernameNonNull(userDetails.username)
             is OidcUser -> userService.getByUsernameNonNull(userDetails.preferredUsername)
-            else -> throw IllegalStateException("Unkown user type: ${userDetails::class.java.name}")
+            else -> throw IllegalStateException("Unkown user type: ${userDetails?.javaClass?.name}")
         }
 
         // Update only non-null fields
@@ -260,12 +260,12 @@ class GameService(
 
         val game = getById(game.id!!)
 
-        val originalIds: Map<String, OriginalIdDto> = game.metadata.originalIds
+        val originalIds: Map<String, ExternalProviderIdDto> = game.metadata.originalIds
             .map { (provider, originalId) ->
                 val providerId = pluginManager.getExtensions(provider.pluginId).first()?.javaClass?.name ?: return null
                 val pluginId = provider.pluginId
                 val originalId = originalId
-                providerId to OriginalIdDto(pluginId, originalId)
+                providerId to ExternalProviderIdDto(pluginId, originalId)
             }
             .toMap()
 
@@ -504,12 +504,12 @@ class GameService(
                 sorted.mapNotNull { selector(it.second) }.firstOrNull { it.isNotEmpty() }
 
             // Collect originalIds for this group
-            val originalIds: Map<String, OriginalIdDto> = group
+            val originalIds: Map<String, ExternalProviderIdDto> = group
                 .mapNotNull { (provider, metadata) ->
                     val providerId = provider.javaClass.name
                     val pluginId = providerToManagementEntry[provider]?.pluginId ?: return@mapNotNull null
                     val originalId = metadata.originalId
-                    if (providerId != null) providerId to OriginalIdDto(pluginId, originalId) else null
+                    if (providerId != null) providerId to ExternalProviderIdDto(pluginId, originalId) else null
                 }
                 .toMap()
 
@@ -567,7 +567,7 @@ class GameService(
     }
 
     fun matchManually(
-        originalIds: Map<String, OriginalIdDto>,
+        originalIds: Map<String, ExternalProviderIdDto>,
         path: Path,
         library: Library,
         replaceGameId: Long? = null,
@@ -578,7 +578,7 @@ class GameService(
             coroutineScope {
                 metadataPlugins.associateWith { plugin ->
                     async {
-                        val originalId = originalIds[plugin.javaClass.name]?.originalId ?: return@async null
+                        val originalId = originalIds[plugin.javaClass.name]?.externalProviderId ?: return@async null
                         try {
                             return@async plugin.fetchById(originalId)
                         } catch (e: Exception) {
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/dto/GameSearchResultDto.kt b/app/src/main/kotlin/org/gameyfin/app/games/dto/GameSearchResultDto.kt
index 45f98c5..4af2da0 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/dto/GameSearchResultDto.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/dto/GameSearchResultDto.kt
@@ -1,5 +1,6 @@
 package org.gameyfin.app.games.dto
 
+import org.gameyfin.app.core.plugins.dto.ExternalProviderIdDto
 import java.time.Instant
 import java.util.*
 
@@ -11,18 +12,9 @@ class GameSearchResultDto(
     val release: Instant?,
     val publishers: Collection<String>?,
     val developers: Collection<String>?,
-    val originalIds: Map<String, OriginalIdDto>
+    val originalIds: Map<String, ExternalProviderIdDto>
 )
 
-class OriginalIdDto(
-    val pluginId: String,
-    val originalId: String,
-) {
-    override fun toString(): String {
-        return "$pluginId:$originalId"
-    }
-}
-
 class UrlWithSourceDto(
     val url: String,
     val pluginId: String
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/entities/Game.kt b/app/src/main/kotlin/org/gameyfin/app/games/entities/Game.kt
index ce6991d..2cdbcdd 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/entities/Game.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/entities/Game.kt
@@ -1,7 +1,7 @@
 package org.gameyfin.app.games.entities
 
 import jakarta.persistence.*
-import org.gameyfin.app.libraries.Library
+import org.gameyfin.app.libraries.entities.Library
 import org.gameyfin.pluginapi.gamemetadata.GameFeature
 import org.gameyfin.pluginapi.gamemetadata.Genre
 import org.gameyfin.pluginapi.gamemetadata.PlayerPerspective
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/entities/GameEntityListener.kt b/app/src/main/kotlin/org/gameyfin/app/games/entities/GameEntityListener.kt
index efe500b..b400493 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/entities/GameEntityListener.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/entities/GameEntityListener.kt
@@ -3,28 +3,32 @@ package org.gameyfin.app.games.entities
 import jakarta.persistence.PostPersist
 import jakarta.persistence.PostRemove
 import jakarta.persistence.PostUpdate
+import org.gameyfin.app.core.events.GameCreatedEvent
 import org.gameyfin.app.games.GameService
 import org.gameyfin.app.games.dto.GameAdminEvent
 import org.gameyfin.app.games.dto.GameUserEvent
 import org.gameyfin.app.games.extensions.toAdminDto
 import org.gameyfin.app.games.extensions.toUserDto
+import org.gameyfin.app.util.EventPublisherHolder
 
 class GameEntityListener {
+
     @PostPersist
     fun created(game: Game) {
-        GameService.Companion.emitUser(GameUserEvent.Created(game.toUserDto()))
-        GameService.Companion.emitAdmin(GameAdminEvent.Created(game.toAdminDto()))
+        GameService.emitUser(GameUserEvent.Created(game.toUserDto()))
+        GameService.emitAdmin(GameAdminEvent.Created(game.toAdminDto()))
+        EventPublisherHolder.publish(GameCreatedEvent(this, game))
     }
 
     @PostUpdate
     fun updated(game: Game) {
-        GameService.Companion.emitUser(GameUserEvent.Updated(game.toUserDto()))
-        GameService.Companion.emitAdmin(GameAdminEvent.Updated(game.toAdminDto()))
+        GameService.emitUser(GameUserEvent.Updated(game.toUserDto()))
+        GameService.emitAdmin(GameAdminEvent.Updated(game.toAdminDto()))
     }
 
     @PostRemove
     fun deleted(game: Game) {
-        GameService.Companion.emitUser(GameUserEvent.Deleted(game.id!!))
-        GameService.Companion.emitAdmin(GameAdminEvent.Deleted(game.id!!))
+        GameService.emitUser(GameUserEvent.Deleted(game.id!!))
+        GameService.emitAdmin(GameAdminEvent.Deleted(game.id!!))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/entities/Image.kt b/app/src/main/kotlin/org/gameyfin/app/games/entities/Image.kt
index 4a1dc05..3bc44cf 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/entities/Image.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/entities/Image.kt
@@ -1,15 +1,13 @@
 package org.gameyfin.app.games.entities
 
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import jakarta.persistence.*
 import org.springframework.content.commons.annotations.ContentId
 import org.springframework.content.commons.annotations.ContentLength
 import org.springframework.content.commons.annotations.MimeType
 import java.net.URL
 
 @Entity
+@EntityListeners(ImageEntityListener::class)
 class Image(
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/entities/ImageEntityListener.kt b/app/src/main/kotlin/org/gameyfin/app/games/entities/ImageEntityListener.kt
new file mode 100644
index 0000000..0486bfc
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/games/entities/ImageEntityListener.kt
@@ -0,0 +1,27 @@
+package org.gameyfin.app.games.entities
+
+import jakarta.persistence.PostRemove
+import org.gameyfin.app.media.ImageService
+import org.springframework.context.ApplicationContext
+import org.springframework.context.ApplicationContextAware
+import org.springframework.stereotype.Component
+
+@Component
+class ImageEntityListener : ApplicationContextAware {
+    companion object {
+        private lateinit var applicationContext: ApplicationContext
+    }
+
+    override fun setApplicationContext(context: ApplicationContext) {
+        applicationContext = context
+    }
+
+    private fun getImageService(): ImageService {
+        return applicationContext.getBean(ImageService::class.java)
+    }
+
+    @PostRemove
+    fun deleted(image: Image) {
+        getImageService().deleteFile(image)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/repositories/GameRepository.kt b/app/src/main/kotlin/org/gameyfin/app/games/repositories/GameRepository.kt
index bbea808..0713ba3 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/repositories/GameRepository.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/games/repositories/GameRepository.kt
@@ -2,5 +2,14 @@ package org.gameyfin.app.games.repositories
 
 import org.gameyfin.app.games.entities.Game
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import java.time.Instant
 
-interface GameRepository : JpaRepository<Game, Long>
\ No newline at end of file
+interface GameRepository : JpaRepository<Game, Long> {
+    @Query("SELECT g FROM Game g WHERE g.title = :title AND YEAR(g.release) = YEAR(:release)")
+    fun findByTitleAndReleaseYear(
+        @Param("title") title: String,
+        @Param("release") release: Instant?
+    ): List<Game>
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryCoreService.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryCoreService.kt
index 6fc27eb..0f04c26 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryCoreService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryCoreService.kt
@@ -2,6 +2,7 @@ package org.gameyfin.app.libraries
 
 import org.gameyfin.app.games.GameService
 import org.gameyfin.app.games.entities.Game
+import org.gameyfin.app.libraries.entities.Library
 import org.springframework.stereotype.Service
 import java.time.Instant
 
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryRepository.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryRepository.kt
index b60aefc..560f8de 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryRepository.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryRepository.kt
@@ -1,5 +1,6 @@
 package org.gameyfin.app.libraries
 
+import org.gameyfin.app.libraries.entities.Library
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanService.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanService.kt
index e66d23e..62a53c7 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanService.kt
@@ -4,15 +4,16 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import org.gameyfin.app.core.filesystem.FilesystemService
 import org.gameyfin.app.games.GameService
 import org.gameyfin.app.games.entities.Game
-import org.gameyfin.app.libraries.dto.LibraryScanProgress
-import org.gameyfin.app.libraries.dto.LibraryScanStatus
-import org.gameyfin.app.libraries.dto.LibraryScanStep
+import org.gameyfin.app.games.entities.Image
+import org.gameyfin.app.libraries.dto.*
+import org.gameyfin.app.libraries.entities.Library
 import org.gameyfin.app.libraries.enums.ScanType
 import org.gameyfin.app.libraries.scan.*
 import org.gameyfin.app.media.ImageService
 import org.springframework.stereotype.Service
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Sinks
+import java.net.URL
 import java.nio.file.Path
 import java.time.Instant
 import java.util.concurrent.Callable
@@ -331,39 +332,56 @@ class LibraryScanService(
     private fun downloadImages(games: List<Game>, progress: LibraryScanProgress): DownloadImagesResult {
         val completedImageDownload = AtomicInteger(0)
 
-        val imageDownloadTasks = games.map { game ->
-            Callable<Game?> {
+        // Collect all images from all games in the batch
+        val allImages = games.flatMap { game ->
+            val images = mutableListOf<Image>()
+            game.coverImage?.let { images.add(it) }
+            game.headerImage?.let { images.add(it) }
+            images.addAll(game.images)
+            images
+        }
+
+        // Deduplicate by originalUrl
+        val uniqueImages = allImages
+            .filter { it.originalUrl != null }
+            .distinctBy { it.originalUrl }
+
+        // Map to track which Image entity was used for download per originalUrl
+        val downloadedImageMap = ConcurrentHashMap<URL, Image>()
+
+        // Download each unique image in parallel
+        val imageDownloadTasks = uniqueImages.map { image ->
+            Callable {
                 try {
-                    game.coverImage?.let {
-                        imageService.downloadIfNew(it)
-                        completedImageDownload.andIncrement
+                    imageService.downloadIfNew(image)
+                    image.originalUrl?.let { url ->
+                        downloadedImageMap[url] = image
                     }
-
-                    game.headerImage?.let {
-                        imageService.downloadIfNew(it)
-                        completedImageDownload.andIncrement
-                    }
-
-                    game.images.map {
-                        imageService.downloadIfNew(it)
-                        completedImageDownload.andIncrement
-                    }
-
-                    game
                 } catch (e: Exception) {
-                    log.error { "Error downloading images for game '${game.title}' (${game.id}): ${e.message}" }
+                    log.error { "Error downloading image '${image.originalUrl}': ${e.message}" }
                     log.debug(e) {}
-                    null
                 } finally {
-                    progress.currentStep.current = completedImageDownload.get()
+                    progress.currentStep.current = completedImageDownload.incrementAndGet()
                     emit(progress)
                 }
             }
         }
+        executor.invokeAll(imageDownloadTasks)
 
-        val gamesWithImages = executor.invokeAll(imageDownloadTasks).mapNotNull { it.get() }
+        // After downloads, associate the contentId with all other Image entities in the batch with the same originalUrl
+        for ((url, downloadedImage) in downloadedImageMap) {
+            val contentId = downloadedImage.contentId
+            if (contentId != null) {
+                allImages.filter { it.originalUrl.toString() == url.toString() && it !== downloadedImage }
+                    .forEach { image ->
+                        imageService.downloadIfNew(image)
+                        progress.currentStep.current = completedImageDownload.incrementAndGet()
+                        emit(progress)
+                    }
+            }
+        }
 
-        return DownloadImagesResult(gamesWithImages = gamesWithImages)
+        return DownloadImagesResult(gamesWithImages = games)
     }
 
     private fun calculateFileSizes(games: List<Game>, progress: LibraryScanProgress): CalculateFilesizesResult {
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryService.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryService.kt
index f9c61f5..c359e00 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryService.kt
@@ -3,6 +3,8 @@ package org.gameyfin.app.libraries
 import com.vaadin.hilla.exception.EndpointException
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.gameyfin.app.libraries.dto.*
+import org.gameyfin.app.libraries.entities.DirectoryMapping
+import org.gameyfin.app.libraries.entities.Library
 import org.gameyfin.app.libraries.enums.ScanType
 import org.gameyfin.app.libraries.extensions.toDtos
 import org.springframework.data.repository.findByIdOrNull
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanProgress.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanProgress.kt
index 3666cea..5e648b7 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanProgress.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanProgress.kt
@@ -1,6 +1,5 @@
 package org.gameyfin.app.libraries.dto
 
-import org.gameyfin.app.libraries.LibraryScanResult
 import org.gameyfin.app.libraries.enums.ScanType
 import java.time.Instant
 import java.util.*
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanResult.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanResult.kt
similarity index 94%
rename from app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanResult.kt
rename to app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanResult.kt
index 0454ea3..779b751 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/LibraryScanResult.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/dto/LibraryScanResult.kt
@@ -1,4 +1,4 @@
-package org.gameyfin.app.libraries
+package org.gameyfin.app.libraries.dto
 
 interface LibraryScanResult {
     /**
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/DirectoryMapping.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/DirectoryMapping.kt
similarity index 84%
rename from app/src/main/kotlin/org/gameyfin/app/libraries/DirectoryMapping.kt
rename to app/src/main/kotlin/org/gameyfin/app/libraries/entities/DirectoryMapping.kt
index 48e0d51..627d955 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/DirectoryMapping.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/DirectoryMapping.kt
@@ -1,4 +1,4 @@
-package org.gameyfin.app.libraries
+package org.gameyfin.app.libraries.entities
 
 import jakarta.persistence.*
 
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/Library.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/Library.kt
similarity index 90%
rename from app/src/main/kotlin/org/gameyfin/app/libraries/Library.kt
rename to app/src/main/kotlin/org/gameyfin/app/libraries/entities/Library.kt
index 0b1b93d..938b877 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/Library.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/Library.kt
@@ -1,8 +1,7 @@
-package org.gameyfin.app.libraries
+package org.gameyfin.app.libraries.entities
 
-import org.gameyfin.app.games.entities.Game
 import jakarta.persistence.*
-import org.gameyfin.app.games.entities.LibraryEntityListener
+import org.gameyfin.app.games.entities.Game
 import org.hibernate.annotations.CreationTimestamp
 import org.hibernate.annotations.UpdateTimestamp
 import java.time.Instant
diff --git a/app/src/main/kotlin/org/gameyfin/app/games/entities/LibraryEntityListener.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/LibraryEntityListener.kt
similarity index 92%
rename from app/src/main/kotlin/org/gameyfin/app/games/entities/LibraryEntityListener.kt
rename to app/src/main/kotlin/org/gameyfin/app/libraries/entities/LibraryEntityListener.kt
index c035ea2..1ec83d2 100644
--- a/app/src/main/kotlin/org/gameyfin/app/games/entities/LibraryEntityListener.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/entities/LibraryEntityListener.kt
@@ -1,9 +1,8 @@
-package org.gameyfin.app.games.entities
+package org.gameyfin.app.libraries.entities
 
 import jakarta.persistence.PostPersist
 import jakarta.persistence.PostRemove
 import jakarta.persistence.PostUpdate
-import org.gameyfin.app.libraries.Library
 import org.gameyfin.app.libraries.LibraryService
 import org.gameyfin.app.libraries.dto.LibraryAdminEvent
 import org.gameyfin.app.libraries.dto.LibraryUserEvent
diff --git a/app/src/main/kotlin/org/gameyfin/app/libraries/extensions/LibraryExtensions.kt b/app/src/main/kotlin/org/gameyfin/app/libraries/extensions/LibraryExtensions.kt
index a73f0d7..0e73176 100644
--- a/app/src/main/kotlin/org/gameyfin/app/libraries/extensions/LibraryExtensions.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/libraries/extensions/LibraryExtensions.kt
@@ -1,8 +1,8 @@
 package org.gameyfin.app.libraries.extensions
 
 import org.gameyfin.app.core.security.isCurrentUserAdmin
-import org.gameyfin.app.libraries.Library
 import org.gameyfin.app.libraries.dto.*
+import org.gameyfin.app.libraries.entities.Library
 
 
 fun Library.toDto(): LibraryDto {
diff --git a/app/src/main/kotlin/org/gameyfin/app/media/ImageEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/media/ImageEndpoint.kt
index 0d8b74b..df451b2 100644
--- a/app/src/main/kotlin/org/gameyfin/app/media/ImageEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/media/ImageEndpoint.kt
@@ -7,6 +7,7 @@ import org.gameyfin.app.core.Role
 import org.gameyfin.app.core.Utils
 import org.gameyfin.app.core.annotations.DynamicPublicAccess
 import org.gameyfin.app.core.plugins.PluginService
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.games.entities.Image
 import org.gameyfin.app.games.entities.ImageType
 import org.gameyfin.app.users.UserService
@@ -15,8 +16,6 @@ import org.springframework.core.io.InputStreamResource
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
 
@@ -61,7 +60,7 @@ class ImageEndpoint(
     @PermitAll
     @PostMapping("/avatar/upload")
     fun uploadAvatar(@RequestParam("file") file: MultipartFile) {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
 
         val image: Image = if (!userService.hasAvatar(auth.name)) {
             imageService.createFile(ImageType.AVATAR, file.inputStream, file.contentType!!)
@@ -76,7 +75,7 @@ class ImageEndpoint(
     @PermitAll
     @PostMapping("/avatar/delete")
     fun deleteAvatar() {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         userService.deleteAvatar(auth.name)
     }
 
diff --git a/app/src/main/kotlin/org/gameyfin/app/messages/MessageService.kt b/app/src/main/kotlin/org/gameyfin/app/messages/MessageService.kt
index 68a1605..530c879 100644
--- a/app/src/main/kotlin/org/gameyfin/app/messages/MessageService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/messages/MessageService.kt
@@ -3,6 +3,7 @@ package org.gameyfin.app.messages
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.gameyfin.app.core.events.*
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.messages.providers.AbstractMessageProvider
 import org.gameyfin.app.messages.templates.MessageTemplateService
 import org.gameyfin.app.messages.templates.MessageTemplates
@@ -10,8 +11,6 @@ import org.gameyfin.app.users.UserService
 import org.springframework.context.ApplicationContext
 import org.springframework.context.event.EventListener
 import org.springframework.scheduling.annotation.Async
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Service
 import java.util.*
 
@@ -61,7 +60,7 @@ class MessageService(
         }
 
         try {
-            val auth: Authentication = SecurityContextHolder.getContext().authentication
+            val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
             val user = userService.getByUsername(auth.name) ?: throw IllegalStateException("User not found")
             val template = templateService.getMessageTemplate(templateKey)
             sendNotification(user.email, "[Gameyfin] Test Notification", template, placeholders)
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestEndpoint.kt
new file mode 100644
index 0000000..37d25a8
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestEndpoint.kt
@@ -0,0 +1,49 @@
+package org.gameyfin.app.requests
+
+import com.vaadin.flow.server.auth.AnonymousAllowed
+import com.vaadin.hilla.Endpoint
+import jakarta.annotation.security.PermitAll
+import jakarta.annotation.security.RolesAllowed
+import org.gameyfin.app.config.ConfigService
+import org.gameyfin.app.core.Role
+import org.gameyfin.app.core.annotations.DynamicPublicAccess
+import org.gameyfin.app.requests.dto.GameRequestCreationDto
+import org.gameyfin.app.requests.dto.GameRequestEvent
+import org.gameyfin.app.requests.status.GameRequestStatus
+import org.springframework.stereotype.Service
+import reactor.core.publisher.Flux
+
+@Endpoint
+@Service
+@DynamicPublicAccess
+@AnonymousAllowed
+class GameRequestEndpoint(
+    private val gameRequestService: GameRequestService,
+    private val config: ConfigService
+) {
+
+    fun subscribe(): Flux<List<GameRequestEvent>> {
+        return GameRequestService.subscribe()
+    }
+
+    fun getAll() = gameRequestService.getAll()
+
+    fun create(gameRequest: GameRequestCreationDto) {
+        gameRequestService.createRequest(gameRequest)
+    }
+
+    @PermitAll
+    fun toggleVote(gameRequestId: Long) {
+        gameRequestService.toggleRequestVote(gameRequestId)
+    }
+
+    @PermitAll
+    fun delete(gameRequestId: Long) {
+        gameRequestService.deleteRequest(gameRequestId)
+    }
+
+    @RolesAllowed(Role.Names.ADMIN)
+    fun changeStatus(gameRequestId: Long, newStatus: GameRequestStatus) {
+        gameRequestService.changeRequestStatus(gameRequestId, newStatus)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestRepository.kt b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestRepository.kt
new file mode 100644
index 0000000..d0d9468
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestRepository.kt
@@ -0,0 +1,29 @@
+package org.gameyfin.app.requests
+
+import org.gameyfin.app.requests.entities.GameRequest
+import org.gameyfin.app.requests.status.GameRequestStatus
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import java.time.Instant
+
+interface GameRequestRepository : JpaRepository<GameRequest, Long> {
+    @Query("SELECT g FROM GameRequest g WHERE g.title = :title AND YEAR(g.release) = YEAR(:release)")
+    fun findByTitleAndReleaseYear(
+        @Param("title") title: String,
+        @Param("release") release: Instant?
+    ): List<GameRequest>
+
+    @Query("SELECT g FROM GameRequest g WHERE g.title = :title AND YEAR(g.release) = YEAR(:release) AND g.status NOT IN (:excludedStatuses)")
+    fun findRequestsByTitleAndReleaseYearAndStatusNotIn(
+        @Param("title") title: String,
+        @Param("release") release: Instant?,
+        @Param("excludedStatuses") excludedStatuses: List<GameRequestStatus>
+    ): List<GameRequest>
+
+    @Query("SELECT g FROM GameRequest g WHERE g.requester.id = :requesterId AND g.status IN (:statuses)")
+    fun findRequestsByRequesterIdAndStatusIn(
+        @Param("requesterId") requesterId: Long?,
+        @Param("statuses") statuses: List<GameRequestStatus>
+    ): List<GameRequest>
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestService.kt b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestService.kt
new file mode 100644
index 0000000..c56ee14
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/GameRequestService.kt
@@ -0,0 +1,201 @@
+package org.gameyfin.app.requests
+
+import com.vaadin.hilla.exception.EndpointException
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.gameyfin.app.config.ConfigProperties
+import org.gameyfin.app.config.ConfigService
+import org.gameyfin.app.core.events.GameCreatedEvent
+import org.gameyfin.app.core.security.getCurrentAuth
+import org.gameyfin.app.core.security.isAdmin
+import org.gameyfin.app.games.repositories.GameRepository
+import org.gameyfin.app.requests.dto.GameRequestCreationDto
+import org.gameyfin.app.requests.dto.GameRequestDto
+import org.gameyfin.app.requests.dto.GameRequestEvent
+import org.gameyfin.app.requests.entities.GameRequest
+import org.gameyfin.app.requests.extensions.toDto
+import org.gameyfin.app.requests.extensions.toDtos
+import org.gameyfin.app.requests.status.GameRequestStatus
+import org.gameyfin.app.users.UserService
+import org.gameyfin.app.users.entities.User
+import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Sinks
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.toJavaDuration
+
+@Service
+class GameRequestService(
+    private val config: ConfigService,
+    private val userService: UserService,
+    private val gameRequestRepository: GameRequestRepository,
+    private val gameRepository: GameRepository
+) {
+
+    companion object {
+        private val log = KotlinLogging.logger {}
+
+        /* Websockets */
+        private val gameRequestEvents = Sinks.many().multicast().onBackpressureBuffer<GameRequestEvent>(1024, false)
+
+        fun subscribe(): Flux<List<GameRequestEvent>> {
+            log.debug { "New user subscription for gameRequestEvents" }
+            return gameRequestEvents.asFlux()
+                .buffer(100.milliseconds.toJavaDuration())
+                .doOnSubscribe {
+                    log.debug { "Subscriber added to gameRequestEvents [${gameRequestEvents.currentSubscriberCount()}]" }
+                }
+                .doFinally {
+                    log.debug { "Subscriber removed from gameRequestEvents with signal type $it [${gameRequestEvents.currentSubscriberCount()}]" }
+                }
+        }
+
+        fun emit(event: GameRequestEvent) {
+            gameRequestEvents.tryEmitNext(event)
+        }
+    }
+
+    fun getAll(): List<GameRequestDto> {
+        val entities = gameRequestRepository.findAll()
+        return entities.toDtos()
+    }
+
+    fun createRequest(gameRequest: GameRequestCreationDto) {
+
+        // Check if requests are enabled
+        if (config.get(ConfigProperties.Requests.Games.Enabled) != true) {
+            throw EndpointException("Game requests are disabled")
+        }
+
+        // Check if game is already available
+        val existingGames = gameRepository.findByTitleAndReleaseYear(gameRequest.title, gameRequest.release)
+        if (existingGames.isNotEmpty()) {
+            throw EndpointException(
+                "This game is already available (ID: ${existingGames[0].id})"
+            )
+        }
+
+        // Check if a request with the same title and release year already exists
+        val existingRequests = gameRequestRepository.findByTitleAndReleaseYear(
+            gameRequest.title,
+            gameRequest.release
+        )
+        if (existingRequests.isNotEmpty()) {
+            throw EndpointException("A request for this game already exists (ID: ${existingRequests[0].id})")
+        }
+
+        val auth = getCurrentAuth()
+        val currentUser = auth?.let { userService.getByUsername(it.name) }
+
+        // Check if guests are allowed to create requests
+        if (config.get(ConfigProperties.Requests.Games.AllowGuestsToRequestGames) != true && currentUser == null) {
+            throw EndpointException("Only registered users can create game requests")
+        }
+
+        // Check if user has too many open requests (0 means no limit per user)
+        // Note: All guests are treated as a single user with null ID and thus share their request limit
+        // Note: Admins are exempt from this limit
+        val pendingRequestsForUser = gameRequestRepository.findRequestsByRequesterIdAndStatusIn(
+            currentUser?.id,
+            listOf(GameRequestStatus.PENDING)
+        )
+        val maxRequestsPerUser = config.get(ConfigProperties.Requests.Games.MaxOpenRequestsPerUser) ?: 0
+        if (maxRequestsPerUser == 0 || (auth?.isAdmin() != true && pendingRequestsForUser.size >= maxRequestsPerUser)) {
+            throw EndpointException("You have reached the maximum number of pending requests (${maxRequestsPerUser})")
+        }
+
+        val newGameRequest = GameRequest(
+            title = gameRequest.title,
+            release = gameRequest.release,
+            status = GameRequestStatus.PENDING,
+            requester = currentUser,
+            voters = mutableSetOf<User>().apply {
+                currentUser?.let { add(it) }
+            }
+        )
+
+        gameRequestRepository.save(newGameRequest)
+    }
+
+    fun deleteRequest(id: Long) {
+        val gameRequest = gameRequestRepository.findById(id)
+            .orElseThrow { NoSuchElementException("No game request found with id $id") }
+
+        val auth = getCurrentAuth()
+        val currentUser = auth?.let { userService.getByUsername(it.name) }
+        val requester = gameRequest.requester
+
+        // Check if the current user is the requester or an admin
+        // Note: Requests submitted by guests (request is null) can only be deleted by an admin
+        if (auth?.isAdmin() != true && (requester == null || requester.id != currentUser?.id)) {
+            throw EndpointException("Only the requester or an admin can delete a game request")
+        }
+
+        gameRequestRepository.delete(gameRequest)
+    }
+
+    fun changeRequestStatus(id: Long, status: GameRequestStatus) {
+        val gameRequest = gameRequestRepository.findById(id)
+            .orElseThrow { NoSuchElementException("No game request found with id $id") }
+
+        if (gameRequest.status == GameRequestStatus.FULFILLED) {
+            log.debug { "Status of requests with status ${GameRequestStatus.FULFILLED} can't be changed" }
+            return
+        }
+
+        gameRequest.status = status
+        gameRequestRepository.save(gameRequest)
+    }
+
+    @Transactional
+    fun toggleRequestVote(id: Long) {
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
+        val currentUser =
+            userService.getByUsername(auth.name) ?: throw IllegalStateException("Current user not found")
+        val gameRequest = gameRequestRepository.findById(id)
+            .orElseThrow { NoSuchElementException("No game request found with id $id") }
+
+        // Replace the voters collection to ensure Hibernate detects the change
+        val updatedVoters = gameRequest.voters.toMutableSet()
+        if (updatedVoters.contains(currentUser)) {
+            updatedVoters.remove(currentUser)
+        } else {
+            updatedVoters.add(currentUser)
+        }
+        gameRequest.voters = updatedVoters
+
+        // Ensure the entity is marked as dirty
+        gameRequest.status = gameRequest.status
+
+        gameRequestRepository.save(gameRequest)
+    }
+
+    @Async
+    @EventListener(GameCreatedEvent::class)
+    fun completeMatchingRequests(gameCreatedEvent: GameCreatedEvent) {
+        val game = gameCreatedEvent.game
+        val gameTitle = game.title
+        val gameRelease = game.release
+
+        if (gameTitle == null) {
+            log.warn { "Game '${game.id}' is missing title, cannot complete matching requests" }
+            return
+        }
+
+        val matchingRequests = gameRequestRepository.findRequestsByTitleAndReleaseYearAndStatusNotIn(
+            gameTitle,
+            gameRelease,
+            listOf(GameRequestStatus.FULFILLED)
+        )
+
+        matchingRequests.forEach { request ->
+            request.status = GameRequestStatus.FULFILLED
+            request.linkedGameId = game.id
+            val persistedRequest = gameRequestRepository.save(request)
+            emit(GameRequestEvent.Updated(persistedRequest.toDto()))
+            log.info { "Marked game request '${request.title}' (${request.release}) as FULFILLED because game is now available" }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestCreationDto.kt b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestCreationDto.kt
new file mode 100644
index 0000000..8c2e22e
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestCreationDto.kt
@@ -0,0 +1,9 @@
+package org.gameyfin.app.requests.dto
+
+import java.time.Instant
+
+
+class GameRequestCreationDto(
+    val title: String,
+    val release: Instant?
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestDto.kt b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestDto.kt
new file mode 100644
index 0000000..e5ba423
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestDto.kt
@@ -0,0 +1,16 @@
+package org.gameyfin.app.requests.dto
+
+import org.gameyfin.app.requests.status.GameRequestStatus
+import org.gameyfin.app.users.dto.UserInfoDto
+import java.time.Instant
+
+class GameRequestDto(
+    val id: Long,
+    val title: String,
+    val release: Instant?,
+    val status: GameRequestStatus,
+    val requester: UserInfoDto?,
+    val voters: List<UserInfoDto>,
+    val createdAt: Instant,
+    val updatedAt: Instant
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestEvent.kt b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestEvent.kt
new file mode 100644
index 0000000..d59bd9a
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/dto/GameRequestEvent.kt
@@ -0,0 +1,9 @@
+package org.gameyfin.app.requests.dto
+
+sealed class GameRequestEvent {
+    abstract val type: String
+
+    data class Created(val gameRequest: GameRequestDto, override val type: String = "created") : GameRequestEvent()
+    data class Updated(val gameRequest: GameRequestDto, override val type: String = "updated") : GameRequestEvent()
+    data class Deleted(val gameRequestId: Long, override val type: String = "deleted") : GameRequestEvent()
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequest.kt b/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequest.kt
new file mode 100644
index 0000000..5444092
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequest.kt
@@ -0,0 +1,46 @@
+package org.gameyfin.app.requests.entities
+
+import jakarta.persistence.*
+import org.gameyfin.app.requests.status.GameRequestStatus
+import org.gameyfin.app.users.entities.User
+import org.hibernate.annotations.CreationTimestamp
+import org.hibernate.annotations.OnDelete
+import org.hibernate.annotations.OnDeleteAction
+import org.hibernate.annotations.UpdateTimestamp
+import java.time.Instant
+
+@Entity
+@EntityListeners(GameRequestEntityListener::class)
+class GameRequest(
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    var id: Long? = null,
+
+    @Column(nullable = false)
+    val title: String,
+
+    @Column(nullable = false)
+    val release: Instant?,
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    var status: GameRequestStatus,
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @OnDelete(action = OnDeleteAction.SET_NULL)
+    var requester: User? = null,
+
+    @ManyToMany(fetch = FetchType.EAGER)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    var voters: MutableSet<User> = mutableSetOf(),
+
+    var linkedGameId: Long? = null,
+
+    @CreationTimestamp
+    @Column(nullable = false, updatable = false)
+    var createdAt: Instant? = null,
+
+    @UpdateTimestamp
+    @Column(nullable = false)
+    var updatedAt: Instant? = null
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequestEntityListener.kt b/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequestEntityListener.kt
new file mode 100644
index 0000000..625010b
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/entities/GameRequestEntityListener.kt
@@ -0,0 +1,25 @@
+package org.gameyfin.app.requests.entities
+
+import jakarta.persistence.PostPersist
+import jakarta.persistence.PostRemove
+import jakarta.persistence.PostUpdate
+import org.gameyfin.app.requests.GameRequestService
+import org.gameyfin.app.requests.dto.GameRequestEvent
+import org.gameyfin.app.requests.extensions.toDto
+
+class GameRequestEntityListener {
+    @PostPersist
+    fun created(gameRequest: GameRequest) {
+        GameRequestService.emit(GameRequestEvent.Created(gameRequest.toDto()))
+    }
+
+    @PostUpdate
+    fun updated(gameRequest: GameRequest) {
+        GameRequestService.emit(GameRequestEvent.Updated(gameRequest.toDto()))
+    }
+
+    @PostRemove
+    fun deleted(gameRequest: GameRequest) {
+        GameRequestService.emit(GameRequestEvent.Deleted(gameRequest.id!!))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/extensions/GameRequestExtensions.kt b/app/src/main/kotlin/org/gameyfin/app/requests/extensions/GameRequestExtensions.kt
new file mode 100644
index 0000000..e9e1746
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/extensions/GameRequestExtensions.kt
@@ -0,0 +1,22 @@
+package org.gameyfin.app.requests.extensions
+
+import org.gameyfin.app.requests.dto.GameRequestDto
+import org.gameyfin.app.requests.entities.GameRequest
+import org.gameyfin.app.users.extensions.toUserInfoDto
+
+fun GameRequest.toDto(): GameRequestDto {
+    return GameRequestDto(
+        id = this.id!!,
+        title = this.title,
+        release = this.release,
+        status = this.status,
+        requester = this.requester?.toUserInfoDto(),
+        voters = this.voters.map { it.toUserInfoDto() },
+        createdAt = this.createdAt!!,
+        updatedAt = this.updatedAt!!
+    )
+}
+
+fun Collection<GameRequest>.toDtos(): List<GameRequestDto> {
+    return this.map { it.toDto() }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/requests/status/GameRequestStatus.kt b/app/src/main/kotlin/org/gameyfin/app/requests/status/GameRequestStatus.kt
new file mode 100644
index 0000000..ecbe7ea
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/requests/status/GameRequestStatus.kt
@@ -0,0 +1,8 @@
+package org.gameyfin.app.requests.status
+
+enum class GameRequestStatus {
+    PENDING,
+    APPROVED,
+    REJECTED,
+    FULFILLED
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/setup/SetupEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/setup/SetupEndpoint.kt
index f9be5a1..443f8b0 100644
--- a/app/src/main/kotlin/org/gameyfin/app/setup/SetupEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/setup/SetupEndpoint.kt
@@ -3,7 +3,7 @@ package org.gameyfin.app.setup
 import com.vaadin.flow.server.auth.AnonymousAllowed
 import com.vaadin.hilla.Endpoint
 import com.vaadin.hilla.exception.EndpointException
-import org.gameyfin.app.users.dto.UserInfoDto
+import org.gameyfin.app.users.dto.ExtendedUserInfoDto
 import org.gameyfin.app.users.dto.UserRegistrationDto
 
 @Endpoint
@@ -16,7 +16,7 @@ class SetupEndpoint(
     }
 
     @AnonymousAllowed
-    fun registerSuperAdmin(superAdminRegistration: UserRegistrationDto): UserInfoDto {
+    fun registerSuperAdmin(superAdminRegistration: UserRegistrationDto): ExtendedUserInfoDto {
         if (setupService.isSetupCompleted()) throw EndpointException("Setup already completed")
         return setupService.createInitialAdminUser(superAdminRegistration)
     }
diff --git a/app/src/main/kotlin/org/gameyfin/app/setup/SetupService.kt b/app/src/main/kotlin/org/gameyfin/app/setup/SetupService.kt
index f54fd77..02eaa3e 100644
--- a/app/src/main/kotlin/org/gameyfin/app/setup/SetupService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/setup/SetupService.kt
@@ -1,11 +1,12 @@
 package org.gameyfin.app.setup
 
-import org.gameyfin.app.users.UserService
 import org.gameyfin.app.core.Role
 import org.gameyfin.app.users.RoleService
-import org.gameyfin.app.users.dto.UserInfoDto
+import org.gameyfin.app.users.UserService
+import org.gameyfin.app.users.dto.ExtendedUserInfoDto
 import org.gameyfin.app.users.dto.UserRegistrationDto
 import org.gameyfin.app.users.entities.User
+import org.gameyfin.app.users.extensions.toExtendedUserInfoDto
 import org.springframework.stereotype.Service
 
 @Service
@@ -26,7 +27,7 @@ class SetupService(
     /**
      * Creates the initial user with Super-Admin permissions
      */
-    fun createInitialAdminUser(registration: UserRegistrationDto): UserInfoDto {
+    fun createInitialAdminUser(registration: UserRegistrationDto): ExtendedUserInfoDto {
         val superAdmin = User(
             username = registration.username,
             password = registration.password,
@@ -36,6 +37,6 @@ class SetupService(
         )
 
         val user = userService.registerOrUpdateUser(superAdmin)
-        return userService.toUserInfo(user)
+        return user.toExtendedUserInfoDto()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/RoleService.kt b/app/src/main/kotlin/org/gameyfin/app/users/RoleService.kt
index d5feeef..c729574 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/RoleService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/RoleService.kt
@@ -1,5 +1,7 @@
 package org.gameyfin.app.users
 
+import org.gameyfin.app.config.ConfigProperties
+import org.gameyfin.app.config.ConfigService
 import org.gameyfin.app.core.Role
 import org.gameyfin.app.users.entities.User
 import org.gameyfin.app.users.persistence.UserRepository
@@ -11,7 +13,8 @@ import org.springframework.stereotype.Service
 
 @Service
 class RoleService(
-    private val userRepository: UserRepository
+    private val userRepository: UserRepository,
+    private val configService: ConfigService
 ) {
 
     companion object {
@@ -66,7 +69,8 @@ class RoleService(
             .filterIsInstance<OidcUserAuthority>()
             .flatMap { oidcUserAuthority ->
                 val userInfo = oidcUserAuthority.userInfo
-                val roles = userInfo.getClaim<List<String>>("roles") ?: return@flatMap emptySequence()
+                val rolesClaim = configService.get(ConfigProperties.SSO.OIDC.RolesClaim)
+                val roles = userInfo.getClaim<List<String>>(rolesClaim) ?: return@flatMap emptySequence()
                 roles.asSequence().mapNotNull {
                     if (it.startsWith(SSO_ROLE_PREFIX)) SimpleGrantedAuthority(
                         it.replace(SSO_ROLE_PREFIX, INTERNAL_ROLE_PREFIX)
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/SessionService.kt b/app/src/main/kotlin/org/gameyfin/app/users/SessionService.kt
index ad5ceb1..4a8fc95 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/SessionService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/SessionService.kt
@@ -1,7 +1,7 @@
 package org.gameyfin.app.users
 
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.users.entities.User
-import org.springframework.security.core.Authentication
 import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.security.core.session.SessionInformation
 import org.springframework.security.core.session.SessionRegistry
@@ -11,14 +11,12 @@ import org.springframework.stereotype.Service
 class SessionService(private val sessionRegistry: SessionRegistry) {
 
     fun logoutAllSessions() {
-        val auth: Authentication? = SecurityContextHolder.getContext().authentication
-        if (auth != null) {
-            val sessions: List<SessionInformation> = sessionRegistry.getAllSessions(auth.principal, false)
-            for (sessionInfo in sessions) {
-                sessionInfo.expireNow()
-            }
-            SecurityContextHolder.clearContext()
+        val auth = getCurrentAuth()
+        val sessions: List<SessionInformation> = sessionRegistry.getAllSessions(auth?.principal, false)
+        for (sessionInfo in sessions) {
+            sessionInfo.expireNow()
         }
+        SecurityContextHolder.clearContext()
     }
 
     fun logoutAllSessions(user: User) {
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/UserEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/users/UserEndpoint.kt
index 1fc3774..b925817 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/UserEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/UserEndpoint.kt
@@ -5,11 +5,11 @@ import com.vaadin.hilla.Endpoint
 import jakarta.annotation.security.PermitAll
 import jakarta.annotation.security.RolesAllowed
 import org.gameyfin.app.core.Role
-import org.gameyfin.app.users.dto.UserInfoDto
+import org.gameyfin.app.core.security.getCurrentAuth
+import org.gameyfin.app.users.dto.ExtendedUserInfoDto
 import org.gameyfin.app.users.dto.UserUpdateDto
 import org.gameyfin.app.users.enums.RoleAssignmentResult
 import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.SecurityContextHolder
 
 
 @Endpoint
@@ -18,15 +18,15 @@ class UserEndpoint(
     private val roleService: RoleService
 ) {
     @AnonymousAllowed
-    fun getUserInfo(): UserInfoDto? {
-        val auth = SecurityContextHolder.getContext().authentication
-        if (!auth.isAuthenticated || auth.principal == "anonymousUser") return null
+    fun getUserInfo(): ExtendedUserInfoDto? {
+        val auth = getCurrentAuth()
+        if (auth?.isAuthenticated == false || auth?.principal == "anonymousUser") return null
         return userService.getUserInfo()
     }
 
     @PermitAll
     fun updateUser(updates: UserUpdateDto) {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         userService.updateUser(auth.name, updates)
     }
 
@@ -36,7 +36,7 @@ class UserEndpoint(
     }
 
     @RolesAllowed(Role.Names.ADMIN)
-    fun getAllUsers(): List<UserInfoDto> {
+    fun getAllUsers(): List<ExtendedUserInfoDto> {
         return userService.getAllUsers()
     }
 
@@ -52,7 +52,7 @@ class UserEndpoint(
 
     @PermitAll
     fun deleteUser() {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth: Authentication = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         userService.deleteUser(auth.name)
     }
 
@@ -68,7 +68,7 @@ class UserEndpoint(
 
     @RolesAllowed(Role.Names.ADMIN)
     fun getRolesBelow(): List<String> {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth: Authentication = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         return roleService.getRolesBelowAuth(auth).map { it.roleName }
     }
 
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/UserService.kt b/app/src/main/kotlin/org/gameyfin/app/users/UserService.kt
index 82ec4ab..b98b41b 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/UserService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/UserService.kt
@@ -6,18 +6,18 @@ import org.gameyfin.app.config.ConfigService
 import org.gameyfin.app.core.Role
 import org.gameyfin.app.core.Utils
 import org.gameyfin.app.core.events.*
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.games.entities.Image
 import org.gameyfin.app.media.ImageService
-import org.gameyfin.app.users.dto.UserInfoDto
+import org.gameyfin.app.users.dto.ExtendedUserInfoDto
 import org.gameyfin.app.users.dto.UserRegistrationDto
 import org.gameyfin.app.users.dto.UserUpdateDto
 import org.gameyfin.app.users.emailconfirmation.EmailConfirmationService
 import org.gameyfin.app.users.enums.RoleAssignmentResult
+import org.gameyfin.app.users.extensions.toAuthorities
+import org.gameyfin.app.users.extensions.toExtendedUserInfoDto
 import org.gameyfin.app.users.persistence.UserRepository
 import org.springframework.context.ApplicationEventPublisher
-import org.springframework.security.core.GrantedAuthority
-import org.springframework.security.core.authority.SimpleGrantedAuthority
-import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.security.core.userdetails.User
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService
@@ -56,7 +56,7 @@ class UserService(
                 true,
                 true,
                 true,
-                toAuthorities(user.roles)
+                user.roles.toAuthorities()
             )
         }
 
@@ -67,7 +67,7 @@ class UserService(
             true,
             true,
             true,
-            toAuthorities(user.roles)
+            user.roles.toAuthorities()
         )
     }
 
@@ -77,8 +77,8 @@ class UserService(
     fun findByOidcProviderId(oidcProviderId: String): org.gameyfin.app.users.entities.User? =
         userRepository.findByOidcProviderId(oidcProviderId)
 
-    fun getAllUsers(): List<UserInfoDto> {
-        return userRepository.findAll().map { u -> toUserInfo(u) }
+    fun getAllUsers(): List<ExtendedUserInfoDto> {
+        return userRepository.findAll().map { it.toExtendedUserInfoDto() }
     }
 
     fun getByEmail(email: String): org.gameyfin.app.users.entities.User? {
@@ -93,20 +93,20 @@ class UserService(
         return userRepository.findByUsername(username) ?: throw UsernameNotFoundException("Unknown user '$username'")
     }
 
-    fun getUserInfo(): UserInfoDto {
-        val auth = SecurityContextHolder.getContext().authentication
+    fun getUserInfo(): ExtendedUserInfoDto {
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         val principal = auth.principal
 
         if (principal is OidcUser) {
             val oidcUser = org.gameyfin.app.users.entities.User(principal)
-            val userInfoDto = toUserInfo(oidcUser)
+            val userInfoDto = oidcUser.toExtendedUserInfoDto()
             userInfoDto.roles = roleService.extractGrantedAuthorities(principal.authorities)
-                .mapNotNull { Role.Companion.safeValueOf(it.authority) }
+                .mapNotNull { Role.safeValueOf(it.authority) }
             return userInfoDto
         }
 
         val user = getByUsernameNonNull(auth.name)
-        return toUserInfo(user)
+        return user.toExtendedUserInfoDto()
     }
 
     fun getAvatar(username: String): Image? {
@@ -158,7 +158,7 @@ class UserService(
                 RegistrationAttemptWithExistingEmailEvent(
                     this,
                     it,
-                    Utils.Companion.getBaseUrl()
+                    Utils.getBaseUrl()
                 )
             )
             return
@@ -179,12 +179,12 @@ class UserService(
         if (adminNeedsToApprove) {
             eventPublisher.publishEvent(UserRegistrationWaitingForApprovalEvent(this, user))
         } else {
-            eventPublisher.publishEvent(AccountStatusChangedEvent(this, user, Utils.Companion.getBaseUrl()))
+            eventPublisher.publishEvent(AccountStatusChangedEvent(this, user, Utils.getBaseUrl()))
         }
 
         if (!user.emailConfirmed) {
             val token = emailConfirmationService.generate(user)
-            eventPublisher.publishEvent(EmailNeedsConfirmationEvent(this, token, Utils.Companion.getBaseUrl()))
+            eventPublisher.publishEvent(EmailNeedsConfirmationEvent(this, token, Utils.getBaseUrl()))
         }
     }
 
@@ -222,7 +222,7 @@ class UserService(
             user.email = it
             user.emailConfirmed = false
             val token = emailConfirmationService.generate(user)
-            eventPublisher.publishEvent(EmailNeedsConfirmationEvent(this, token, Utils.Companion.getBaseUrl()))
+            eventPublisher.publishEvent(EmailNeedsConfirmationEvent(this, token, Utils.getBaseUrl()))
         }
 
         userRepository.save(user)
@@ -238,7 +238,7 @@ class UserService(
             return RoleAssignmentResult.NO_ROLES_PROVIDED
         }
 
-        val currentUser = SecurityContextHolder.getContext().authentication
+        val currentUser = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         val targetUser = getByUsernameNonNull(username)
 
         if (!canManage(targetUser)) {
@@ -246,7 +246,7 @@ class UserService(
             return RoleAssignmentResult.TARGET_POWER_LEVEL_TOO_HIGH
         }
 
-        val newAssignedRoles = roleNames.mapNotNull { r -> Role.Companion.safeValueOf(r) }
+        val newAssignedRoles = roleNames.mapNotNull { r -> Role.safeValueOf(r) }
         val newAssignedRolesLevel = roleService.getHighestRole(newAssignedRoles).powerLevel
         val currentUserLevel = roleService.getHighestRoleFromAuthorities(currentUser.authorities).powerLevel
 
@@ -266,7 +266,7 @@ class UserService(
     }
 
     fun canManage(targetUser: org.gameyfin.app.users.entities.User): Boolean {
-        val currentUser = SecurityContextHolder.getContext().authentication
+        val currentUser = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         val currentUserLevel = roleService.getHighestRoleFromAuthorities(currentUser.authorities).powerLevel
         val targetUserLevel = roleService.getHighestRole(targetUser.roles).powerLevel
         return currentUserLevel > targetUserLevel
@@ -276,29 +276,12 @@ class UserService(
         val user = getByUsernameNonNull(username)
         user.enabled = enabled
         userRepository.save(user)
-        eventPublisher.publishEvent(AccountStatusChangedEvent(this, user, Utils.Companion.getBaseUrl()))
+        eventPublisher.publishEvent(AccountStatusChangedEvent(this, user, Utils.getBaseUrl()))
     }
 
     fun deleteUser(username: String) {
         val user = getByUsernameNonNull(username)
         userRepository.delete(user)
-        eventPublisher.publishEvent(AccountDeletedEvent(this, user, Utils.Companion.getBaseUrl()))
-    }
-
-    fun toUserInfo(user: org.gameyfin.app.users.entities.User): UserInfoDto {
-        return UserInfoDto(
-            username = user.username,
-            email = user.email,
-            emailConfirmed = user.emailConfirmed,
-            enabled = user.enabled,
-            hasAvatar = user.avatar != null,
-            avatarId = user.avatar?.id,
-            managedBySso = user.oidcProviderId != null,
-            roles = user.roles
-        )
-    }
-
-    private fun toAuthorities(roles: Collection<Role>): List<GrantedAuthority> {
-        return roles.map { r -> SimpleGrantedAuthority(r.roleName) }
+        eventPublisher.publishEvent(AccountDeletedEvent(this, user, Utils.getBaseUrl()))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/dto/ExtendedUserInfoDto.kt b/app/src/main/kotlin/org/gameyfin/app/users/dto/ExtendedUserInfoDto.kt
new file mode 100644
index 0000000..3486e62
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/users/dto/ExtendedUserInfoDto.kt
@@ -0,0 +1,15 @@
+package org.gameyfin.app.users.dto
+
+import org.gameyfin.app.core.Role
+
+data class ExtendedUserInfoDto(
+    val id: Long,
+    val username: String,
+    val managedBySso: Boolean,
+    val email: String,
+    val emailConfirmed: Boolean,
+    val enabled: Boolean,
+    val hasAvatar: Boolean,
+    val avatarId: Long? = null,
+    var roles: List<Role>
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/dto/UserInfoDto.kt b/app/src/main/kotlin/org/gameyfin/app/users/dto/UserInfoDto.kt
index 26d3d96..c1dc8e4 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/dto/UserInfoDto.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/dto/UserInfoDto.kt
@@ -1,14 +1,8 @@
 package org.gameyfin.app.users.dto
 
-import org.gameyfin.app.core.Role
-
 data class UserInfoDto(
+    val id: Long,
     val username: String,
-    val managedBySso: Boolean,
-    val email: String,
-    val emailConfirmed: Boolean,
-    val enabled: Boolean,
     val hasAvatar: Boolean,
     val avatarId: Long? = null,
-    var roles: List<Role>
 )
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/emailconfirmation/EmailConfirmationEndpoint.kt b/app/src/main/kotlin/org/gameyfin/app/users/emailconfirmation/EmailConfirmationEndpoint.kt
index ddb1975..0b913a3 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/emailconfirmation/EmailConfirmationEndpoint.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/emailconfirmation/EmailConfirmationEndpoint.kt
@@ -1,11 +1,10 @@
 package org.gameyfin.app.users.emailconfirmation
 
 import com.vaadin.hilla.Endpoint
-import org.gameyfin.app.users.UserService
 import jakarta.annotation.security.PermitAll
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.shared.token.TokenValidationResult
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.SecurityContextHolder
+import org.gameyfin.app.users.UserService
 
 @Endpoint
 class EmailConfirmationEndpoint(
@@ -20,7 +19,7 @@ class EmailConfirmationEndpoint(
 
     @PermitAll
     fun resendEmailConfirmation() {
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         userService.getByUsername(auth.name)?.let {
             emailConfirmationService.resendEmailConfirmation(it)
         }
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/extensions/UserExtensions.kt b/app/src/main/kotlin/org/gameyfin/app/users/extensions/UserExtensions.kt
new file mode 100644
index 0000000..5265063
--- /dev/null
+++ b/app/src/main/kotlin/org/gameyfin/app/users/extensions/UserExtensions.kt
@@ -0,0 +1,35 @@
+package org.gameyfin.app.users.extensions
+
+import org.gameyfin.app.core.Role
+import org.gameyfin.app.users.dto.ExtendedUserInfoDto
+import org.gameyfin.app.users.dto.UserInfoDto
+import org.gameyfin.app.users.entities.User
+import org.springframework.security.core.GrantedAuthority
+import org.springframework.security.core.authority.SimpleGrantedAuthority
+
+fun User.toUserInfoDto(): UserInfoDto {
+    return UserInfoDto(
+        id = this.id!!,
+        username = this.username,
+        hasAvatar = this.avatar != null,
+        avatarId = this.avatar?.id
+    )
+}
+
+fun User.toExtendedUserInfoDto(): ExtendedUserInfoDto {
+    return ExtendedUserInfoDto(
+        id = this.id!!,
+        username = this.username,
+        email = this.email,
+        emailConfirmed = this.emailConfirmed,
+        enabled = this.enabled,
+        hasAvatar = this.avatar != null,
+        avatarId = this.avatar?.id,
+        managedBySso = this.oidcProviderId != null,
+        roles = this.roles
+    )
+}
+
+fun Collection<Role>.toAuthorities(): List<GrantedAuthority> {
+    return this.map { r -> SimpleGrantedAuthority(r.roleName) }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/preferences/UserPreferencesService.kt b/app/src/main/kotlin/org/gameyfin/app/users/preferences/UserPreferencesService.kt
index 963644e..2d88f89 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/preferences/UserPreferencesService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/preferences/UserPreferencesService.kt
@@ -1,8 +1,8 @@
 package org.gameyfin.app.users.preferences
 
-import org.gameyfin.app.users.UserService
 import io.github.oshai.kotlinlogging.KotlinLogging
-import org.springframework.security.core.context.SecurityContextHolder
+import org.gameyfin.app.core.security.getCurrentAuth
+import org.gameyfin.app.users.UserService
 import org.springframework.stereotype.Service
 import java.io.Serializable
 
@@ -135,7 +135,7 @@ class UserPreferencesService(
     }
 
     private fun id(key: String): UserPreferenceKey {
-        val auth = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         val user = userService.getByUsernameNonNull(auth.name)
         return UserPreferenceKey(key, user.id!!)
     }
diff --git a/app/src/main/kotlin/org/gameyfin/app/users/registration/InvitationService.kt b/app/src/main/kotlin/org/gameyfin/app/users/registration/InvitationService.kt
index b27602c..14db409 100644
--- a/app/src/main/kotlin/org/gameyfin/app/users/registration/InvitationService.kt
+++ b/app/src/main/kotlin/org/gameyfin/app/users/registration/InvitationService.kt
@@ -1,18 +1,17 @@
 package org.gameyfin.app.users.registration
 
+import org.gameyfin.app.core.Utils
 import org.gameyfin.app.core.events.AccountStatusChangedEvent
 import org.gameyfin.app.core.events.UserInvitationEvent
+import org.gameyfin.app.core.security.getCurrentAuth
 import org.gameyfin.app.shared.token.TokenDto
 import org.gameyfin.app.shared.token.TokenRepository
-import org.gameyfin.app.users.UserService
-import org.gameyfin.app.core.Utils
 import org.gameyfin.app.shared.token.TokenService
 import org.gameyfin.app.shared.token.TokenType
+import org.gameyfin.app.users.UserService
 import org.gameyfin.app.users.dto.UserRegistrationDto
 import org.gameyfin.app.users.enums.UserInvitationAcceptanceResult
 import org.springframework.context.ApplicationEventPublisher
-import org.springframework.security.core.Authentication
-import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Service
 
 @Service
@@ -30,7 +29,7 @@ class InvitationService(
         if (userService.existsByEmail(email))
             throw IllegalStateException("User with email ${Utils.Companion.maskEmail(email)} is already registered")
 
-        val auth: Authentication = SecurityContextHolder.getContext().authentication
+        val auth = getCurrentAuth() ?: throw IllegalStateException("No authentication found")
         val user = userService.getByUsername(auth.name) ?: throw IllegalStateException("User not found")
         val payload = mapOf(EMAIL_KEY to email)
         val token = super.generateWithPayload(user, payload)
@@ -45,7 +44,8 @@ class InvitationService(
     }
 
     fun acceptInvitation(secret: String, registration: UserRegistrationDto): UserInvitationAcceptanceResult {
-        val invitationToken = super.get(secret, TokenType.Invitation) ?: return UserInvitationAcceptanceResult.TOKEN_INVALID
+        val invitationToken =
+            super.get(secret, TokenType.Invitation) ?: return UserInvitationAcceptanceResult.TOKEN_INVALID
         val email = invitationToken.payload[EMAIL_KEY] ?: return UserInvitationAcceptanceResult.TOKEN_INVALID
         if (invitationToken.expired) return UserInvitationAcceptanceResult.TOKEN_EXPIRED
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 0fec534..fd5349d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import java.nio.file.Files
 
 group = "org.gameyfin"
-version = "2.0.0"
+version = "2.0.1"
 
 allprojects {
     repositories {
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
new file mode 100644
index 0000000..12d71b0
--- /dev/null
+++ b/docker/Dockerfile.ubuntu
@@ -0,0 +1,39 @@
+# syntax=docker/dockerfile:1.4
+FROM eclipse-temurin:21-jre
+
+MAINTAINER grimsi
+
+# Install necessary packages
+RUN apt-get update && \
+    apt-get install -y tini gosu && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV USER=gameyfin
+
+RUN groupadd gameyfin && \
+    useradd -M -g gameyfin gameyfin
+
+WORKDIR /opt/gameyfin
+
+# Create necessary directories with appropriate permissions
+RUN mkdir -p plugins db data logs && \
+    chown -R gameyfin:gameyfin .
+
+# Copy entrypoint script and set permissions
+COPY --chown=gameyfin:gameyfin ./docker/entrypoint.ubuntu.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Copy application jar (not ending with -plain.jar)
+COPY --chown=gameyfin:gameyfin ./app/build/libs/ /tmp/app-libs/
+RUN find /tmp/app-libs -type f -name "*.jar" ! -name "*-plain.jar" -exec cp {} gameyfin.jar \; && \
+    rm -rf /tmp/app-libs
+
+# Copy all plugin jars
+COPY --chown=gameyfin:gameyfin ./plugins/ /tmp/plugins/
+RUN find /tmp/plugins -type f -path "*/build/libs/*.jar" -exec cp {} plugins/ \; && \
+    rm -rf /tmp/plugins
+
+EXPOSE 8080
+
+ENTRYPOINT ["/usr/bin/tini", "--", "/entrypoint.sh"]
+
diff --git a/docker/entrypoint.ubuntu.sh b/docker/entrypoint.ubuntu.sh
new file mode 100644
index 0000000..6ace8d9
--- /dev/null
+++ b/docker/entrypoint.ubuntu.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+if [ -n "$PUID" ] && [ -n "$PGID" ]; then
+  groupmod -o -g "$PGID" gameyfin
+  usermod -o -u "$PUID" gameyfin
+  chown -R gameyfin:gameyfin /opt/gameyfin
+  exec gosu gameyfin:gameyfin java -jar gameyfin.jar
+else
+  exec gosu gameyfin:gameyfin java -jar gameyfin.jar
+fi
+
diff --git a/gradle.properties b/gradle.properties
index a6935cc..7a18b27 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.caching=true
 # Plugin versions
 kotlinVersion=2.2.0
 kspVersion=2.2.0-2.0.2
-vaadinVersion=24.8.3
+vaadinVersion=24.8.7
 springBootVersion=3.5.3
 springCloudVersion=2025.0.0
 springDependencyManagementVersion=1.1.7
diff --git a/plugins/torrentdownload/src/main/kotlin/org/gameyfin/plugins/download/torrent/TorrentDownloadPlugin.kt b/plugins/torrentdownload/src/main/kotlin/org/gameyfin/plugins/download/torrent/TorrentDownloadPlugin.kt
index d3cc38d..d65eb46 100644
--- a/plugins/torrentdownload/src/main/kotlin/org/gameyfin/plugins/download/torrent/TorrentDownloadPlugin.kt
+++ b/plugins/torrentdownload/src/main/kotlin/org/gameyfin/plugins/download/torrent/TorrentDownloadPlugin.kt
@@ -150,7 +150,7 @@ class TorrentDownloadPlugin(wrapper: PluginWrapper) : ConfigurableGameyfinPlugin
 
     private fun getTrackerUri(): URI {
         val protocol = "http" // No SSL support in ttorrent: https://github.com/mpetazzoni/ttorrent/issues/4
-        val host = getHostname().getCanonicalHostName()
+        val host = getHostname().getHostName()
         val port = config<Int>("trackerPort")
         val path = "announce"
 
diff --git a/plugins/torrentdownload/src/main/resources/MANIFEST.MF b/plugins/torrentdownload/src/main/resources/MANIFEST.MF
index ee430df..c947776 100644
--- a/plugins/torrentdownload/src/main/resources/MANIFEST.MF
+++ b/plugins/torrentdownload/src/main/resources/MANIFEST.MF
@@ -1,4 +1,4 @@
-Plugin-Version: 1.0.0
+Plugin-Version: 1.0.1
 Plugin-Class: org.gameyfin.plugins.download.torrent.TorrentDownloadPlugin
 Plugin-Id: org.gameyfin.plugins.download.torrent
 Plugin-Name: Torrent Download