feat: implement cacheable lookup

2025-02-23 15:48:56 +01:00
1056 changed files with 37537 additions and 135673 deletions
@@ -1,7 +1,6 @@
 Dockerfile
 .dockerignore
 node_modules
-**/node_modules
 npm-debug.log
 README.md
 .next
@@ -12,10 +12,6 @@ AUTH_SECRET="supersecret"
 # or starting the project without any (which will show a randomly generated one).
 SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000

-# Cron job API key is generated every time the container starts as it is required for communication between nextjs-api and tasks-api
-# export CRON_JOB_API_KEY=$(openssl rand -base64 32)
-# CRON_JOB_API_KEY="your-generated-api-key"
-
 LOG_LEVEL='info'

 # This is how you can use the sqlite driver:
@@ -34,19 +30,8 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
 # DB_PASSWORD='password'
 # DB_NAME='name-of-database'

-# The following is an example on how to use the node-postgres driver:
-# DB_DRIVER='node-postgres'
-# DB_URL='postgres://user:password@host:port/database'
-
-# The below path can be used to store trusted certificates, it is not required and can be left empty.
-# If it is empty, it will default to `/appdata/trusted-certificates` in production.
+# The below path can be used to store trusted certificates during development, it is not required and can be left empty.
 # If it is used, please use the full path to the directory where the certificates are stored.
 # LOCAL_CERTIFICATE_PATH='FULL_PATH_TO_CERTIFICATES'

-TURBO_TELEMETRY_DISABLED=1
-
-# Enable kubernetes tool
-# ENABLE_KUBERNETES=true
-
-# Enable mock integration
-UNSAFE_ENABLE_MOCK_INTEGRATION=true
+TURBO_TELEMETRY_DISABLED=1
@@ -31,59 +31,6 @@ body:
      label: Version
      description: What version of Homarr are you running?
      options:
-        # The below comment is used to insert a new version with on-release.yml
-        #NEXT_VERSION#
-        - 1.46.0
-        - 1.45.3
-        - 1.45.2
-        - 1.45.1
-        - 1.45.0
-        - 1.44.0
-        - 1.43.1
-        - 1.43.0
-        - 1.42.1
-        - 1.42.0
-        - 1.41.0
-        - 1.40.0
-        - 1.39.0
-        - 1.38.0
-        - 1.37.0
-        - 1.36.1
-        - 1.36.0
-        - 1.35.1
-        - 1.35.0
-        - 1.34.0
-        - 1.33.0
-        - 1.32.0
-        - 1.31.0
-        - 1.30.1
-        - 1.30.0
-        - 1.29.0
-        - 1.28.1
-        - 1.28.0
-        - 1.27.0
-        - 1.26.0
-        - 1.25.0
-        - 1.24.0
-        - 1.23.0
-        - 1.22.0
-        - 1.21.0
-        - 1.20.0
-        - 1.19.1
-        - 1.19.0
-        - 1.18.0
-        - 1.17.0
-        - 1.16.0
-        - 1.15.0
-        - 1.14.0
-        - 1.13.1
-        - 1.13.0
-        - 1.12.0
-        - 1.11.0
-        - 1.10.0
-        - 1.9.0
-        - 1.8.0
-        - 1.7.0
        - 1.6.0
        - 1.5.0
        - 1.4.0
@@ -1,64 +0,0 @@
-name: Extract Build Artifact
-description: Extracts artifacts from an existing Docker image to be used for from source installation
-inputs:
-  digest:
-    description: Digest of Docker image to use
-    required: true
-  architecture:
-    description: Name of architecture, will be used to build artifact content (amd64 or arm64)
-    required: true
-  release-tag:
-    description: Tag of the release to which the artifact will be attached
-    required: true
-  repository:
-    description: Repository to which the release belongs, e.g. owner/repo
-    required: true
-  token:
-    description: GitHub token with permissions to upload release assets
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - name: Prebuilt debian dependencies
-      uses: ./.github/actions/prebuilt-debian@dev
-      id: prebuilt-debian
-      with:
-        architecture: ${{ inputs.architecture }}
-    - name: Start docker container for ${{ inputs.architecture }}
-      run: |
-        docker run --name homarr \
-          -e "SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000" \
-          --detach --rm ${{ inputs.digest }}
-      shell: bash
-    - name: Prepare extraction
-      run: |
-        docker exec homarr cp /etc/nginx/templates/nginx.conf /app && \
-        mkdir -p ${{ runner.temp }}/extraction/${{ inputs.architecture }}
-      shell: bash
-    - name: Extract source from ${{ inputs.architecture }} container (alpine)
-      run: |
-        docker exec homarr tar -czf extraction-alpine.tar.gz -C /app . && \
-        docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \
-        docker exec homarr rm /app/extraction-alpine.tar.gz
-      shell: bash
-    - name: Extract source from ${{ inputs.architecture }} container (debian)
-      run: |
-        docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/build && \
-        docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/node_modules/better-sqlite3/build/Release && \
-        docker exec homarr tar -czf extraction-debian.tar.gz -C /app . && \
-        docker cp homarr:/app/extraction-debian.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
-      shell: bash
-    - name: Stop ${{ inputs.architecture }} container
-      if: always()
-      run: docker container remove --force --volumes homarr
-      shell: bash
-    - name: Add build archive to release (alpine)
-      env:
-        GH_TOKEN: ${{ inputs.token }}
-      run: gh release upload --repo ${{ inputs.repository }} ${{ inputs.release-tag }} ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz --clobber
-      shell: bash
-    - name: Add build archive to release (debian)
-      env:
-        GH_TOKEN: ${{ inputs.token }}
-      run: gh release upload --repo ${{ inputs.repository }} ${{ inputs.release-tag }} ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz --clobber
-      shell: bash
@@ -1,42 +0,0 @@
-name: Prebuilt dependencies for debian
-description: Provides prebuilt dependencies for debian based docker images
-inputs:
-  architecture:
-    description: Name of architecture, will be used to build docker image (e.g. amd64, arm64)
-    required: true
-outputs:
-  path:
-    description: Path to extracted prebuilt dependencies
-    value: ${{ runner.temp }}/prebuilts
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/checkout@v6
-      with:
-        persist-credentials: false
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Build docker image for ${{ inputs.architecture }}
-      id: build
-      uses: docker/build-push-action@v6
-      with:
-        push: false
-        load: true
-        context: ./deployments/prebuilt-debian
-        platforms: linux/${{ inputs.architecture }}
-        tags: prebuilt-debian
-    - name: Start docker container for ${{ inputs.architecture }}
-      run: |
-        docker run --name prebuilt-debian \
-          --detach --rm prebuilt-debian
-      shell: bash
-    - name: Extract prebuilt dependencies from ${{ inputs.architecture }} container
-      run: |
-        mkdir -p ${{ runner.temp }}/prebuilts && \
-        docker cp prebuilt-debian:/app/node_modules/better-sqlite3/build/Release/better_sqlite3.node ${{ runner.temp }}/prebuilts/better_sqlite3.node
-      shell: bash
-    - name: Stop ${{ inputs.architecture }} container
-      if: always()
-      run: docker container remove --force --volumes prebuilt-debian
-      shell: bash
@@ -6,8 +6,8 @@

 **Thank you for your contribution. Please ensure that your pull request meets the following pull request:**

- [ ] Builds without warnings or errors (`pnpm build`, autofix with `pnpm format:fix`)
- [ ] Pull request targets `dev` branch
+- [ ] Builds without warnings or errors (``pnpm build``, autofix with ``pnpm format:fix``)
+- [ ] Pull request targets ``dev`` branch
 - [ ] Commits follow the [conventional commits guideline](https://www.conventionalcommits.org/en/v1.0.0/)
- [ ] No shorthand variable names are used (eg. `x`, `y`, `i` or any abbrevation)
- [ ] Documentation is up to date. Create a pull request [here](https://github.com/homarr-labs/documentation/).
+- [ ] No shorthand variable names are used (eg. ``x``, ``y``, ``i`` or any abbrevation)
+
@@ -3,39 +3,22 @@
  extends: ["config:recommended"],
  packageRules: [
    {
-      matchPackageNames: ["^@homarr/"],
+      matchPackagePatterns: ["^@homarr/"],
      enabled: false,
    },
-    // Reenable once https://github.com/privatenumber/tsx/issues/737 is fixed
+    // Disable Dockerode updates see https://github.com/apocas/dockerode/issues/787
    {
-      matchPackageNames: ["tsx"],
+      matchPackagePatterns: ["^dockerode$"],
      enabled: false,
    },
    {
      matchUpdateTypes: ["minor", "patch", "pin", "digest"],
      automerge: true,
    },
-    {
-      // disallow automerge for onlyBuiltDependencies
-      matchPackageNames: [
-        "@tree-sitter-grammars/tree-sitter-yaml",
-        "bcrypt",
-        "better-sqlite3",
-        "cpu-features",
-        "esbuild",
-        "sharp",
-        "ssh2",
-        "tree-sitter",
-        "tree-sitter-json",
-      ],
-      automerge: false,
-    },
  ],
  updateInternalDeps: true,
  rangeStrategy: "bump",
  automerge: false,
  baseBranches: ["dev"],
  dependencyDashboard: false,
-  // prevent special characters in branch names (otherwise git errors occur on windows)
-  branchNameStrict: true,
 }
@@ -3,24 +3,19 @@ on:
  pull_request:
    types: [opened, synchronize]

-permissions: {}
-
 jobs:
  approve-automatic-prs:
    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
+    if: github.actor_id == 158783068 || github.actor_id == 190541745 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v2
+        uses: tibdex/github-app-token@v2
        with:
-          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
-          permission-pull-requests: write # required to approve pull request
-
+          private_key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
+          app_id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
      - name: Install GitHub CLI
        run: sudo apt-get install -y gh
      - name: Approve automatic PRs
@@ -1,6 +1,4 @@
 name: "[Quality] Code Analysis"
-permissions:
-  contents: read

 on:
  pull_request:
@@ -23,9 +21,8 @@ env:
 jobs:
  lint:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Setup
        uses: ./tooling/github/setup
@@ -39,9 +36,8 @@ jobs:

  format:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Setup
        uses: ./tooling/github/setup
@@ -51,9 +47,8 @@ jobs:

  typecheck:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Setup
        uses: ./tooling/github/setup
@@ -63,9 +58,8 @@ jobs:

  test:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Setup
        uses: ./tooling/github/setup
@@ -81,10 +75,9 @@ jobs:

  e2e:
    runs-on: ubuntu-latest
-    timeout-minutes: 15

    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - name: Setup
        uses: ./tooling/github/setup
      - name: Build docker image
@@ -106,9 +99,8 @@ jobs:

  build:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
      - name: Setup
        uses: ./tooling/github/setup
      - name: Copy env
@@ -0,0 +1,14 @@
+# https://github.com/webiny/action-conventional-commits?tab=readme-ov-file
+name: "[Conventions] Semantic Commits"
+
+on:
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  build:
+    name: Conventional Commits
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: webiny/action-conventional-commits@v1.3.0
@@ -13,8 +13,7 @@ permissions:
 jobs:
  validate-pull-request-title:
    runs-on: ubuntu-latest
-    timeout-minutes: 1
    steps:
-      - uses: amannn/action-semantic-pull-request@v6
+      - uses: amannn/action-semantic-pull-request@v5
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -5,26 +5,20 @@ on:
  schedule:
    - cron: "0 0 * * *" # every day at midnight

-permissions:
-  contents: write # required to push changes
-
 jobs:
  download-crowdin-translations:
-    timeout-minutes: 5
    runs-on: ubuntu-latest

    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v2
+        uses: tibdex/github-app-token@v2
        with:
-          private-key: ${{ secrets.CROWDIN_APP_PRIVATE_KEY }}
-          app-id: ${{ secrets.CROWDIN_APP_ID }}
-          permission-contents: write # required to commit to crowdin branch
-          permission-pull-requests: write # required to create pull request
+          private_key: ${{ secrets.CROWDIN_APP_PRIVATE_KEY }}
+          app_id: ${{ secrets.CROWDIN_APP_ID }}

      - name: Download Crowdin translations
        id: crowdin-download
@@ -1,6 +1,4 @@
 name: "[Crowdin] Upload translations"
-permissions:
-  contents: read

 on:
  workflow_dispatch:
@@ -14,11 +12,10 @@ jobs:
    # Don't run this action if the downloaded translations are being pushed
    if: "!contains(github.event.head_commit.message, 'chore(lang)')"
    runs-on: ubuntu-latest
-    timeout-minutes: 5

    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Upload Crowdin translations
        uses: crowdin/github-action@v2
@@ -15,14 +15,13 @@ on:
        description: Send notifications

 permissions:
-  contents: write # Required to update package.json version
-  packages: write # Required for pushing to GHCR
+  contents: write
+  packages: write

 env:
  SKIP_ENV_VALIDATION: true
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
-  GHCR_REPO: ghcr.io/${{ github.repository }}
  TURBO_TELEMETRY_DISABLED: 1

 concurrency:
@@ -32,13 +31,12 @@ jobs:
  release:
    name: Create tag and release
    runs-on: ubuntu-latest
-    timeout-minutes: 5
    env:
      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
    outputs:
      version: ${{ steps.read-semver.outputs.version || steps.version-fallback.outputs.version }}
      git_ref: ${{ steps.read-git-ref.outputs.ref || github.ref }}
-      skipped: ${{ env.SKIP_RELEASE }}
+
    steps:
      - run: echo "Skipping release for workflow_dispatch event"
        if: env.SKIP_RELEASE == 'true'
@@ -50,23 +48,18 @@ jobs:
      - name: Obtain token
        if: env.SKIP_RELEASE == 'false'
        id: obtainToken
-        uses: actions/create-github-app-token@v2
+        uses: tibdex/github-app-token@v2
        with:
-          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # required to commit package.json & changelog changes, merge them to dev and publish the release
-
-      - uses: actions/checkout@v6
+          private_key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
+          app_id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+      - uses: actions/checkout@v4
        if: env.SKIP_RELEASE == 'false'
        with:
          persist-credentials: false
-      - uses: pnpm/action-setup@v4
-        if: env.SKIP_RELEASE == 'false'
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
        if: env.SKIP_RELEASE == 'false'
        with:
-          node-version: 24.12.0
-          cache: "pnpm"
+          node-version: 22
      - run: npm i -g pnpm
        if: env.SKIP_RELEASE == 'false'
      - name: Install dependencies
@@ -109,162 +102,59 @@ jobs:
          git pull origin dev
          git rebase ${{ github.ref_name }}
          git push origin dev
-  build-amd64:
-    name: Build docker image for amd64
+  deploy:
+    name: Deploy docker image
    needs: release
    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    outputs:
-      digest: ${{ steps.build.outputs.digest }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ needs.release.outputs.git_ref }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: "${{ env.GHCR_REPO }}"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          network: host
-          platforms: linux/amd64
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
-        env:
-          SKIP_ENV_VALIDATION: true
-  build-arm64:
-    name: Build docker image for arm64
-    needs: release
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 20
-    outputs:
-      digest: ${{ steps.build.outputs.digest }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ needs.release.outputs.git_ref }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: "${{ env.GHCR_REPO }}"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          network: host
-          platforms: linux/arm64
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
-        env:
-          SKIP_ENV_VALIDATION: true
-  extract-asset-amd64:
-    name: Extract amd64 asset from docker image
-    needs: [release, build-amd64]
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-      - name: Extract amd64
-        if: needs.release.outputs.skipped == 'false'
-        uses: homarr-labs/homarr/.github/actions/extract-build-artifact@dev
-        with:
-          digest: "${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }}"
-          architecture: amd64
-          release-tag: ${{ needs.release.outputs.version }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-
-  extract-asset-arm64:
-    name: Extract arm64 asset from docker image
-    needs: [release, build-arm64]
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 2
-    steps:
-      - name: Extract arm64
-        if: needs.release.outputs.skipped == 'false'
-        uses: homarr-labs/homarr/.github/actions/extract-build-artifact@dev
-        with:
-          digest: "${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}"
-          architecture: arm64
-          release-tag: ${{ needs.release.outputs.version }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-  publish:
-    name: Complete deployment and notify
-    needs: [release, build-amd64, build-arm64, extract-asset-amd64, extract-asset-arm64]
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
    env:
      NEXT_VERSION: ${{ needs.release.outputs.version }}
      DEPLOY_LATEST: ${{ github.ref_name == 'main' }}
      DEPLOY_BETA: ${{ github.ref_name == 'beta' }}
    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.release.outputs.git_ref }}
+      - name: Discord notification
+        if: ${{ github.events.inputs.send-notifications != false }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "Deployment of an image for version '${{env.NEXT_VERSION}}' has been triggered: [run ${{ github.run_number }}](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>)"
      - name: Log in to the Container registry
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish beta
-        if: env.DEPLOY_BETA == 'true'
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:beta \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
-      - name: Publish latest
-        if: env.DEPLOY_LATEST == 'true'
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:latest \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
-      - name: Publish version
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:${{ env.NEXT_VERSION }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
-      - name: Publish release
-        if: needs.release.outputs.skipped == 'false'
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          tags: |
+            ${{ env.DEPLOY_LATEST == 'true' && 'type=raw,value=latest' || null }}
+            ${{ env.DEPLOY_BETA == 'true' && 'type=raw,value=beta' || null }}
+            type=raw,value=${{ env.NEXT_VERSION }}
+      - name: Build and push
+        id: buildPushAction
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          network: host
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release edit --repo ${{ github.repository }} ${{ needs.release.outputs.version }} --draft=false
-
+          SKIP_ENV_VALIDATION: true
      - name: Discord notification
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
        uses: Ilshidur/action-discord@master
        with:
-          args: "Successfully deployed images for branch **${{ github.ref_name }}**. Tagged as **${{env.NEXT_VERSION}}**."
+          args: "Deployment of image has completed for branch ${{ github.ref_name }}. Image ID is '${{ steps.buildPushAction.outputs.imageid }}'."
@@ -18,7 +18,6 @@ permissions:
 jobs:
  create-and-merge-pr:
    runs-on: ubuntu-latest
-    timeout-minutes: 2
    steps:
      - name: Discord notification
        if: ${{ github.events.inputs.send-notifications }}
@@ -28,7 +27,7 @@ jobs:
        with:
          args: "Automatic release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Get Next Version
@@ -50,11 +49,10 @@ jobs:
          args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }} (new behaviour: ${{ steps.semver.outputs.bump }})"
      - name: Obtain token
        id: obtainApprovalToken
-        uses: actions/create-github-app-token@v2
+        uses: tibdex/github-app-token@v2
        with:
-          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
-          permission-pull-requests: write
+          private_key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
+          app_id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
      - name: Approve PR
        env:
          GITHUB_TOKEN: ${{ steps.obtainApprovalToken.outputs.token }}
@@ -62,12 +60,10 @@ jobs:
          gh pr review --approve --body "Automatically approved by GitHub Action"
      - name: Obtain token
        id: obtainMergeToken
-        uses: actions/create-github-app-token@v2
+        uses: tibdex/github-app-token@v2
        with:
-          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # write to main branch (due to merge)
-          permission-pull-requests: write # merge pull request
+          private_key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
+          app_id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
      - id: automerge
        if: ${{ steps.semver.outputs.bump != 'major' }}
        name: automerge
@@ -1,45 +0,0 @@
-name: "[Deployments] Validate prebuilt debian dependencies"
-
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    branches: ["*"]
-    paths: [".github/actions/prebuilt-debian/**", "deployments/prebuilt-debian/**"]
-
-jobs:
-  prebuilt-debian-validate-amd64:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v6
-      - name: Validate prebuilt dependencies for amd64
-        id: validate-amd64
-        uses: ./.github/actions/prebuilt-debian
-        with:
-          architecture: amd64
-
-      - name: Check extracted files for amd64
-        run: |
-          if [ ! -f "${{ steps.validate-amd64.outputs.path }}/better_sqlite3.node" ]; then
-            echo "better_sqlite3.node not found for amd64!"
-            exit 1
-          fi
-  prebuilt-debian-validate-arm64:
-    runs-on: ubuntu-24.04-
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v6
-      - name: Validate prebuilt dependencies for arm64
-        id: validate-arm64
-        uses: ./.github/actions/prebuilt-debian
-        with:
-          architecture: arm64
-
-      - name: Check extracted files for arm64
-        run: |
-          if [ ! -f "${{ steps.validate-arm64.outputs.path }}/better_sqlite3.node" ]; then
-            echo "better_sqlite3.node not found for arm64!"
-            exit 1
-          fi
@@ -1,19 +0,0 @@
-name: "[Renovate] Validate configuration"
-
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    branches: ["*"]
-    paths: [".github/renovate.json5"]
-
-jobs:
-  renovate-validate:
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-      - uses: actions/checkout@v6
-      - run: |
-          npx --yes --package renovate -- \
-              renovate-config-validator --strict .github/renovate.json5
@@ -1,89 +0,0 @@
-permissions: {}
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  trigger-docs-release:
-    name: Trigger Documentation Release
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-      - name: Obtain token
-        id: obtainToken
-        uses: actions/create-github-app-token@v2
-        with:
-          private-key: ${{ secrets.HOMARR_DOCS_RELEASE_APP_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
-          owner: homarr-labs
-          repositories: |
-            documentation
-          permission-contents: write # required to dispatch repository workflow
-      - name: Trigger documentation release
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-          SOURCE_TAG: ${{ github.event.release.tag_name }}
-        run: |
-          curl -X POST \
-            -H "Authorization: token $GITHUB_TOKEN" \
-            -H "Accept: application/vnd.github+json" \
-            https://api.github.com/repos/homarr-labs/documentation/dispatches \
-            -d @- <<EOF
-          {
-            "event_type": "trigger-release",
-            "client_payload": {
-              "tag": "${SOURCE_TAG}"
-            }
-          }
-          EOF
-  update-bug-report-template:
-    name: Update Bug Report Template
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Obtain token
-        id: obtainToken
-        uses: actions/create-github-app-token@v2
-        with:
-          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # required to commit to branch
-          permission-pull-requests: write # required to create pr & enable automerge
-      - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          token: ${{ steps.obtainToken.outputs.token }}
-      - name: Setup
-        uses: ./tooling/github/setup
-      - run: pnpm run scripts:update-bug-report-template
-        env:
-          NEXT_VERSION: ${{ github.event.release.tag_name }}
-      - name: Commit changes
-        run: |
-          git config --global user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
-          git config --global user.name "Releases Homarr"
-          git checkout -b update-bug-report-template
-          git add .
-          git commit -m "chore: update bug report template"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        uses: peter-evans/create-pull-request@v8
-        with:
-          token: ${{ steps.obtainToken.outputs.token }}
-          branch: update-bug-report-template
-          base: dev
-          title: "chore: update bug report template"
-          delete-branch: true
-          body: |
-            This PR automatically updates the bug report template of Homarr in the .github/ISSUE_TEMPLATE/bug_report.yml
-
-      - name: Install GitHub CLI
-        run: sudo apt-get install -y gh
-
-      - name: Enable auto-merge
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-        run: |
-          gh pr merge ${{steps.create-pull-request.outputs.pull-request-number}} --auto --squash
@@ -1,27 +0,0 @@
-permissions:
-  statuses: write
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  skip-stability-days:
-    if: ${{ !startsWith(github.head_ref, 'renovate/') }}
-    name: Skip Stability Days
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    steps:
-      - name: Add status check
-        env:
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: |
-          gh api \
-          --method POST \
-          -H "Accept: application/vnd.github+json" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          /repos/${{github.repository}}/statuses/${{github.event.pull_request.head.sha}} \
-          -f 'state=success' \
-          -f 'target_url=https://docs.renovatebot.com/configuration-options#minimumreleaseage' \
-          -f 'description=Skipped for non renovate branches' \
-          -f 'context=renovate/stability-days'
@@ -1,74 +0,0 @@
-name: Update Contributors
-
-on:
-  schedule:
-    - cron: "0 12 * * FRI" # At 12:00 on Friday.
-  workflow_dispatch:
-
-env:
-  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-  CROWDIN_TOKEN: "${{ secrets.CROWDIN_UPDATE_CONTRIBUTORS_TOKEN }}"
-
-permissions:
-  contents: read
-jobs:
-  update-contributors:
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    strategy:
-      matrix:
-        node-version: [22]
-    steps:
-      - name: Obtain token
-        id: obtainToken
-        uses: actions/create-github-app-token@v2
-        with:
-          private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
-          permission-contents: write # required to commit to branch
-          permission-pull-requests: write # required to create pr & enable automerge
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-
-      - uses: pnpm/action-setup@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "pnpm"
-
-      - name: Run update script
-        run: node ./scripts/update-contributors.mjs
-
-      - name: Commit changes
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-        run: |
-          git config --global user.email "210161987+homarr-update-contributors[bot]@users.noreply.github.com"
-          git config --global user.name "Homarr Update Contributors"
-          git add .
-          git commit -m "chore: update contributors"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        uses: peter-evans/create-pull-request@v8
-        with:
-          token: ${{ steps.obtainToken.outputs.token }}
-          branch: update-contributors
-          base: dev
-          title: "chore: update contributors"
-          delete-branch: true
-          body: |
-            This PR updates the contributors list in the static-data directory.
-
-      - name: Install GitHub CLI
-        run: sudo apt-get install -y gh
-
-      - name: Enable auto-merge
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-        run: |
-          gh pr merge ${{steps.create-pull-request.outputs.pull-request-number}} --auto --squash
@@ -1,65 +0,0 @@
-name: Update integration list
-
-on:
-  workflow_dispatch: {}
-  push:
-    paths:
-      - packages/definitions/src/integration.ts
-    branches:
-      - dev
-
-permissions:
-  pull-requests: write
-
-jobs:
-  update-readme:
-    concurrency:
-      group: update-integration
-      cancel-in-progress: false
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Obtain token
-        id: obtainToken
-        uses: actions/create-github-app-token@v2
-        with:
-          private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
-          permission-contents: write # required to commit to branch
-          permission-pull-requests: write # required to create pr & enable automerge
-      - name: Checkout code
-        uses: actions/checkout@v6
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-      - name: Setup
-        uses: ./tooling/github/setup
-      - run: pnpm run scripts:update-readme-integrations
-      - name: Commit changes
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-        run: |
-          git config --global user.email "210161987+homarr-update-contributors[bot]@users.noreply.github.com"
-          git config --global user.name "Homarr Update Contributors"
-          git add .
-          git commit -m "chore: update integrations list readme"
-
-      - name: Create Pull Request
-        id: create-pull-request
-        uses: peter-evans/create-pull-request@v8
-        with:
-          token: ${{ steps.obtainToken.outputs.token }}
-          branch: update-integrations-readme
-          base: dev
-          title: "chore: update integrations list readme"
-          delete-branch: true
-          body: |
-            This PR automatically updates the list of integrations of Homarr in the README.md
-
-      - name: Install GitHub CLI
-        run: sudo apt-get install -y gh
-
-      - name: Enable auto-merge
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-        run: |
-          gh pr merge ${{steps.create-pull-request.outputs.pull-request-number}} --auto --squash
@@ -65,6 +65,3 @@ e2e/shared/tmp

 #personal backgrounds
 apps/nextjs/public/images/background.png
-
-# next-intl
-en.d.json.ts
@@ -3,4 +3,3 @@
 # @link https://docs.expo.dev/guides/monorepos/#common-issues
 node-linker=hoisted
 strict-peer-dependencies=false
-engine-strict=true
@@ -1 +1 @@
-24.12.0
+22.14.0
@@ -44,7 +44,6 @@
      {
        "successComment": false,
        "failComment": false,
-        "draftRelease": true,
        "releaseBodyTemplate": "<%= _.truncate(nextRelease.notes, { 'length': 124000, 'omission': '' }) %>"
      }
    ]
@@ -1,14 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Tests" type="JavaScriptTestRunnerVitest" nameIsGenerated="true">
-    <node-interpreter value="project" />
-    <vitest-package value="$PROJECT_DIR$/node_modules/vitest" />
-    <working-dir value="$PROJECT_DIR$" />
-    <vitest-options value="--exclude e2e --coverage.enabled" />
-    <envs>
-      <env name="NODE_ENV" value="development" />
-      <env name="CI" value="true" />
-    </envs>
-    <scope-kind value="ALL" />
-    <method v="2" />
-  </configuration>
-</component>
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="db:migration:postgresql:generate" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="db:migration:postgresql:generate" />
-    </scripts>
-    <node-interpreter value="project" />
-    <package-manager value="pnpm" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
@@ -12,17 +12,17 @@ languageIds:
 # You should unescape RegEx strings in order to fit in the YAML file
 # To help with this, you can use https://www.freeformatter.com/json-escape.html
 usageMatchRegex:
-  # For direct t("your.i18n.keys") usage
+  # The following example shows how to detect `t("your.i18n.keys")`
+  # the `{key}` will be placed by a proper keypath matching regex,
+  # you can ignore it and use your own matching rules as well
  - "[^\\w\\d]t\\(['\"`]({key})['\"`]"
-  # For variable t assigned from getScopedI18n or useScopedI18n
-  - "\\bt\\(['\"`]({key})['\"`]\\)"

 # A RegEx to set a custom scope range. This scope will be used as a prefix when detecting keys
 # and works like how the i18next framework identifies the namespace scope from the
 # useTranslation() hook.
 # You should unescape RegEx strings in order to fit in the YAML file
 # To help with this, you can use https://www.freeformatter.com/json-escape.html
-scopeRangeRegex: "(?:const|let|var)\\s+t\\s*=\\s*(?:await\\s+)?(?:getScopedI18n|useScopedI18n)\\(\\s*['\"](.*?)['\"]\\)"
+scopeRangeRegex: "(getScopedI18n|useScopedI18n)\\(\\s*['\"](.*?)['\"]\\)"

 # An array of strings containing refactor templates.
 # The "$1" will be replaced by the keypath specified.
@@ -26,7 +26,6 @@
    "Sabnzbd",
    "SeDemal",
    "Sonarr",
-    "sslverify",
    "superjson",
    "tabler",
    "trpc",
@@ -1,9 +1 @@
-# ── CODEOWNERS ───────────────────────────────────────
 * @homarr-labs/maintainers
-
-# Exempt Renovate‑managed files (no owners)
-package.json          @homarr-labs/none
-package-lock.json     @homarr-labs/none
-pnpm-lock.yaml        @homarr-labs/none
-Dockerfile            @homarr-labs/none
-docker-compose.yml    @homarr-labs/none
@@ -1,4 +1,4 @@
-FROM node:24.12.0-alpine AS base
+FROM node:22.14.0-alpine AS base

 FROM base AS builder
 RUN apk add --no-cache libc6-compat
@@ -10,6 +10,8 @@ RUN apk add --no-cache libc6-compat curl bash
 RUN apk update
 COPY . .

+# Install working version of corepack (See https://github.com/nodejs/corepack/issues/612)
+RUN npm install -g corepack@0.31.0 && corepack --version
 RUN corepack enable pnpm && pnpm install --recursive --frozen-lockfile

 # Copy static data as it is not part of the build
@@ -17,7 +19,8 @@ COPY static-data ./static-data
 ARG SKIP_ENV_VALIDATION='true'
 ARG CI='true'
 ARG DISABLE_REDIS_LOGS='true'
-
+# Install working version of corepack (See https://github.com/nodejs/corepack/issues/612)
+RUN npm install -g corepack@0.31.0 && corepack --version
 RUN corepack enable pnpm && pnpm build

 FROM base AS runner
@@ -55,7 +58,7 @@ COPY --from=builder /app/apps/nextjs/.next/standalone ./
 COPY --from=builder /app/apps/nextjs/.next/static ./apps/nextjs/.next/static
 COPY --from=builder /app/apps/nextjs/public ./apps/nextjs/public
 COPY scripts/run.sh ./run.sh
-COPY --chmod=755 scripts/entrypoint.sh ./entrypoint.sh
+COPY --chmod=777 scripts/entrypoint.sh ./entrypoint.sh
 COPY packages/redis/redis.conf /app/redis.conf
 COPY nginx.conf /etc/nginx/templates/nginx.conf

@@ -64,7 +67,6 @@ ENV DB_URL='/appdata/db/db.sqlite'
 ENV DB_DIALECT='sqlite'
 ENV DB_DRIVER='better-sqlite3'
 ENV AUTH_PROVIDERS='credentials'
-ENV REDIS_IS_EXTERNAL='false'
 ENV NODE_ENV='production'

 ENTRYPOINT [ "/app/entrypoint.sh" ]
@@ -1,18 +1,18 @@
 # Security Policy
-
 This policy is relevant if you found potential vulnerabilities in an audit.
 We consider something as a vulnerability if it...
-
 1. puts users or user data at risk
 2. enables third parties to gain control or access (e.g. [RATs](https://en.wikipedia.org/wiki/Remote_desktop_software#RAT), [privilege escalation](https://en.wikipedia.org/wiki/Privilege_escalation), ...)
 3. abuses the system in an unintended way (e.g. crypto mining, proxy, ...)

 ## Supported Versions

-We only fix security issues in the [latest stable version](https://github.com/homarr-labs/homarr/releases/latest). Meaning security issues in prior versions will not be fixed and users have to upgrade to the latest version to receive them.
+| Version | Supported          |
+| ------- | ------------------ |
+| >1.0.0  | :white_check_mark: |
+| <1.0.0  | :x:                |

 ## Reporting a Vulnerability
-
 We use [GitHub's system for reporting vulnerabilities](https://docs.github.com/en/enterprise-cloud@latest/code-security/security-advisories/working-with-repository-security-advisories/creating-a-repository-security-advisory).
 Click [**here to report an advisory**](https://github.com/homarr-labs/homarr/security/advisories/new). Our team will get notified and will get back to you within 1-6 business days.

@@ -1,8 +1,8 @@
 // Importing env files here to validate on build
 import "@homarr/auth/env";
-import "@homarr/core/infrastructure/db/env";
+import "@homarr/db/env";
 import "@homarr/common/env";
-import "@homarr/core/infrastructure/logs/env";
+import "@homarr/log/env";
 import "@homarr/docker/env";

 import type { NextConfig } from "next";
@@ -10,67 +10,39 @@ import MillionLint from "@million/lint";
 import createNextIntlPlugin from "next-intl/plugin";

 // Package path does not work... so we need to use relative path
-const withNextIntl = createNextIntlPlugin({
-  experimental: {
-    createMessagesDeclaration: "../../packages/translation/src/lang/en.json",
-  },
-  requestConfig: "../../packages/translation/src/request.ts",
-});
+const withNextIntl = createNextIntlPlugin("../../packages/translation/src/request.ts");
+
+interface WebpackConfig {
+  module: {
+    rules: {
+      test: RegExp;
+      loader: string;
+    }[];
+  };
+}

 const nextConfig: NextConfig = {
  output: "standalone",
  reactStrictMode: true,
-  // react compiler breaks mantine-react-table, so disabled for now
-  //reactCompiler: true,
-  /** We already do typechecking as separate tasks in CI */
+  /** We already do linting and typechecking as separate tasks in CI */
+  eslint: { ignoreDuringBuilds: true },
  typescript: { ignoreBuildErrors: true },
-  /**
-   * dockerode is required in the external server packages because of https://github.com/homarr-labs/homarr/issues/612
-   * isomorphic-dompurify and jsdom are required, see https://github.com/kkomelin/isomorphic-dompurify/issues/356
-   */
-  serverExternalPackages: ["dockerode", "isomorphic-dompurify", "jsdom"],
+  webpack: (config: WebpackConfig, { isServer }) => {
+    if (isServer) {
+      config.module.rules.push({
+        test: /\.node$/,
+        loader: "node-loader",
+      });
+    }
+
+    return config;
+  },
  experimental: {
    optimizePackageImports: ["@mantine/core", "@mantine/hooks", "@tabler/icons-react"],
-    turbopackFileSystemCacheForDev: true,
  },
  transpilePackages: ["@homarr/ui", "@homarr/notifications", "@homarr/modals", "@homarr/spotlight", "@homarr/widgets"],
  images: {
-    localPatterns: [
-      {
-        pathname: "/**",
-        search: "",
-      },
-    ],
-  },
-  // eslint-disable-next-line @typescript-eslint/require-await,no-restricted-syntax
-  async headers() {
-    return [
-      {
-        source: "/(.*)", // Apply CSP to all routes
-        headers: [
-          {
-            key: "Content-Security-Policy",
-            // worker-src / media-src with blob: is necessary for video.js, see https://github.com/homarr-labs/homarr/issues/3912 and https://stackoverflow.com/questions/65792855/problem-with-video-js-and-content-security-policy-csp
-            value: `
-              default-src 'self';
-              script-src * 'unsafe-inline' 'unsafe-eval';
-              worker-src * blob:;
-              base-uri 'self';
-              connect-src *;
-              style-src * 'unsafe-inline'; 
-              frame-ancestors *;
-              frame-src *;
-              form-action 'self';
-              img-src * data:;
-              font-src * data:;
-              media-src * data: blob:;
-            `
-              .replace(/\s{2,}/g, " ")
-              .trim(),
-          },
-        ],
-      },
-    ];
+    domains: ["cdn.jsdelivr.net"],
  },
 };

@@ -6,7 +6,7 @@
  "scripts": {
    "build": "pnpm with-env next build",
    "clean": "git clean -xdf .next .turbo node_modules",
-    "dev": "pnpm with-env next dev",
+    "dev": "pnpm with-env next dev --turbopack",
    "format": "prettier --check . --ignore-path ../../.gitignore",
    "lint": "eslint",
    "start": "pnpm with-env next start",
@@ -23,8 +23,8 @@
    "@homarr/api": "workspace:^0.1.0",
    "@homarr/auth": "workspace:^0.1.0",
    "@homarr/boards": "workspace:^0.1.0",
+    "@homarr/certificates": "workspace:^0.1.0",
    "@homarr/common": "workspace:^0.1.0",
-    "@homarr/core": "workspace:^0.1.0",
    "@homarr/cron-job-status": "workspace:^0.1.0",
    "@homarr/db": "workspace:^0.1.0",
    "@homarr/definitions": "workspace:^0.1.0",
@@ -33,8 +33,8 @@
    "@homarr/forms-collection": "workspace:^0.1.0",
    "@homarr/gridstack": "^1.12.0",
    "@homarr/icons": "workspace:^0.1.0",
-    "@homarr/image-proxy": "workspace:^0.1.0",
    "@homarr/integrations": "workspace:^0.1.0",
+    "@homarr/log": "workspace:^",
    "@homarr/modals": "workspace:^0.1.0",
    "@homarr/modals-collection": "workspace:^0.1.0",
    "@homarr/notifications": "workspace:^0.1.0",
@@ -48,60 +48,59 @@
    "@homarr/ui": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
    "@homarr/widgets": "workspace:^0.1.0",
-    "@mantine/colors-generator": "^8.3.10",
-    "@mantine/core": "^8.3.10",
-    "@mantine/dropzone": "^8.3.10",
-    "@mantine/hooks": "^8.3.10",
-    "@mantine/modals": "^8.3.10",
-    "@mantine/tiptap": "^8.3.10",
+    "@mantine/colors-generator": "^7.17.0",
+    "@mantine/core": "^7.17.0",
+    "@mantine/dropzone": "^7.17.0",
+    "@mantine/hooks": "^7.17.0",
+    "@mantine/modals": "^7.17.0",
+    "@mantine/tiptap": "^7.17.0",
    "@million/lint": "1.0.14",
-    "@scalar/api-reference-react": "^0.8.11",
-    "@tabler/icons-react": "^3.35.0",
-    "@tanstack/react-query": "^5.90.12",
-    "@tanstack/react-query-devtools": "^5.91.1",
-    "@tanstack/react-query-next-experimental": "^5.91.0",
-    "@trpc/client": "^11.8.0",
-    "@trpc/next": "^11.8.0",
-    "@trpc/react-query": "^11.8.0",
-    "@trpc/server": "^11.8.0",
+    "@tabler/icons-react": "^3.30.0",
+    "@tanstack/react-query": "^5.66.9",
+    "@tanstack/react-query-devtools": "^5.66.9",
+    "@tanstack/react-query-next-experimental": "^5.66.9",
+    "@trpc/client": "next",
+    "@trpc/next": "next",
+    "@trpc/react-query": "next",
+    "@trpc/server": "next",
    "@xterm/addon-canvas": "^0.7.0",
    "@xterm/addon-fit": "0.10.0",
    "@xterm/xterm": "^5.5.0",
-    "babel-plugin-react-compiler": "^1.0.0",
-    "chroma-js": "^3.2.0",
+    "chroma-js": "^3.1.2",
    "clsx": "^2.1.1",
-    "dayjs": "^1.11.19",
-    "dotenv": "^17.2.3",
-    "flag-icons": "^7.5.0",
-    "glob": "^13.0.0",
-    "isomorphic-dompurify": "^2.34.0",
-    "jotai": "^2.16.0",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.4.7",
+    "flag-icons": "^7.3.2",
+    "glob": "^11.0.1",
+    "jotai": "^2.12.1",
    "mantine-react-table": "2.0.0-beta.9",
-    "next": "16.0.10",
-    "postcss-preset-mantine": "^1.18.0",
-    "prismjs": "^1.30.0",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "react-error-boundary": "^6.0.0",
+    "next": "15.1.7",
+    "postcss-preset-mantine": "^1.17.0",
+    "prismjs": "^1.29.0",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "react-error-boundary": "^5.0.0",
    "react-simple-code-editor": "^0.14.1",
-    "sass": "^1.96.0",
-    "superjson": "2.2.6",
+    "sass": "^1.85.0",
+    "superjson": "2.2.2",
+    "swagger-ui-react": "^5.19.0",
    "use-deep-compare-effect": "^1.8.1",
-    "zod": "^4.1.13"
+    "zod": "^3.24.2"
  },
  "devDependencies": {
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/chroma-js": "3.1.2",
-    "@types/node": "^24.10.4",
+    "@types/chroma-js": "3.1.1",
+    "@types/node": "^22.13.5",
    "@types/prismjs": "^1.26.5",
-    "@types/react": "19.2.7",
-    "@types/react-dom": "19.2.3",
-    "concurrently": "^9.2.1",
-    "eslint": "^9.39.2",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
+    "@types/swagger-ui-react": "^5.18.0",
+    "concurrently": "^9.1.2",
+    "eslint": "^9.21.0",
    "node-loader": "^2.1.0",
-    "prettier": "^3.7.4",
-    "typescript": "^5.9.3"
+    "prettier": "^3.5.2",
+    "typescript": "^5.7.3"
  }
 }
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 139.3 512.2 233.5"><path d="M256 139.3c-53 0-97.9 35.8-112.1 84.4-12.2-25.5-38.2-43.4-68.2-43.4C34.2 180.2 0 214.4 0 256s34.2 75.8 75.8 75.8c30 0 55.9-17.9 68.2-43.4 14.1 48.6 59.1 84.4 112.1 84.4S354 337 368.2 288.4c12.2 25.5 38.2 43.4 68.2 43.4 41.6 0 75.8-34.2 75.8-75.8s-34.2-75.8-75.8-75.8c-30 0-55.9 17.9-68.2 43.4-14.3-48.5-59.2-84.3-112.2-84.3m0 45c39.9 0 71.7 31.8 71.7 71.7s-31.8 71.7-71.7 71.7-71.7-31.8-71.7-71.7 31.8-71.7 71.7-71.7m-180.2 41c17.2 0 30.7 13.5 30.7 30.7S93 286.7 75.8 286.7 45.1 273.2 45.1 256s13.4-30.7 30.7-30.7m360.4 0c17.2 0 30.7 13.5 30.7 30.7s-13.5 30.7-30.7 30.7-30.7-13.5-30.7-30.7 13.5-30.7 30.7-30.7" style="fill:#3784c9"/></svg>
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cm.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="33.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="771"
-     inkscape:window-x="1"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3349"
-       transform="translate(0.11778981,0.45794291)">
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 8.236948,6.2914262 5.825001,0"
-         id="path876" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 5.723058,6.2914262 1.45834,0"
-         id="path880" />
-      <a
-         id="a3346">
-        <path
-           id="path884"
-           d="m 10.353619,8.4080928 3.70833,0"
-           inkscape:connector-curvature="0"
-           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-           inkscape:export-xdpi="376.57999"
-           inkscape:export-ydpi="376.57999" />
-      </a>
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 7.839728,8.4080928 1.4583305,0"
-         id="path888" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 10.353619,10.52476 3.70833,0"
-         id="path892" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 7.839728,10.52476 1.4583305,0"
-         id="path896" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 8.236948,12.641428 5.825001,0"
-         id="path900" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 5.723058,12.641428 1.45834,0"
-         id="path904" />
-    </g>
-  </g>
-</svg>
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ing.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="28.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       id="path7709"
-       pointer-events="none"
-       d="m 12.75799,13.997178 -2.270701,0 -4.9209009,-6.1558617 -1.42366,0 0,-2.0149069 2.31473,0 4.9230119,6.1558536 1.37752,0 0,-1.593474 3.119869,2.599882 -3.119869,2.601983 z m -2.47616,-4.7552751 1.09864,-1.3754256 1.37752,0 0,1.593475 3.119869,-2.5998829 -3.119869,-2.601983 0,1.593483 -2.270701,0 -1.4571904,1.8241102 z m -3.5979219,1.3649431 -1.11752,1.400578 -1.42366,0 0,2.014915 2.31473,0 1.4781699,-1.849278 z"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.20966817" />
-  </g>
-</svg>
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ns.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="23.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <rect
-       y="6.5793304"
-       x="6.1734986"
-       height="6.6900792"
-       width="7.6735892"
-       id="rect8790"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0.80000001, 0.4;stroke-dashoffset:3.44000006;stroke-opacity:1" />
-  </g>
-</svg>
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="node.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="16.847496"
-     inkscape:cy="33.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccc"
-       id="path1994"
-       d="M 9.9921803,5.0101759 C 9.8538505,5.0057759 5.9970805,6.902049 5.9466504,6.999295 c -0.12117,0.233682 -0.9989,4.281827 -0.94731,4.369074 0.03,0.05065 0.66219,0.851861 1.40458,1.780327 l 1.3498201,1.688014 2.2211901,9.31e-4 2.2216404,9.31e-4 1.41321,-1.765731 1.41365,-1.765228 -0.49479,-2.1685759 C 14.256441,7.946271 14.012981,6.950423 13.988111,6.926433 13.918611,6.859553 10.067151,5.0126389 9.9921803,5.0102179 Z m 0.1961407,0.947753 0.90893,0.2635771 -0.90893,0.263576 -0.9089209,-0.263576 z m -0.9089209,0.36452 0.8511209,0.2532261 -0.004,1.183289 -0.8468109,-0.469347 z m 1.8178509,0 0,0.9671681 -0.84679,0.469347 -0.004,-1.183289 z M 8.8997705,7.937127 9.8087101,8.2007027 8.8997705,8.4642797 7.9908504,8.2007027 Z m 2.2087005,0 0.90894,0.2635757 -0.90894,0.263577 -0.90893,-0.263577 z m -3.1176206,0.3645197 0.8511202,0.252792 -0.004,1.1832908 -0.8468199,-0.468915 z m 1.8178597,0 0,0.9671678 -0.8468098,0.468915 -0.004,-1.1832908 z m 0.3908309,0 0.85113,0.252792 -0.004,1.1832908 -0.84682,-0.468915 z m 1.81787,0 0,0.9671678 -0.84682,0.468915 -0.004,-1.1832908 z m -3.4496605,1.515028 c 0.2706299,0.0096 0.0611,0.2819093 0.3684101,0.4279353 0.3277495,0.155764 0.3953995,-0.235354 0.6013395,0.06341 0.20599,0.298766 -0.18339,0.223239 -0.15443,0.584957 0.029,0.361718 0.40165,0.224858 0.24589,0.552606 -0.15575,0.327746 -0.28532,-0.04764 -0.5840895,0.158317 -0.2987401,0.205957 0.006,0.460208 -0.35546,0.489192 -0.3617401,0.02898 -0.1015001,-0.270447 -0.42924,-0.426208 -0.32775,-0.155765 -0.3953801,0.234921 -0.6013402,-0.06385 -0.2059599,-0.298767 0.1838299,-0.22281 0.15485,-0.584528 -0.029,-0.361718 -0.4016499,-0.224859 -0.24587,-0.552604 0.1557501,-0.327749 0.2848801,0.04764 0.5836502,-0.15832 0.2987898,-0.205956 -0.006,-0.4602083 0.3559099,-0.4891903 0.022499,-0.0018 0.0424,-0.0023 0.0604,-0.0018 z m 2.3359605,0.3627943 c 0.48335,0.01358 0.0146,0.467218 0.45596,0.664766 0.44144,0.197548 0.46714,-0.454103 0.79937,-0.102669 0.33221,0.351432 -0.31997,0.34064 -0.14753,0.792455 0.17243,0.451813 0.65163,0.0092 0.63802,0.49264 -0.0137,0.483411 -0.46723,0.01456 -0.66477,0.455977 -0.19755,0.441412 0.4541,0.467143 0.10266,0.799357 -0.35141,0.332212 -0.34021,-0.319974 -0.79202,-0.147534 -0.45183,0.172437 -0.009,0.65161 -0.49265,0.638019 -0.48339,-0.01358 -0.0146,-0.467216 -0.45596,-0.664764 -0.4414105,-0.197551 -0.4675805,0.454102 -0.7997909,0.102669 -0.3322097,-0.351431 0.3199804,-0.340209 0.14754,-0.792025 -0.17245,-0.451815 -0.6516296,-0.0092 -0.6380295,-0.492642 0.013699,-0.483408 0.4672095,-0.01499 0.6647795,-0.456405 0.1975204,-0.441414 -0.45411,-0.467143 -0.10269,-0.799357 0.3514505,-0.332213 0.3406505,0.319971 0.7924609,0.147534 0.45184,-0.17244 0.009,-0.651611 0.49265,-0.638021 z m -2.3148207,0.253655 c -0.2936499,9e-5 -0.5316098,0.238249 -0.5314498,0.531898 7.99e-5,0.293481 0.2379701,0.531377 0.5314498,0.531467 0.2936602,1.59e-4 0.5318202,-0.23781 0.5319,-0.531467 1.601e-4,-0.293825 -0.2380699,-0.532057 -0.5319,-0.531898 z m 2.2643607,0.480564 c -0.58689,-1.96e-4 -1.0627109,0.475614 -1.0625209,1.062502 5e-5,0.586719 0.4758009,1.062267 1.0625209,1.062071 0.58654,-5.8e-5 1.06201,-0.475531 1.06206,-1.062071 1.9e-4,-0.586708 -0.47535,-1.062444 -1.06206,-1.062502 z"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:11.23642349;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pod.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="33.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3341"
-       transform="translate(0.12766661,0.35147801)">
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="M 6.2617914,7.036086 9.8826317,5.986087 13.503462,7.036086 9.8826317,8.086087 Z"
-         id="path910" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 6.2617914,7.43817 0,3.852778 3.3736103,1.868749 0.0167,-4.713193 z"
-         id="path912" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 13.503462,7.43817 0,3.852778 -3.37361,1.868749 -0.0167,-4.713193 z"
-         id="path914" />
-    </g>
-  </g>
-</svg>
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="secret.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="28.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3347"
-       transform="translate(0.05710921,0.77487342)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 10.414299,8.0912253 3.708331,0"
-         id="path922" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79400003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 8.2976282,5.9745582 5.8250018,0"
-         id="path930" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 5.7837382,5.9745582 1.45834,0"
-         id="path934" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#326ce5;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 7.7183782,8.4321603 0,0 c 0,-1.1667021 1.0110897,-2.1125011 2.2583305,-2.1125011 1.2472403,0 2.2583303,0.945799 2.2583303,2.1125011 l -1.05624,0 0,0 c 0,-0.583351 -0.5382,-1.0562501 -1.2020903,-1.0562501 -0.6638904,0 -1.2020808,0.4728991 -1.2020808,1.0562501 z"
-         id="path936" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 10.414299,10.207893 3.708331,0"
-         id="path942" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 8.2976282,12.32456 5.8250018,0"
-         id="path950" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 5.7837382,12.32456 1.45834,0"
-         id="path954" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#326ce5;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 7.1622182,8.3691063 5.6166608,0 0,3.6583337 -5.6166608,0 z"
-         id="path956" />
-      <circle
-         r="0.55515254"
-         cy="10.198272"
-         cx="9.9705448"
-         id="path7280"
-         style="opacity:1;fill:#326ce5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26478875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0.52957746, 0.26478873;stroke-dashoffset:5.01860619;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="svc.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-2.090004"
-     inkscape:cy="28.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3345"
-       transform="translate(0.09238801,0.66897746)">
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 4.4949896,11.260826 2.9083311,0 0,2.041667 -2.9083311,0 z"
-         id="path964" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 8.4637407,11.260826 2.9083303,0 0,2.041667 -2.9083303,0 z"
-         id="path966" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 12.432491,11.260826 2.90833,0 0,2.041667 -2.90833,0 z"
-         id="path968" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 7.6137407,5.2082921 4.6083303,0 0,2.041667 -4.6083303,0 z"
-         id="path970" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 9.9179005,7.2499601 0,2.005449 -3.966671,0 0,2.0028859"
-         id="path978" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52899998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 9.9179005,7.2499601 0,2.005449 3.9666705,0 0,2.0028859"
-         id="path986" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 9.9095538,7.2512251 0,2.005449 0.0167,0 0,2.0028859"
-         id="path982" />
-    </g>
-  </g>
-</svg>
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18.035334mm"
-   height="17.500378mm"
-   viewBox="0 0 18.035334 17.500378"
-   version="1.1"
-   id="svg13826"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pv.svg">
-  <defs
-     id="defs13820" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-12.090004"
-     inkscape:cy="28.752239"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="775"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata13823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-0.99262638,-1.174181)">
-    <g
-       id="g70"
-       transform="matrix(1.0148887,0,0,1.0148887,16.902146,-2.698726)">
-      <path
-         inkscape:export-ydpi="250.55"
-         inkscape:export-xdpi="250.55"
-         inkscape:export-filename="new.png"
-         inkscape:connector-curvature="0"
-         id="path3055"
-         d="m -6.8492015,4.2724668 a 1.1191255,1.1099671 0 0 0 -0.4288818,0.1085303 l -5.8524037,2.7963394 a 1.1191255,1.1099671 0 0 0 -0.605524,0.7529759 l -1.443828,6.2812846 a 1.1191255,1.1099671 0 0 0 0.151943,0.851028 1.1191255,1.1099671 0 0 0 0.06362,0.08832 l 4.0508,5.036555 a 1.1191255,1.1099671 0 0 0 0.874979,0.417654 l 6.4961011,-0.0015 a 1.1191255,1.1099671 0 0 0 0.8749788,-0.416906 L 1.3818872,15.149453 A 1.1191255,1.1099671 0 0 0 1.5981986,14.210104 L 0.15212657,7.9288154 A 1.1191255,1.1099671 0 0 0 -0.45339794,7.1758396 L -6.3065496,4.3809971 A 1.1191255,1.1099671 0 0 0 -6.8492015,4.2724668 Z"
-         style="fill:#326ce5;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path3054-2-9"
-         d="M -6.8523435,3.8176372 A 1.1814304,1.171762 0 0 0 -7.3044284,3.932904 l -6.1787426,2.9512758 a 1.1814304,1.171762 0 0 0 -0.639206,0.794891 l -1.523915,6.6308282 a 1.1814304,1.171762 0 0 0 0.160175,0.89893 1.1814304,1.171762 0 0 0 0.06736,0.09281 l 4.276094,5.317236 a 1.1814304,1.171762 0 0 0 0.92363,0.440858 l 6.8576188,-0.0015 a 1.1814304,1.171762 0 0 0 0.9236308,-0.44011 l 4.2745966,-5.317985 a 1.1814304,1.171762 0 0 0 0.228288,-0.990993 L 0.53894439,7.6775738 A 1.1814304,1.171762 0 0 0 -0.10026101,6.8834313 L -6.2790037,3.9321555 A 1.1814304,1.171762 0 0 0 -6.8523435,3.8176372 Z m 0.00299,0.4550789 a 1.1191255,1.1099671 0 0 1 0.5426517,0.1085303 l 5.85315169,2.7948425 A 1.1191255,1.1099671 0 0 1 0.15197811,7.9290648 L 1.598051,14.21035 a 1.1191255,1.1099671 0 0 1 -0.2163123,0.939348 l -4.0493032,5.037304 a 1.1191255,1.1099671 0 0 1 -0.8749789,0.416906 l -6.4961006,0.0015 a 1.1191255,1.1099671 0 0 1 -0.874979,-0.417652 l -4.0508,-5.036554 a 1.1191255,1.1099671 0 0 1 -0.06362,-0.08832 1.1191255,1.1099671 0 0 1 -0.151942,-0.851028 l 1.443827,-6.2812853 a 1.1191255,1.1099671 0 0 1 0.605524,-0.7529758 l 5.8524036,-2.7963395 a 1.1191255,1.1099671 0 0 1 0.4288819,-0.1085303 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3341"
-       transform="translate(-0.18983289,0.49258906)">
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 5.5709614,7.9105849 0,0 c 0,0.621121 2.0725401,1.124639 4.6291706,1.124639 2.556609,0 4.629159,-0.503518 4.629159,-1.124639 l 0,3.0423911 c 0,0.62112 -2.07255,1.124638 -4.629159,1.124638 -2.5566305,0 -4.6291706,-0.503518 -4.6291706,-1.124638 z"
-         id="path1114" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332;stroke-linecap:square;stroke-miterlimit:10"
-         inkscape:connector-curvature="0"
-         d="m 5.5709614,7.9105849 0,0 c 0,-0.621119 2.0725401,-1.124637 4.6291706,-1.124637 2.556609,0 4.629159,0.503518 4.629159,1.124637 l 0,0 c 0,0.621121 -2.07255,1.124639 -4.629159,1.124639 -2.5566305,0 -4.6291706,-0.503518 -4.6291706,-1.124639 z"
-         id="path1116" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#326ce5;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 14.829291,7.9105849 0,0 c 0,0.621121 -2.07255,1.124639 -4.629159,1.124639 -2.5566205,0 -4.6291706,-0.503518 -4.6291706,-1.124639 l 0,0 c 0,-0.621119 2.0725501,-1.124637 4.6291706,-1.124637 2.556609,0 4.629159,0.503518 4.629159,1.124637 l 0,3.0423911 c 0,0.62112 -2.07255,1.124638 -4.629159,1.124638 -2.5566205,0 -4.6291706,-0.503518 -4.6291706,-1.124638 l 0,-3.0423911"
-         id="path1120" />
-    </g>
-  </g>
-</svg>
@@ -7,11 +7,11 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
 import {
  createWSClient,
-  httpBatchStreamLink,
  httpLink,
  isNonJsonSerializable,
  loggerLink,
  splitLink,
+  unstable_httpBatchStreamLink,
  wsLink,
 } from "@trpc/client";
 import superjson from "superjson";
@@ -90,7 +90,7 @@ export function TRPCReactProvider(props: PropsWithChildren) {
              url: getTrpcUrl(),
              headers: createHeadersCallbackForSource("nextjs-react (form-data)"),
            }),
-            false: httpBatchStreamLink({
+            false: unstable_httpBatchStreamLink({
              transformer: superjson,
              url: getTrpcUrl(),
              maxURLLength: 2083, // Suggested by tRPC: https://trpc.io/docs/client/links/httpBatchLink#setting-a-maximum-url-length
@@ -2,14 +2,14 @@

 import { useRouter } from "next/navigation";
 import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
-import { userRegistrationSchema } from "@homarr/validation/user";
+import { validation } from "@homarr/validation";

 interface RegistrationFormProps {
  invite: {
@@ -22,7 +22,7 @@ export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
  const t = useScopedI18n("user");
  const router = useRouter();
  const { mutate, isPending } = clientApi.user.register.useMutation();
-  const form = useZodForm(userRegistrationSchema, {
+  const form = useZodForm(validation.user.registration, {
    initialValues: {
      username: "",
      password: "",
@@ -30,7 +30,7 @@ export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
    },
  });

-  const handleSubmit = (values: z.infer<typeof userRegistrationSchema>) => {
+  const handleSubmit = (values: z.infer<typeof validation.user.registration>) => {
    mutate(
      {
        ...values,
@@ -64,23 +64,16 @@ export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
    <Stack gap="xl">
      <form onSubmit={form.onSubmit(handleSubmit)}>
        <Stack gap="lg">
-          <TextInput
-            label={t("field.username.label")}
-            id="username"
-            autoComplete="username"
-            {...form.getInputProps("username")}
-          />
+          <TextInput label={t("field.username.label")} autoComplete="off" {...form.getInputProps("username")} />
          <CustomPasswordInput
            withPasswordRequirements
            label={t("field.password.label")}
-            id="password"
            autoComplete="new-password"
            {...form.getInputProps("password")}
          />

          <PasswordInput
            label={t("field.passwordConfirm.label")}
-            id="password-confirm"
            autoComplete="new-password"
            {...form.getInputProps("confirmPassword")}
          />
@@ -63,8 +63,7 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {
          <RegistrationForm invite={invite} />
        </Card>
        <Text size="xs" c="gray.5" ta="center">
-          {/* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */}
-          {t("description", { username: invite.creator.name! })}
+          {t("description", { username: invite.creator.name })}
        </Text>
      </Stack>
    </Center>
@@ -2,10 +2,10 @@

 import type { PropsWithChildren } from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import { Anchor, Button, Card, Code, Collapse, Divider, PasswordInput, Stack, Text, TextInput } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { z } from "zod/v4";
+import { z } from "zod";

 import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -13,9 +13,7 @@ import type { useForm } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
-import { userSignInSchema } from "@homarr/validation/user";
-
-type Provider = "credentials" | "ldap" | "oidc";
+import { validation } from "@homarr/validation";

 interface LoginFormProps {
  providers: string[];
@@ -24,12 +22,10 @@ interface LoginFormProps {
  callbackUrl: string;
 }

-const extendedValidation = userSignInSchema.extend({ provider: z.enum(["credentials", "ldap"]) });
+const extendedValidation = validation.user.signIn.extend({ provider: z.enum(["credentials", "ldap"]) });

 export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, callbackUrl }: LoginFormProps) => {
  const t = useScopedI18n("user");
-  const searchParams = useSearchParams();
-  const isError = searchParams.has("error");
  const router = useRouter();
  const [isPending, setIsPending] = useState(false);
  const form = useZodForm(extendedValidation, {
@@ -43,34 +39,22 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
  const credentialInputsVisible = providers.includes("credentials") || providers.includes("ldap");

  const onSuccess = useCallback(
-    async (provider: Provider, response: Awaited<ReturnType<typeof signIn>>) => {
-      if (!response.ok || response.error) {
+    async (response: Awaited<ReturnType<typeof signIn>>) => {
+      if (response && (!response.ok || response.error)) {
        // eslint-disable-next-line @typescript-eslint/only-throw-error
        throw response.error;
      }

-      if (provider === "oidc") {
-        if (!response.url) {
-          showErrorNotification({
-            title: t("action.login.notification.error.title"),
-            message: t("action.login.notification.error.message"),
-            autoClose: 10000,
-          });
-          return;
-        }
-
-        router.push(response.url);
-        return;
-      }
-
      showSuccessNotification({
        title: t("action.login.notification.success.title"),
        message: t("action.login.notification.success.message"),
      });

      // Redirect to the callback URL if the response is defined and comes from a credentials provider (ldap or credentials). oidc is redirected automatically.
-      await revalidatePathActionAsync("/");
-      router.push(callbackUrl);
+      if (response) {
+        await revalidatePathActionAsync("/");
+        router.push(callbackUrl);
+      }
    },
    [t, router, callbackUrl],
  );
@@ -86,14 +70,14 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
  }, [t]);

  const signInAsync = useCallback(
-    async (provider: Provider, options?: Parameters<typeof signIn>[1]) => {
+    async (provider: string, options?: Parameters<typeof signIn>[1]) => {
      setIsPending(true);
      await signIn(provider, {
        ...options,
        redirect: false,
        callbackUrl: new URL(callbackUrl, window.location.href).href,
      })
-        .then((response) => onSuccess(provider, response))
+        .then(onSuccess)
        .catch(onError);
    },
    [setIsPending, onSuccess, onError, callbackUrl],
@@ -102,12 +86,11 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
  const isLoginInProgress = useRef(false);

  useEffect(() => {
-    if (isError) return;
    if (isOidcAutoLoginEnabled && !isPending && !isLoginInProgress.current) {
      isLoginInProgress.current = true;
      void signInAsync("oidc");
    }
-  }, [signInAsync, isOidcAutoLoginEnabled, isPending, isError]);
+  }, [signInAsync, isOidcAutoLoginEnabled, isPending]);

  return (
    <Stack gap="xl">
@@ -116,18 +99,8 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
          <>
            <form onSubmit={form.onSubmit((credentials) => void signInAsync(credentials.provider, credentials))}>
              <Stack gap="lg">
-                <TextInput
-                  label={t("field.username.label")}
-                  id="username"
-                  autoComplete="username"
-                  {...form.getInputProps("name")}
-                />
-                <PasswordInput
-                  label={t("field.password.label")}
-                  id="password"
-                  autoComplete="current-password"
-                  {...form.getInputProps("password")}
-                />
+                <TextInput label={t("field.username.label")} {...form.getInputProps("name")} />
+                <PasswordInput label={t("field.password.label")} {...form.getInputProps("password")} />

                {providers.includes("credentials") && (
                  <Stack gap="sm">
@@ -5,7 +5,7 @@ import { Box, LoadingOverlay, Stack } from "@mantine/core";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
+import { useRequiredBoard } from "@homarr/boards/context";

 import { BoardCategorySection } from "~/components/board/sections/category-section";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
@@ -43,7 +43,6 @@ export const useUpdateBoard = () => {

 export const ClientBoard = () => {
  const board = useRequiredBoard();
-  const currentLayoutId = useCurrentLayout();
  const isReady = useIsBoardReady();

  const fullWidthSortedSections = board.sections
@@ -64,10 +63,9 @@ export const ClientBoard = () => {
      <Stack ref={ref} h="100%" style={{ visibility: isReady ? "visible" : "hidden" }}>
        {fullWidthSortedSections.map((section) =>
          section.kind === "empty" ? (
-            // Unique keys per layout to always reinitialize the gridstack
-            <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
+            <BoardEmptySection key={section.id} section={section} />
          ) : (
-            <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />
+            <BoardCategorySection key={section.id} section={section} />
          ),
        )}
      </Stack>
@@ -4,27 +4,18 @@ import { TRPCError } from "@trpc/server";
 // Placed here because gridstack styles are used for board content
 import "~/styles/gridstack.scss";

-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
-
-import { getQueryClient } from "@homarr/api/server";
 import { IntegrationProvider } from "@homarr/auth/client";
 import { auth } from "@homarr/auth/next";
 import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
 import { isNullOrWhitespace } from "@homarr/common";
-import { createLogger } from "@homarr/core/infrastructure/logs";
-import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
-import type { WidgetKind } from "@homarr/definitions";
 import { getI18n } from "@homarr/translation/server";
-import { prefetchForKindAsync } from "@homarr/widgets/prefetch";

 import { createMetaTitle } from "~/metadata";
 import { createBoardLayout } from "../_layout-creator";
-import type { Board, Item } from "../_types";
-import { DynamicClientBoard } from "./_dynamic-client";
+import type { Board } from "../_types";
+import { ClientBoard } from "./_client";
 import { BoardContentHeaderActions } from "./_header-actions";

-const logger = createLogger({ module: "createBoardContentPage" });
-
 export type Params = Record<string, unknown>;

 interface Props<TParams extends Params> {
@@ -40,47 +31,19 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
      getInitialBoardAsync: getInitialBoard,
    }),
    // eslint-disable-next-line no-restricted-syntax
-    page: async ({ params }: { params: Promise<TParams> }) => {
+    page: async () => {
      const session = await auth();
      const integrations = await getIntegrationsWithPermissionsAsync(session);

-      const board = await getInitialBoard(await params);
-      const queryClient = getQueryClient();
-
-      // Prefetch item data
-      const itemsMap = board.items.reduce((acc, item) => {
-        const existing = acc.get(item.kind);
-        if (existing) {
-          existing.push(item);
-        } else {
-          acc.set(item.kind, [item]);
-        }
-        return acc;
-      }, new Map<WidgetKind, Item[]>());
-
-      for (const [kind, items] of itemsMap) {
-        await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
-          logger.error(
-            new ErrorWithMetadata(
-              "Failed to prefetch widget",
-              { widgetKind: kind, itemCount: items.length },
-              { cause: error },
-            ),
-          );
-        });
-      }
-
      return (
-        <HydrationBoundary state={dehydrate(queryClient)}>
-          <IntegrationProvider integrations={integrations}>
-            <DynamicClientBoard />
-          </IntegrationProvider>
-        </HydrationBoundary>
+        <IntegrationProvider integrations={integrations}>
+          <ClientBoard />
+        </IntegrationProvider>
      );
    },
-    generateMetadataAsync: async ({ params }: { params: Promise<TParams> }): Promise<Metadata> => {
+    generateMetadataAsync: async ({ params }: { params: TParams }): Promise<Metadata> => {
      try {
-        const board = await getInitialBoard(await params);
+        const board = await getInitialBoard(params);
        const t = await getI18n();

        return {
@@ -1,7 +0,0 @@
-"use client";
-
-import dynamic from "next/dynamic";
-
-export const DynamicClientBoard = dynamic(() => import("./_client").then((mod) => mod.ClientBoard), {
-  ssr: false,
-});
@@ -1,8 +1,10 @@
 "use client";

+import type { MouseEvent } from "react";
 import { useCallback, useEffect } from "react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { Group, Menu, ScrollArea } from "@mantine/core";
+import { Group, Menu } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
 import {
  IconBox,
@@ -18,19 +20,14 @@ import {
 } from "@tabler/icons-react";

 import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { env } from "@homarr/common/env";
-import { hotkeys } from "@homarr/definitions";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
-import { AppSelectModal } from "@homarr/modals-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import { Link } from "@homarr/ui";

-import { useItemActions } from "~/components/board/items/item-actions";
 import { ItemSelectModal } from "~/components/board/items/item-select-modal";
 import { useBoardPermissions } from "~/components/board/permissions/client";
 import { useCategoryActions } from "~/components/board/sections/category/category-actions";
@@ -44,7 +41,7 @@ export const BoardContentHeaderActions = () => {
  const { hasChangeAccess } = useBoardPermissions(board);

  if (!hasChangeAccess) {
-    return <SelectBoardsMenu />;
+    return null; // Hide actions for user without access
  }

  return (
@@ -63,13 +60,10 @@ export const BoardContentHeaderActions = () => {
 };

 const AddMenu = () => {
-  const { data: session } = useSession();
  const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
  const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
-  const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
  const { addCategoryToEnd } = useCategoryActions();
  const { addDynamicSection } = useDynamicSectionActions();
-  const { createItem } = useItemActions();
  const t = useI18n();

  const handleAddCategory = useCallback(
@@ -96,18 +90,6 @@ const AddMenu = () => {
    openItemSelectModal();
  }, [openItemSelectModal]);

-  const handleSelectApp = useCallback(() => {
-    openAppSelectModal({
-      onSelect: (app) => {
-        createItem({
-          kind: "app",
-          options: { appId: app.id },
-        });
-      },
-      withCreate: session?.user.permissions.includes("app-create") ?? false,
-    });
-  }, [openAppSelectModal, createItem]);
-
  return (
    <Menu position="bottom-end" withArrow>
      <Menu.Target>
@@ -119,14 +101,10 @@ const AddMenu = () => {
        </HeaderButton>
      </Menu.Target>
      <Menu.Dropdown style={{ transform: "translate(-3px, 0)" }}>
-        <Menu.Item leftSection={<IconResize size={20} />} onClick={handleSelectItem}>
+        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectItem}>
          {t("item.action.create")}
        </Menu.Item>

-        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectApp}>
-          {t("app.action.add")}
-        </Menu.Item>
-
        <Menu.Divider />

        <Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
@@ -169,7 +147,7 @@ const EditModeMenu = () => {
    open();
  }, [board, isEditMode, saveBoard, open]);

-  useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
+  useHotkeys([["mod+e", toggle]]);
  usePreventLeaveWithDirty(isEditMode);

  return (
@@ -190,39 +168,32 @@ const SelectBoardsMenu = () => {
        </HeaderButton>
      </Menu.Target>
      <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
-        <ScrollArea.Autosize mah={300}>
-          {boards.map((board) => (
-            <Menu.Item
-              key={board.id}
-              component={Link}
-              href={`/boards/${board.name}`}
-              leftSection={<IconLayoutBoard size={20} />}
-            >
-              {board.name}
-            </Menu.Item>
-          ))}
-        </ScrollArea.Autosize>
+        {boards.map((board) => (
+          <Menu.Item
+            key={board.id}
+            component={Link}
+            href={`/boards/${board.name}`}
+            leftSection={<IconLayoutBoard size={20} />}
+          >
+            {board.name}
+          </Menu.Item>
+        ))}
      </Menu.Dropdown>
    </Menu>
  );
 };

-const anchorSelector = "a[href]:not([target='_blank'])";
 const usePreventLeaveWithDirty = (isDirty: boolean) => {
  const t = useI18n();
  const { openConfirmModal } = useConfirmModal();
  const router = useRouter();

  useEffect(() => {
-    if (!isDirty) return;
-
-    const handleClick = (event: Event) => {
+    const handleClick = (event: MouseEvent<HTMLElement>) => {
      const target = (event.target as HTMLElement).closest("a");

-      if (!target) {
-        console.warn("No anchor element found for click event", event);
-        return;
-      }
+      if (!target) return;
+      if (!isDirty) return;

      event.preventDefault();

@@ -239,29 +210,33 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
    };

    const handlePopState = (event: Event) => {
-      window.history.pushState(null, document.title, window.location.href);
-      event.preventDefault();
+      if (isDirty) {
+        window.history.pushState(null, document.title, window.location.href);
+        event.preventDefault();
+      } else {
+        window.history.back();
+      }
    };

    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+      if (!isDirty) return;
      if (env.NODE_ENV === "development") return; // Allow to reload in development

      event.preventDefault();
      event.returnValue = true;
    };

-    const anchors = document.querySelectorAll(anchorSelector);
-    anchors.forEach((link) => {
-      link.addEventListener("click", handleClick);
+    document.querySelectorAll("a").forEach((link) => {
+      link.addEventListener("click", handleClick as never);
    });
    window.addEventListener("popstate", handlePopState);
    window.addEventListener("beforeunload", handleBeforeUnload);

    return () => {
-      anchors.forEach((link) => {
-        link.removeEventListener("click", handleClick);
+      document.querySelectorAll("a").forEach((link) => {
+        link.removeEventListener("click", handleClick as never);
+        window.removeEventListener("popstate", handlePopState);
      });
-      window.removeEventListener("popstate", handlePopState);
      window.removeEventListener("beforeunload", handleBeforeUnload);
    };
    // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -2,7 +2,7 @@

 import type { PropsWithChildren } from "react";
 import type { MantineColorsTuple } from "@mantine/core";
-import { colorsTuple, createTheme, darken, lighten, MantineProvider, rem } from "@mantine/core";
+import { colorsTuple, createTheme, darken, lighten, MantineProvider } from "@mantine/core";

 import { useRequiredBoard } from "@homarr/boards/context";
 import type { ColorScheme } from "@homarr/definitions";
@@ -24,11 +24,6 @@ export const BoardMantineProvider = ({
    },
    primaryColor: "primaryColor",
    autoContrast: true,
-    fontSizes: {
-      "2xl": rem(24),
-      "3xl": rem(28),
-      "4xl": rem(36),
-    },
  });

  return (
@@ -17,11 +17,10 @@ import {
  useMantineTheme,
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { IconX } from "@tabler/icons-react";

 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
-import { boardSavePartialSettingsSchema } from "@homarr/validation/board";
+import { validation } from "@homarr/validation";

 import type { Board } from "../../_types";
 import { generateColors } from "../../(content)/_theme";
@@ -36,7 +35,7 @@ const hexRegex = /^#[0-9a-fA-F]{6}$/;
 const progressPercentageLabel = (value: number) => `${value}%`;

 export const ColorSettingsContent = ({ board }: Props) => {
-  const form = useZodForm(boardSavePartialSettingsSchema, {
+  const form = useZodForm(validation.board.savePartialSettings, {
    initialValues: {
      primaryColor: board.primaryColor,
      secondaryColor: board.secondaryColor,
@@ -103,25 +102,12 @@ export const ColorSettingsContent = ({ board }: Props) => {
            </InputWrapper>
          </Grid.Col>
          <Grid.Col span={{ sm: 12, md: 6 }}>
-            <Group align="end">
-              <ColorInput
-                label={t("board.field.iconColor.label")}
-                format="hex"
-                swatches={Object.values(theme.colors).map((color) => color[6])}
-                flex={1}
-                {...form.getInputProps("iconColor")}
-              />
-              <Button
-                variant="subtle"
-                leftSection={<IconX />}
-                onClick={() => form.setFieldValue("iconColor", "")}
-                disabled={!form.values.iconColor}
-              >
-                {t("board.field.clearColor.label")}
-              </Button>
-            </Group>
-          </Grid.Col>
-          <Grid.Col span={{ sm: 12, md: 6 }}>
+            <ColorInput
+              label={t("board.field.iconColor.label")}
+              format="hex"
+              swatches={Object.values(theme.colors).map((color) => color[6])}
+              {...form.getInputProps("iconColor")}
+            />
            <Select
              label={t("board.field.itemRadius.label")}
              description={t("board.field.itemRadius.description")}
@@ -137,7 +123,7 @@ export const ColorSettingsContent = ({ board }: Props) => {
          </Grid.Col>
        </Grid>
        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -1,20 +1,14 @@
 "use client";

-import { startTransition } from "react";
-import { ActionIcon, Autocomplete, Button, Center, Grid, Group, Popover, Stack, Text } from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import { IconPhotoOff, IconUpload } from "@tabler/icons-react";
+import { Button, Grid, Group, Stack, TextInput } from "@mantine/core";

-import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { backgroundImageAttachments, backgroundImageRepeats, backgroundImageSizes } from "@homarr/definitions";
 import { useZodForm } from "@homarr/form";
-import { UploadMedia } from "@homarr/forms-collection";
 import type { TranslationObject } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";
 import type { SelectItemWithDescriptionBadge } from "@homarr/ui";
 import { SelectWithDescriptionBadge } from "@homarr/ui";
-import { boardSavePartialSettingsSchema } from "@homarr/validation/board";
+import { validation } from "@homarr/validation";

 import type { Board } from "../../_types";
 import { useSavePartialSettingsMutation } from "./_shared";
@@ -24,9 +18,8 @@ interface Props {
 }
 export const BackgroundSettingsContent = ({ board }: Props) => {
  const t = useI18n();
-  const { data: session } = useSession();
  const { mutate: savePartialSettings, isPending } = useSavePartialSettingsMutation(board);
-  const form = useZodForm(boardSavePartialSettingsSchema, {
+  const form = useZodForm(validation.board.savePartialSettings, {
    initialValues: {
      backgroundImageUrl: board.backgroundImageUrl ?? "",
      backgroundImageAttachment: board.backgroundImageAttachment,
@@ -35,16 +28,6 @@ export const BackgroundSettingsContent = ({ board }: Props) => {
    },
  });

-  const [debouncedSearch] = useDebouncedValue(form.values.backgroundImageUrl, 200);
-  const medias = clientApi.media.getPaginated.useQuery({
-    page: 1,
-    pageSize: 10,
-    includeFromAllUsers: true,
-    search: debouncedSearch ?? "",
-  });
-  const images = medias.data?.items.filter((media) => media.contentType.startsWith("image/")) ?? [];
-  const imageMap = new Map(images.map((image) => [`/api/user-medias/${image.id}`, image]));
-
  const backgroundImageAttachmentData = useBackgroundOptionData(
    "backgroundImageAttachment",
    backgroundImageAttachments,
@@ -64,79 +47,10 @@ export const BackgroundSettingsContent = ({ board }: Props) => {
      <Stack>
        <Grid>
          <Grid.Col span={12}>
-            <Group wrap="nowrap" gap="xs" w="100%" align="start">
-              <Autocomplete
-                flex={1}
-                leftSection={
-                  form.values.backgroundImageUrl &&
-                  form.values.backgroundImageUrl.trim().length >= 2 && (
-                    <Popover width={300} withArrow>
-                      <Popover.Target>
-                        <Center h="100%">
-                          <ImagePreview src={form.values.backgroundImageUrl} w={20} h={20} />
-                        </Center>
-                      </Popover.Target>
-                      <Popover.Dropdown>
-                        <ImagePreview src={form.values.backgroundImageUrl} w="100%" />
-                      </Popover.Dropdown>
-                    </Popover>
-                  )
-                }
-                // We filter it on the server
-                filter={({ options }) => options}
-                label={t("board.field.backgroundImageUrl.label")}
-                placeholder={`${t("board.field.backgroundImageUrl.placeholder")}...`}
-                renderOption={({ option }) => {
-                  const current = imageMap.get(option.value);
-                  if (!current) return null;
-
-                  return (
-                    <Group gap="sm">
-                      <ImagePreview src={option.value} w={20} h={20} />
-                      <Stack gap={0}>
-                        <Text size="sm">{current.name}</Text>
-                        <Text size="xs" c="dimmed">
-                          {option.value}
-                        </Text>
-                      </Stack>
-                    </Group>
-                  );
-                }}
-                data={[
-                  {
-                    group: t("board.field.backgroundImageUrl.group.your"),
-                    items: images
-                      .filter((media) => media.creatorId === session?.user.id)
-                      .map((media) => `/api/user-medias/${media.id}`),
-                  },
-                  {
-                    group: t("board.field.backgroundImageUrl.group.other"),
-                    items: images
-                      .filter((media) => media.creatorId !== session?.user.id)
-                      .map((media) => `/api/user-medias/${media.id}`),
-                  },
-                ]}
-                {...form.getInputProps("backgroundImageUrl")}
-              />
-              {session?.user.permissions.includes("media-upload") && (
-                <UploadMedia
-                  onSuccess={(medias) => {
-                    const first = medias.at(0);
-                    if (!first) return;
-
-                    startTransition(() => {
-                      form.setFieldValue("backgroundImageUrl", first.url);
-                    });
-                  }}
-                >
-                  {({ onClick, loading }) => (
-                    <ActionIcon onClick={onClick} loading={loading} mt={24} size={36} variant="default">
-                      <IconUpload size={16} stroke={1.5} />
-                    </ActionIcon>
-                  )}
-                </UploadMedia>
-              )}
-            </Group>
+            <TextInput
+              label={t("board.field.backgroundImageUrl.label")}
+              {...form.getInputProps("backgroundImageUrl")}
+            />
          </Grid.Col>
          <Grid.Col span={12}>
            <SelectWithDescriptionBadge
@@ -162,7 +76,7 @@ export const BackgroundSettingsContent = ({ board }: Props) => {
        </Grid>

        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -171,21 +85,6 @@ export const BackgroundSettingsContent = ({ board }: Props) => {
  );
 };

-interface ImagePreviewProps {
-  src: string;
-  w: string | number;
-  h?: string | number;
-}
-
-const ImagePreview = ({ src, w, h }: ImagePreviewProps) => {
-  if (!["/", "http://", "https://"].some((prefix) => src.startsWith(prefix))) {
-    return <IconPhotoOff size={w} />;
-  }
-
-  // eslint-disable-next-line @next/next/no-img-element
-  return <img src={src} alt="preview image" style={{ width: w, height: h, objectFit: "contain" }} />;
-};
-
 type BackgroundImageKey = "backgroundImageAttachment" | "backgroundImageSize" | "backgroundImageRepeat";

 type inferOptions<TKey extends BackgroundImageKey> = TranslationObject["board"]["field"][TKey]["option"];
@@ -38,7 +38,7 @@ export const BehaviorSettingsContent = ({ board }: Props) => {
        />

        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -46,7 +46,7 @@ export const CustomCssSettingsContent = ({ board }: Props) => {
        </Alert>

        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -1,14 +1,14 @@
 "use client";

 import { useEffect, useRef } from "react";
-import { Button, Grid, Group, Loader, Stack, TextInput } from "@mantine/core";
+import { Button, Grid, Group, Loader, Stack, TextInput, Tooltip } from "@mantine/core";
 import { useDebouncedValue, useDocumentTitle, useFavicon } from "@mantine/hooks";
+import { IconAlertTriangle } from "@tabler/icons-react";

 import { useUpdateBoard } from "@homarr/boards/updater";
 import { useZodForm } from "@homarr/form";
-import { IconPicker } from "@homarr/forms-collection";
 import { useI18n } from "@homarr/translation/client";
-import { boardSavePartialSettingsSchema } from "@homarr/validation/board";
+import { validation } from "@homarr/validation";

 import { createMetaTitle } from "~/metadata";
 import type { Board } from "../../_types";
@@ -28,7 +28,7 @@ export const GeneralSettingsContent = ({ board }: Props) => {

  const { mutate: savePartialSettings, isPending } = useSavePartialSettingsMutation(board);
  const form = useZodForm(
-    boardSavePartialSettingsSchema
+    validation.board.savePartialSettings
      .pick({
        pageTitle: true,
        logoImageUrl: true,
@@ -52,9 +52,9 @@ export const GeneralSettingsContent = ({ board }: Props) => {
    },
  );

-  useLogoPreview(form.values.logoImageUrl);
-  useFaviconPreview(form.values.faviconImageUrl);
  const metaTitleStatus = useMetaTitlePreview(form.values.metaTitle);
+  const faviconStatus = useFaviconPreview(form.values.faviconImageUrl);
+  const logoStatus = useLogoPreview(form.values.logoImageUrl);

  // Cleanup for not applied changes of the page title and logo image URL
  useEffect(() => {
@@ -94,29 +94,29 @@ export const GeneralSettingsContent = ({ board }: Props) => {
            <TextInput
              label={t("board.field.metaTitle.label")}
              placeholder={createMetaTitle(t("board.content.metaTitle", { boardName: board.name }))}
-              rightSection={metaTitleStatus.isPending && <Loader size="xs" />}
+              rightSection={<PendingOrInvalidIndicator {...metaTitleStatus} />}
              {...form.getInputProps("metaTitle")}
            />
          </Grid.Col>
          <Grid.Col span={{ xs: 12, md: 6 }}>
-            <IconPicker
-              {...form.getInputProps("logoImageUrl")}
+            <TextInput
              label={t("board.field.logoImageUrl.label")}
              placeholder="/logo/logo.png"
-              withAsterisk={false}
+              rightSection={<PendingOrInvalidIndicator {...logoStatus} />}
+              {...form.getInputProps("logoImageUrl")}
            />
          </Grid.Col>
          <Grid.Col span={{ xs: 12, md: 6 }}>
-            <IconPicker
-              {...form.getInputProps("faviconImageUrl")}
+            <TextInput
              label={t("board.field.faviconImageUrl.label")}
              placeholder="/logo/logo.png"
-              withAsterisk={false}
+              rightSection={<PendingOrInvalidIndicator {...faviconStatus} />}
+              {...form.getInputProps("faviconImageUrl")}
            />
          </Grid.Col>
        </Grid>
        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -125,16 +125,40 @@ export const GeneralSettingsContent = ({ board }: Props) => {
  );
 };

+const PendingOrInvalidIndicator = ({ isPending, isInvalid }: { isPending: boolean; isInvalid?: boolean }) => {
+  const t = useI18n();
+
+  if (isInvalid) {
+    return (
+      <Tooltip multiline w={220} label={t("board.setting.section.general.unrecognizedLink")}>
+        <IconAlertTriangle size="1rem" color="red" />
+      </Tooltip>
+    );
+  }
+
+  if (isPending) {
+    return <Loader size="xs" />;
+  }
+
+  return null;
+};
+
 const useLogoPreview = (url: string | null) => {
  const { updateBoard } = useUpdateBoard();
  const [logoDebounced] = useDebouncedValue(url ?? "", 500);

  useEffect(() => {
+    if (!logoDebounced.includes(".") && logoDebounced.length >= 1) return;
    updateBoard((previous) => ({
      ...previous,
      logoImageUrl: logoDebounced.length >= 1 ? logoDebounced : null,
    }));
  }, [logoDebounced, updateBoard]);
+
+  return {
+    isPending: (url ?? "") !== logoDebounced,
+    isInvalid: logoDebounced.length >= 1 && !logoDebounced.includes("."),
+  };
 };

 const useMetaTitlePreview = (title: string | null) => {
@@ -146,7 +170,16 @@ const useMetaTitlePreview = (title: string | null) => {
  };
 };

+const validFaviconExtensions = ["ico", "png", "svg", "gif"];
+const isValidUrl = (url: string) =>
+  url.includes("/") && validFaviconExtensions.some((extension) => url.endsWith(`.${extension}`));
+
 const useFaviconPreview = (url: string | null) => {
  const [faviconDebounced] = useDebouncedValue(url ?? "", 500);
-  useFavicon(faviconDebounced);
+  useFavicon(isValidUrl(faviconDebounced) ? faviconDebounced : "");
+
+  return {
+    isPending: (url ?? "") !== faviconDebounced,
+    isInvalid: faviconDebounced.length >= 1 && !isValidUrl(faviconDebounced),
+  };
 };
@@ -1,111 +1,45 @@
 "use client";

-import { Button, Fieldset, Grid, Group, Input, NumberInput, Slider, Stack, Text, TextInput } from "@mantine/core";
+import { Button, Grid, Group, Input, Slider, Stack } from "@mantine/core";

-import { clientApi } from "@homarr/api/client";
-import { createId } from "@homarr/common";
 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
-import { boardSaveLayoutsSchema } from "@homarr/validation/board";
+import { validation } from "@homarr/validation";

 import type { Board } from "../../_types";
+import { useSavePartialSettingsMutation } from "./_shared";

 interface Props {
  board: Board;
 }
 export const LayoutSettingsContent = ({ board }: Props) => {
  const t = useI18n();
-  const utils = clientApi.useUtils();
-  const { mutate: saveLayouts, isPending } = clientApi.board.saveLayouts.useMutation({
-    onSettled() {
-      void utils.board.getBoardByName.invalidate({ name: board.name });
-      void utils.board.getHomeBoard.invalidate();
-    },
-  });
-  const form = useZodForm(boardSaveLayoutsSchema.omit({ id: true }).required(), {
+  const { mutate: savePartialSettings, isPending } = useSavePartialSettingsMutation(board);
+  const form = useZodForm(validation.board.savePartialSettings.pick({ columnCount: true }).required(), {
    initialValues: {
-      layouts: board.layouts,
+      columnCount: board.columnCount,
    },
  });

  return (
    <form
      onSubmit={form.onSubmit((values) => {
-        saveLayouts({
+        savePartialSettings({
          id: board.id,
          ...values,
        });
      })}
    >
      <Stack>
-        <Stack gap="sm">
-          <Group justify="space-between" align="center">
-            <Text fw={500}>{t("board.setting.section.layout.responsive.title")}</Text>
-            <Button
-              variant="subtle"
-              onClick={() => {
-                form.setValues({
-                  layouts: [
-                    ...form.values.layouts,
-                    {
-                      id: createId(),
-                      name: "",
-                      columnCount: 10,
-                      breakpoint: 0,
-                    },
-                  ],
-                });
-              }}
-            >
-              {t("board.setting.section.layout.responsive.action.add")}
-            </Button>
-          </Group>
-
-          {form.values.layouts.map((layout, index) => (
-            <Fieldset key={layout.id} legend={layout.name} bg="transparent">
-              <Grid>
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <TextInput {...form.getInputProps(`layouts.${index}.name`)} label={t("layout.field.name.label")} />
-                </Grid.Col>
-
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <Input.Wrapper label={t("layout.field.columnCount.label")}>
-                    <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps(`layouts.${index}.columnCount`)} />
-                  </Input.Wrapper>
-                </Grid.Col>
-
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <NumberInput
-                    {...form.getInputProps(`layouts.${index}.breakpoint`)}
-                    label={t("layout.field.breakpoint.label")}
-                    description={t("layout.field.breakpoint.description")}
-                  />
-                </Grid.Col>
-              </Grid>
-              {form.values.layouts.length >= 2 && (
-                <Group justify="end">
-                  <Button
-                    variant="subtle"
-                    onClick={() => {
-                      form.setValues((previous) =>
-                        previous.layouts !== undefined && previous.layouts.length >= 2
-                          ? {
-                              layouts: form.values.layouts.filter((filteredLayout) => filteredLayout.id !== layout.id),
-                            }
-                          : previous,
-                      );
-                    }}
-                  >
-                    {t("common.action.remove")}
-                  </Button>
-                </Group>
-              )}
-            </Fieldset>
-          ))}
-        </Stack>
-
+        <Grid>
+          <Grid.Col span={{ sm: 12, md: 6 }}>
+            <Input.Wrapper label={t("board.field.columnCount.label")}>
+              <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps("columnCount")} />
+            </Input.Wrapper>
+          </Grid.Col>
+        </Grid>
        <Group justify="end">
-          <Button type="submit" loading={isPending}>
+          <Button type="submit" loading={isPending} color="teal">
            {t("common.action.saveChanges")}
          </Button>
        </Group>
@@ -61,10 +61,6 @@ const getBoardAndPermissionsAsync = async (params: Awaited<Props["params"]>) =>
      notFound();
    }

-    if (error instanceof TRPCError && error.code === "BAD_REQUEST") {
-      notFound();
-    }
-
    throw error;
  }
 };
@@ -6,7 +6,7 @@ import { TRPCError } from "@trpc/server";
 import { auth } from "@homarr/auth/next";
 import { BoardProvider } from "@homarr/boards/context";
 import { EditModeProvider } from "@homarr/boards/edit-mode";
-import { createLogger } from "@homarr/core/infrastructure/logs";
+import { logger } from "@homarr/log";

 import { MainHeader } from "~/components/layout/header";
 import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
@@ -18,8 +18,6 @@ import { CustomCss } from "./(content)/_custom-css";
 import { BoardReadyProvider } from "./(content)/_ready-context";
 import { BoardMantineProvider } from "./(content)/_theme";

-const logger = createLogger({ module: "createBoardLayout" });
-
 interface CreateBoardLayoutProps<TParams extends Params> {
  headerActions: JSX.Element;
  getInitialBoardAsync: (params: TParams) => Promise<Board>;
@@ -47,10 +45,6 @@ export const createBoardLayout = <TParams extends Params>({
        notFound();
      }

-      if (error instanceof TRPCError && error.code === "BAD_REQUEST") {
-        notFound();
-      }
-
      throw error;
    });
    const colorScheme = await getCurrentColorSchemeAsync();
@@ -3,14 +3,10 @@ import type { WidgetKind } from "@homarr/definitions";

 export type Board = RouterOutputs["board"]["getHomeBoard"];
 export type Section = Board["sections"][number];
-export type Item = Board["items"][number];
-export type ItemLayout = Item["layouts"][number];
-export type SectionItem = Omit<Item, "layouts"> & ItemLayout & { type: "item" };
+export type Item = Section["items"][number];

 export type CategorySection = Extract<Section, { kind: "category" }>;
 export type EmptySection = Extract<Section, { kind: "empty" }>;
 export type DynamicSection = Extract<Section, { kind: "dynamic" }>;
-export type DynamicSectionLayout = DynamicSection["layouts"][number];
-export type DynamicSectionItem = Omit<DynamicSection, "layouts"> & DynamicSectionLayout & { type: "section" };

 export type ItemOfKind<TKind extends WidgetKind> = Extract<Item, { kind: TKind }>;
@@ -1,3 +1,4 @@
+import Link from "next/link";
 import type { MantineColor } from "@mantine/core";
 import { Button, Card, Stack, Text } from "@mantine/core";
 import { IconBook2, IconCategoryPlus, IconLayoutDashboard, IconMailForward } from "@tabler/icons-react";
@@ -7,7 +8,6 @@ import { getMantineColor } from "@homarr/common";
 import { db } from "@homarr/db";
 import { createDocumentationLink } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
-import { Link } from "@homarr/ui";
 import type { TablerIcon } from "@homarr/ui";

 export const InitFinish = async () => {
@@ -2,29 +2,28 @@

 import { Button, Card, Stack, TextInput } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
-import { groupCreateSchema } from "@homarr/validation/group";
+import { validation } from "@homarr/validation";

 export const InitGroup = () => {
  const t = useI18n();
-  const { mutateAsync } = clientApi.group.createInitialExternalGroup.useMutation({
-    async onSuccess() {
-      await revalidatePathActionAsync("/init");
-    },
-  });
-  const form = useZodForm(groupCreateSchema, {
+  const { mutateAsync } = clientApi.group.createInitialExternalGroup.useMutation();
+  const form = useZodForm(validation.group.create, {
    initialValues: {
      name: "",
    },
  });

-  const handleSubmitAsync = async (values: z.infer<typeof groupCreateSchema>) => {
+  const handleSubmitAsync = async (values: z.infer<typeof validation.group.create>) => {
    await mutateAsync(values, {
+      async onSuccess() {
+        await revalidatePathActionAsync("/init");
+      },
      onError(error) {
        if (error.data?.code === "CONFLICT") {
          form.setErrors({ name: t("common.zod.errors.custom.groupNameTaken") });
@@ -3,7 +3,7 @@
 import { startTransition } from "react";
 import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -12,17 +12,13 @@ import type { CheckboxProps } from "@homarr/form/types";
 import { defaultServerSettings } from "@homarr/server-settings";
 import type { TranslationObject } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import { settingsInitSchema } from "@homarr/validation/settings";
+import { validation } from "@homarr/validation";

 export const InitSettings = () => {
  const tSection = useScopedI18n("management.page.settings.section");
  const t = useI18n();
-  const { mutateAsync } = clientApi.serverSettings.initSettings.useMutation({
-    async onSuccess() {
-      await revalidatePathActionAsync("/init");
-    },
-  });
-  const form = useZodForm(settingsInitSchema, { initialValues: defaultServerSettings });
+  const { mutateAsync } = clientApi.serverSettings.initSettings.useMutation();
+  const form = useZodForm(validation.settings.init, { initialValues: defaultServerSettings });

  form.watch("analytics.enableGeneral", ({ value }) => {
    if (!value) {
@@ -34,8 +30,12 @@ export const InitSettings = () => {
    }
  });

-  const handleSubmitAsync = async (values: z.infer<typeof settingsInitSchema>) => {
-    await mutateAsync(values);
+  const handleSubmitAsync = async (values: z.infer<typeof validation.settings.init>) => {
+    await mutateAsync(values, {
+      async onSuccess() {
+        await revalidatePathActionAsync("/init");
+      },
+    });
  };

  return (
@@ -1,22 +1,21 @@
 "use client";

 import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
-import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
-import { userInitSchema } from "@homarr/validation/user";
+import { validation } from "@homarr/validation";

 export const InitUserForm = () => {
  const t = useScopedI18n("user");
  const tUser = useScopedI18n("init.step.user");
  const { mutateAsync, isPending } = clientApi.user.initUser.useMutation();
-  const form = useZodForm(userInitSchema, {
+  const form = useZodForm(validation.user.init, {
    initialValues: {
      username: "",
      password: "",
@@ -26,19 +25,12 @@ export const InitUserForm = () => {

  const handleSubmitAsync = async (values: FormType) => {
    await mutateAsync(values, {
-      onSuccess() {
+      async onSuccess() {
        showSuccessNotification({
          title: tUser("notification.success.title"),
          message: tUser("notification.success.message"),
        });
-
-        void signIn("credentials", {
-          name: values.username,
-          password: values.password,
-          redirect: false,
-        }).then(async () => {
-          await revalidatePathActionAsync("/init");
-        });
+        await revalidatePathActionAsync("/init");
      },
      onError: (error) => {
        showErrorNotification({
@@ -74,4 +66,4 @@ export const InitUserForm = () => {
  );
 };

-type FormType = z.infer<typeof userInitSchema>;
+type FormType = z.infer<typeof validation.user.init>;
@@ -7,7 +7,6 @@ import "@homarr/ui/styles.css";
 import "~/styles/scroll-area.scss";

 import { notFound } from "next/navigation";
-import type { DayOfWeek } from "@mantine/dates";
 import { NextIntlClientProvider } from "next-intl";

 import { api } from "@homarr/api/server";
@@ -21,9 +20,9 @@ import { SettingsProvider } from "@homarr/settings";
 import { SpotlightProvider } from "@homarr/spotlight";
 import type { SupportedLanguage } from "@homarr/translation";
 import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
+import { getI18nMessages } from "@homarr/translation/server";

 import { Analytics } from "~/components/layout/analytics";
-import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
@@ -82,6 +81,7 @@ export default async function Layout(props: {
  const serverSettings = await getServerSettingsAsync(db);
  const colorScheme = await getCurrentColorSchemeAsync();
  const direction = isLocaleRTL((await props.params).locale) ? "rtl" : "ltr";
+  const i18nMessages = await getI18nMessages();

  const StackedProvider = composeWrappers([
    (innerProps) => {
@@ -89,15 +89,7 @@ export default async function Layout(props: {
    },
    (innerProps) => (
      <SettingsProvider
-        user={
-          user
-            ? {
-                ...user,
-                // Convert type, because output schema is not smart enough to infer $type from drizzle
-                firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
-              }
-            : null
-        }
+        user={user}
        serverSettings={{
          board: {
            homeBoardId: serverSettings.board.homeBoardId,
@@ -113,18 +105,16 @@ export default async function Layout(props: {
    (innerProps) => <JotaiProvider {...innerProps} />,
    (innerProps) => <TRPCReactProvider {...innerProps} />,
    (innerProps) => <DayJsLoader {...innerProps} />,
-    (innerProps) => <NextIntlClientProvider {...innerProps} />,
+    (innerProps) => <NextIntlClientProvider {...innerProps} messages={i18nMessages} />,
    (innerProps) => <CustomMantineProvider {...innerProps} defaultColorScheme={colorScheme} />,
    (innerProps) => <ModalProvider {...innerProps} />,
    (innerProps) => <SpotlightProvider {...innerProps} />,
  ]);

-  const { locale } = await props.params;
-
  return (
    // Instead of ColorSchemScript we use data-mantine-color-scheme to prevent flickering
    <html
-      lang={locale}
+      lang={(await props.params).locale}
      dir={direction}
      data-mantine-color-scheme={colorScheme}
      style={{
@@ -135,7 +125,6 @@ export default async function Layout(props: {
      <head>
        <Analytics />
        <SearchEngineOptimization />
-        <CrowdinLiveTranslation locale={locale} />
      </head>
      <body className={["font-sans", fontSans.variable].join(" ")}>
        <StackedProvider>
@@ -1,32 +1,51 @@
 import { Box, Grid, GridCol, Group, Image, Stack, Title } from "@mantine/core";

 import { splitToNChunks } from "@homarr/common";
-import { integrationDefs } from "@homarr/definitions";
-import { getScopedI18n } from "@homarr/translation/server";

 import classes from "./hero-banner.module.css";

-const icons = Object.values(integrationDefs)
-  .filter((int) => int.name !== "Mock")
-  .map((int) => int.iconUrl);
+const icons = [
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/homarr.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/sabnzbd.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/deluge.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/radarr.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/sonarr.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/lidarr.svg",
+  "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets/assets/pihole.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/dashdot.png",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/overseerr.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/plex.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/jellyfin.svg",
+  "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets/assets/homeassistant.svg",
+  "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets/assets/freshrss.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/readarr.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/transmission.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/qbittorrent.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/nzbget.png",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/openmediavault.svg",
+  "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets/assets/docker.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/jellyseerr.svg",
+  "https://cdn.jsdelivr.net/gh/loganmarchione/homelab-svg-assets/assets/adguardhome.svg",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tdarr.png",
+  "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/prowlarr.svg",
+];

 const countIconGroups = 3;
-const animationDurationInSeconds = icons.length;
+const animationDurationInSeconds = 12;
 const arrayInChunks = splitToNChunks(icons, countIconGroups);
-const gridSpan = 12 / countIconGroups;

-export const HeroBanner = async () => {
-  const t = await getScopedI18n("management.page.home");
+export const HeroBanner = () => {
+  const gridSpan = 12 / countIconGroups;

  return (
    <Box className={classes.bannerContainer} p={{ base: "lg", md: "3rem" }} bg="dark.6" pos="relative">
      <Stack gap={0}>
        <Title fz={{ base: "h4", md: "h2" }} c="dimmed">
-          {t("heroBanner.title")}
+          Welcome back to your
        </Title>
        <Group gap="xs" wrap="nowrap">
          <Image src="/logo/logo.png" w={{ base: 32, md: 40 }} h={{ base: 32, md: 40 }} />
-          <Title fz={{ base: "h3", md: "h1" }}>{t("heroBanner.subtitle", { app: "Homarr" })}</Title>
+          <Title fz={{ base: "h3", md: "h1" }}>Homarr Board</Title>
        </Group>
      </Stack>
      <Box visibleFrom="md" className={classes.scrollContainer} w={"30%"} top={0} right={0} pos="absolute">
@@ -42,26 +61,12 @@ export const HeroBanner = async () => {
                  }}
                >
                  {arrayInChunks[columnIndex]?.map((icon, index) => (
-                    <Image
-                      key={`grid-column-${columnIndex}-scroll-1-${index}`}
-                      src={icon}
-                      radius="md"
-                      fit={"contain"}
-                      w={50}
-                      h={50}
-                    />
+                    <Image key={`grid-column-${columnIndex}-scroll-1-${index}`} src={icon} radius="md" w={50} h={50} />
                  ))}

                  {/* This is used for making the animation seem seamless */}
                  {arrayInChunks[columnIndex]?.map((icon, index) => (
-                    <Image
-                      key={`grid-column-${columnIndex}-scroll-2-${index}`}
-                      src={icon}
-                      radius="md"
-                      fit={"contain"}
-                      w={50}
-                      h={50}
-                    />
+                    <Image key={`grid-column-${columnIndex}-scroll-2-${index}`} src={icon} radius="md" w={50} h={50} />
                  ))}
                </Stack>
              </GridCol>
@@ -11,23 +11,14 @@ import {
  Center,
  Flex,
  Group,
-  Kbd,
  List,
  ListItem,
  Stack,
-  Table,
-  TableTbody,
-  TableTd,
-  TableTh,
-  TableThead,
-  TableTr,
  Text,
  Title,
 } from "@mantine/core";
-import { IconKeyboard, IconLanguage, IconLibrary, IconUsers } from "@tabler/icons-react";
+import { IconLanguage, IconLibrary, IconUsers } from "@tabler/icons-react";

-import { capitalize, objectEntries } from "@homarr/common";
-import { hotkeys } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";

 import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
@@ -89,7 +80,7 @@ export default async function AboutPage() {
              <Text>{t("accordion.contributors.title")}</Text>
              <Text size="sm" c="dimmed">
                {t("accordion.contributors.subtitle", {
-                  count: String(githubContributors.length),
+                  count: githubContributors.length,
                })}
              </Text>
            </Stack>
@@ -113,7 +104,7 @@ export default async function AboutPage() {
              <Text>{t("accordion.translators.title")}</Text>
              <Text size="sm" c="dimmed">
                {t("accordion.translators.subtitle", {
-                  count: String(crowdinContributors.length),
+                  count: crowdinContributors.length,
                })}
              </Text>
            </Stack>
@@ -137,7 +128,7 @@ export default async function AboutPage() {
              <Text>{t("accordion.libraries.title")}</Text>
              <Text size="sm" c="dimmed">
                {t("accordion.libraries.subtitle", {
-                  count: String(Object.keys(attributes.dependencies).length),
+                  count: Object.keys(attributes.dependencies).length,
                })}
              </Text>
            </Stack>
@@ -158,45 +149,6 @@ export default async function AboutPage() {
            </List>
          </AccordionPanel>
        </AccordionItem>
-        <AccordionItem value="hotkeys">
-          <AccordionControl icon={<IconKeyboard size="1rem" />}>
-            <Stack gap={0}>
-              <Text>{t("accordion.hotkeys.title")}</Text>
-              <Text size="sm" c="dimmed">
-                {t("accordion.hotkeys.subtitle")}
-              </Text>
-            </Stack>
-          </AccordionControl>
-          <AccordionPanel>
-            <Table>
-              <TableThead>
-                <TableTr>
-                  <TableTh>{t("accordion.hotkeys.field.shortcut")}</TableTh>
-                  <TableTh>{t("accordion.hotkeys.field.action")}</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {objectEntries(hotkeys).map(([key, shortcut]) => (
-                  <TableTr key={key}>
-                    <TableTd>
-                      <Kbd size="md">
-                        {shortcut
-                          .split("+")
-                          .map((key) => capitalize(key.trim()))
-                          .join(" + ")}
-                      </Kbd>
-                    </TableTd>
-                    <TableTd>{t(`accordion.hotkeys.action.${key}`)}</TableTd>
-                  </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-
-            <Text size="sm" c="dimmed">
-              {t("accordion.hotkeys.note")}
-            </Text>
-          </AccordionPanel>
-        </AccordionItem>
      </Accordion>
    </div>
  );
@@ -23,9 +23,7 @@ export const AppDeleteButton = ({ app }: AppDeleteButtonProps) => {
  const onClick = useCallback(() => {
    openConfirmModal({
      title: t("title"),
-      children: t("message", {
-        name: app.name,
-      }),
+      children: t("message", app),
      onConfirm: () => {
        mutate(
          { id: app.id },
@@ -2,7 +2,7 @@

 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -10,7 +10,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { AppForm } from "@homarr/forms-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import type { appManageSchema } from "@homarr/validation/app";
+import type { validation } from "@homarr/validation";

 interface AppEditFormProps {
  app: RouterOutputs["app"]["byId"];
@@ -40,7 +40,7 @@ export const AppEditForm = ({ app }: AppEditFormProps) => {
  });

  const handleSubmit = useCallback(
-    (values: z.infer<typeof appManageSchema>) => {
+    (values: z.infer<typeof validation.app.manage>) => {
      mutate({
        id: app.id,
        ...values,
@@ -1,15 +1,15 @@
-import { Fragment } from "react";
+import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconBox, IconPencil } from "@tabler/icons-react";
-import { z } from "zod/v4";
+import { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
-import { Link, SearchInput, TablePagination } from "@homarr/ui";
+import { SearchInput, TablePagination } from "@homarr/ui";

 import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
@@ -61,8 +61,7 @@ export default async function AppsPage(props: AppsPageProps) {
          </Stack>
        )}

-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
        </Group>
      </Stack>
@@ -98,12 +97,7 @@ const AppCard = async ({ app }: AppCardProps) => {
            </Text>
            {app.description && (
              <Text size="sm" c="gray.6" lineClamp={4}>
-                {app.description.split("\n").map((line, index) => (
-                  <Fragment key={index}>
-                    {line}
-                    <br />
-                  </Fragment>
-                ))}
+                {app.description}
              </Text>
            )}
            {app.href && (
@@ -1,6 +1,7 @@
 "use client";

 import { useCallback } from "react";
+import Link from "next/link";
 import { Menu } from "@mantine/core";
 import { IconCopy, IconDeviceMobile, IconHome, IconSettings, IconTrash } from "@tabler/icons-react";

@@ -11,7 +12,6 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { DuplicateBoardModal } from "@homarr/modals-collection";
 import { useScopedI18n } from "@homarr/translation/client";
-import { Link } from "@homarr/ui";

 import { useBoardPermissions } from "~/components/board/permissions/client";

@@ -84,6 +84,9 @@ export const BoardCardMenuDropdown = ({ board }: BoardCardMenuDropdownProps) =>
        id: board.id,
        name: board.name,
      },
+      onSuccess: async () => {
+        await revalidatePathActionAsync("/manage/boards");
+      },
    });
  }, [board.id, board.name, openDuplicateModal]);

@@ -1,3 +1,4 @@
+import Link from "next/link";
 import {
  ActionIcon,
  Badge,
@@ -20,7 +21,7 @@ import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { getScopedI18n } from "@homarr/translation/server";
-import { Link, UserAvatar } from "@homarr/ui";
+import { UserAvatar } from "@homarr/ui";

 import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
 import { ManageContainer } from "~/components/manage/manage-container";
@@ -1,15 +1,4 @@
-import {
-  IconCode,
-  IconGrid3x3,
-  IconKey,
-  IconLink,
-  IconMessage,
-  IconPassword,
-  IconPasswordUser,
-  IconPlug,
-  IconServer,
-  IconUser,
-} from "@tabler/icons-react";
+import { IconGrid3x3, IconKey, IconPassword, IconServer, IconUser } from "@tabler/icons-react";

 import type { IntegrationSecretKind } from "@homarr/definitions";
 import type { TablerIcon } from "@homarr/ui";
@@ -20,12 +9,4 @@ export const integrationSecretIcons = {
  password: IconPassword,
  realm: IconServer,
  tokenId: IconGrid3x3,
-  personalAccessToken: IconPasswordUser,
-  topic: IconMessage,
-  url: IconLink,
-  opnsenseApiKey: IconKey,
-  opnsenseApiSecret: IconPassword,
-  githubAppId: IconCode,
-  githubInstallationId: IconPlug,
-  privateKey: IconKey,
 } satisfies Record<IntegrationSecretKind, TablerIcon>;
@@ -1,7 +1,7 @@
 "use client";

 import type { ChangeEventHandler, FocusEventHandler } from "react";
-import { PasswordInput, Textarea, TextInput } from "@mantine/core";
+import { PasswordInput, TextInput } from "@mantine/core";

 import { integrationSecretKindObject } from "@homarr/definitions";
 import type { IntegrationSecretKind } from "@homarr/definitions";
@@ -14,9 +14,9 @@ interface IntegrationSecretInputProps {
  label?: string;
  kind: IntegrationSecretKind;
  value?: string;
-  onChange: ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement>;
-  onFocus?: FocusEventHandler<HTMLInputElement | HTMLTextAreaElement>;
-  onBlur?: FocusEventHandler<HTMLInputElement | HTMLTextAreaElement>;
+  onChange: ChangeEventHandler<HTMLInputElement>;
+  onFocus?: FocusEventHandler<HTMLInputElement>;
+  onBlur?: FocusEventHandler<HTMLInputElement>;
  error?: string;
 }

@@ -31,19 +31,6 @@ export const IntegrationSecretInput = (props: IntegrationSecretInputProps) => {
 const PublicSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
  const t = useI18n();
  const Icon = integrationSecretIcons[kind];
-  const { multiline } = integrationSecretKindObject[kind];
-  if (multiline) {
-    return (
-      <Textarea
-        {...props}
-        label={props.label ?? t(`integration.secrets.kind.${kind}.label`)}
-        w="100%"
-        leftSection={<Icon size={20} stroke={1.5} />}
-        autosize
-        minRows={2}
-      />
-    );
-  }

  return (
    <TextInput
@@ -58,21 +45,6 @@ const PublicSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
 const PrivateSecretInput = ({ kind, ...props }: IntegrationSecretInputProps) => {
  const t = useI18n();
  const Icon = integrationSecretIcons[kind];
-  const { multiline } = integrationSecretKindObject[kind];
-
-  if (multiline) {
-    return (
-      <Textarea
-        {...props}
-        label={props.label ?? t(`integration.secrets.kind.${kind}.label`)}
-        description={t("integration.secrets.secureNotice")}
-        w="100%"
-        leftSection={<Icon size={20} stroke={1.5} />}
-        autosize
-        minRows={2}
-      />
-    );
-  }

  return (
    <PasswordInput
@@ -1,62 +0,0 @@
-import { useCallback } from "react";
-import { SegmentedControl } from "@mantine/core";
-
-import type { IntegrationSecretKind } from "@homarr/definitions";
-import type { UseFormReturnType } from "@homarr/form";
-import { useScopedI18n } from "@homarr/translation/client";
-
-interface FormType {
-  secrets: { kind: IntegrationSecretKind; value: string | null }[];
-}
-
-interface SecretKindsSegmentedControlProps<TFormType extends FormType> {
-  defaultKinds?: IntegrationSecretKind[];
-  secretKinds: IntegrationSecretKind[][];
-  form: UseFormReturnType<TFormType, (values: TFormType) => TFormType>;
-}
-
-export const SecretKindsSegmentedControl = <TFormType extends FormType>({
-  defaultKinds,
-  secretKinds,
-  form,
-}: SecretKindsSegmentedControlProps<TFormType>) => {
-  const t = useScopedI18n("integration.secrets");
-
-  const defaultValue = defaultKinds?.length === 0 ? "empty" : defaultKinds?.join("-");
-  const secretKindGroups = secretKinds.map((kinds) => ({
-    label:
-      kinds.length === 0
-        ? t("noSecretsRequired.segmentTitle")
-        : kinds.map((kind) => t(`kind.${kind}.label`)).join(" & "),
-    value: kinds.length === 0 ? "empty" : kinds.join("-"),
-  }));
-
-  const onChange = useCallback(
-    (value: string) => {
-      if (value === "empty") {
-        const emptyValues = [] satisfies FormType["secrets"];
-        // @ts-expect-error somehow it is not able to understand that secrets is an array?
-        form.setFieldValue("secrets", emptyValues);
-        return;
-      }
-
-      const kinds = value.split("-") as IntegrationSecretKind[];
-      const secrets = kinds.map((kind) => ({
-        kind,
-        value: "",
-      })) satisfies FormType["secrets"];
-      // @ts-expect-error somehow it is not able to understand that secrets is an array?
-      form.setFieldValue("secrets", secrets);
-    },
-    [form],
-  );
-
-  return (
-    <SegmentedControl
-      fullWidth
-      data={secretKindGroups}
-      defaultValue={defaultValue}
-      onChange={onChange}
-    ></SegmentedControl>
-  );
-};
@@ -1,96 +0,0 @@
-import { useMemo } from "react";
-import { Accordion, Anchor, Card, Stack, Text } from "@mantine/core";
-import { IconSubtask } from "@tabler/icons-react";
-
-import { getMantineColor } from "@homarr/common";
-import { useI18n } from "@homarr/translation/client";
-
-import { CertificateErrorDetails } from "./test-connection-certificate";
-import type { AnyMappedTestConnectionError, MappedError } from "./types";
-
-interface IntegrationTestConnectionErrorProps {
-  error: AnyMappedTestConnectionError;
-  url: string;
-}
-
-export const IntegrationTestConnectionError = ({ error, url }: IntegrationTestConnectionErrorProps) => {
-  const t = useI18n();
-  const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
-
-  return (
-    <Card withBorder style={{ borderColor: getMantineColor("red", 8) }}>
-      <Stack>
-        <Stack gap="sm">
-          <Text size="lg" fw={500} c="red.8">
-            {t(`integration.testConnection.error.${error.type}.title`)}
-          </Text>
-
-          {error.type !== "request" && error.type !== "certificate" && error.type !== "statusCode" ? (
-            <Text size="md">{t(`integration.testConnection.error.${error.type}.description`)}</Text>
-          ) : null}
-
-          {error.type === "request" ? (
-            <Text size="md">
-              {t(
-                `integration.testConnection.error.request.description.${error.data.type}.${error.data.reason}` as never,
-              )}
-            </Text>
-          ) : null}
-
-          {error.type === "statusCode" ? (
-            error.data.reason === "other" ? (
-              <Text size="md">
-                {t.rich("integration.testConnection.error.statusCode.otherDescription", {
-                  statusCode: error.data.statusCode.toString(),
-                  url: () => <Anchor href={error.data.url}>{error.data.url}</Anchor>,
-                })}
-              </Text>
-            ) : (
-              <Text size="md">
-                {t.rich("integration.testConnection.error.statusCode.description", {
-                  reason: t(`integration.testConnection.error.statusCode.reason.${error.data.reason}`),
-                  statusCode: error.data.statusCode.toString(),
-                  url: () => <Anchor href={error.data.url}>{error.data.url}</Anchor>,
-                })}
-              </Text>
-            )
-          ) : null}
-
-          {error.type === "certificate" ? <CertificateErrorDetails error={error} url={url} /> : null}
-        </Stack>
-
-        {error.cause ? (
-          <Accordion variant="contained">
-            <Accordion.Item value="cause">
-              <Accordion.Control icon={<IconSubtask size={16} stroke={1.5} />}>
-                {t("integration.testConnection.error.common.cause.title")}
-              </Accordion.Control>
-              <Accordion.Panel>
-                <pre style={{ whiteSpace: "pre-wrap" }}>
-                  {error.name}: {error.message}
-                  {"\n"}
-                  {causeArray
-                    .map(
-                      (cause) =>
-                        `caused by ${cause.name}${cause.message ? `: ${cause.message}` : ""} ${cause.metadata.map((item) => `${item.key}=${item.value}`).join(" ")}`,
-                    )
-                    .join("\n")}
-                </pre>
-              </Accordion.Panel>
-            </Accordion.Item>
-          </Accordion>
-        ) : null}
-      </Stack>
-    </Card>
-  );
-};
-
-const toCauseArray = (cause: MappedError | undefined) => {
-  const causeArray: MappedError[] = [];
-  let currentCause: MappedError | undefined = cause;
-  while (currentCause) {
-    causeArray.push(currentCause);
-    currentCause = currentCause.cause;
-  }
-  return causeArray.map(({ cause: _innerCause, ...cause }) => cause);
-};
@@ -1,333 +0,0 @@
-import { useState } from "react";
-import { ActionIcon, Alert, Anchor, Button, Card, CopyButton, Group, SimpleGrid, Stack, Text } from "@mantine/core";
-import { IconAlertTriangle, IconCheck, IconCopy, IconExclamationCircle, IconRepeat } from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
-import { createId, getMantineColor } from "@homarr/common";
-import { createDocumentationLink } from "@homarr/definitions";
-import { createModal, useConfirmModal, useModalAction } from "@homarr/modals";
-import { AddCertificateModal } from "@homarr/modals-collection";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useCurrentLocale, useI18n, useScopedI18n } from "@homarr/translation/client";
-
-import type { MappedCertificate, MappedTestConnectionCertificateError } from "./types";
-
-interface CertificateErrorDetailsProps {
-  error: MappedTestConnectionCertificateError;
-  url: string;
-}
-
-export const CertificateErrorDetails = ({ error, url }: CertificateErrorDetailsProps) => {
-  const tError = useScopedI18n("integration.testConnection.error");
-  const { data: session } = useSession();
-  const isAdmin = session?.user.permissions.includes("admin") ?? false;
-  const [showRetryButton, setShowRetryButton] = useState(false);
-
-  const { openModal: openUploadModal } = useModalAction(AddCertificateModal);
-  const { openConfirmModal } = useConfirmModal();
-  const { mutateAsync: trustHostnameAsync } = clientApi.certificates.trustHostnameMismatch.useMutation();
-  const { mutateAsync: addCertificateAsync } = clientApi.certificates.addCertificate.useMutation();
-
-  const rootCertificate = getHeighestCertificate(error.data.certificate);
-
-  const handleTrustHostname = () => {
-    const { hostname } = new URL(url);
-    openConfirmModal({
-      title: tError("certificate.hostnameMismatch.confirm.title"),
-      children: tError("certificate.hostnameMismatch.confirm.message"),
-      // eslint-disable-next-line no-restricted-syntax
-      async onConfirm() {
-        await trustHostnameAsync(
-          {
-            hostname,
-            certificate: error.data.certificate.pem,
-          },
-          {
-            onSuccess() {
-              showSuccessNotification({
-                title: tError("certificate.hostnameMismatch.notification.success.title"),
-                message: tError("certificate.hostnameMismatch.notification.success.message"),
-              });
-              setShowRetryButton(true);
-            },
-            onError() {
-              showErrorNotification({
-                title: tError("certificate.hostnameMismatch.notification.error.title"),
-                message: tError("certificate.hostnameMismatch.notification.error.message"),
-              });
-            },
-          },
-        );
-      },
-    });
-  };
-
-  const handleTrustSelfSigned = () => {
-    const { hostname } = new URL(url);
-    openConfirmModal({
-      title: tError("certificate.selfSigned.confirm.title"),
-      children: tError("certificate.selfSigned.confirm.message"),
-      // eslint-disable-next-line no-restricted-syntax
-      async onConfirm() {
-        const formData = new FormData();
-        formData.append(
-          "file",
-          new File([rootCertificate.pem], `${hostname}-${createId()}.crt`, {
-            type: "application/x-x509-ca-cert",
-          }),
-        );
-        await addCertificateAsync(formData, {
-          onSuccess() {
-            showSuccessNotification({
-              title: tError("certificate.selfSigned.notification.success.title"),
-              message: tError("certificate.selfSigned.notification.success.message"),
-            });
-            setShowRetryButton(true);
-          },
-          onError() {
-            showErrorNotification({
-              title: tError("certificate.selfSigned.notification.error.title"),
-              message: tError("certificate.selfSigned.notification.error.message"),
-            });
-          },
-        });
-      },
-    });
-  };
-
-  const description = <Text size="md">{tError(`certificate.description.${error.data.reason}`)}</Text>;
-
-  if (!isAdmin) {
-    return (
-      <>
-        {description}
-        <NotEnoughPermissionsAlert />
-      </>
-    );
-  }
-
-  return (
-    <>
-      {description}
-
-      <CertificateDetailsCard certificate={rootCertificate} />
-
-      {error.data.reason === "hostnameMismatch" && <HostnameMismatchAlert />}
-
-      {!rootCertificate.isSelfSigned && error.data.reason === "untrusted" && <CertificateExtractAlert />}
-
-      {showRetryButton && (
-        <Button
-          variant="default"
-          fullWidth
-          leftSection={<IconRepeat size={16} color={getMantineColor("blue", 6)} stroke={1.5} />}
-          type="submit"
-        >
-          {tError("certificate.action.retry.label")}
-        </Button>
-      )}
-
-      {(error.data.reason === "untrusted" && rootCertificate.isSelfSigned) ||
-      error.data.reason === "hostnameMismatch" ? (
-        <Button
-          variant="default"
-          fullWidth
-          onClick={error.data.reason === "hostnameMismatch" ? handleTrustHostname : handleTrustSelfSigned}
-        >
-          {tError("certificate.action.trust.label")}
-        </Button>
-      ) : null}
-      {error.data.reason === "untrusted" && !rootCertificate.isSelfSigned ? (
-        <Button
-          variant="default"
-          fullWidth
-          onClick={() =>
-            openUploadModal({
-              onSuccess() {
-                setShowRetryButton(true);
-              },
-            })
-          }
-        >
-          {tError("certificate.action.upload.label")}
-        </Button>
-      ) : null}
-    </>
-  );
-};
-
-const NotEnoughPermissionsAlert = () => {
-  const t = useI18n();
-  return (
-    <Alert
-      icon={<IconAlertTriangle size={16} />}
-      title={t("integration.testConnection.error.certificate.alert.permission.title")}
-      color="yellow"
-    >
-      {t("integration.testConnection.error.certificate.alert.permission.message")}
-    </Alert>
-  );
-};
-
-const HostnameMismatchAlert = () => {
-  const t = useI18n();
-  return (
-    <Alert
-      icon={<IconAlertTriangle size={16} />}
-      title={t("integration.testConnection.error.certificate.alert.hostnameMismatch.title")}
-      color="yellow"
-    >
-      {t("integration.testConnection.error.certificate.alert.hostnameMismatch.message")}
-    </Alert>
-  );
-};
-
-const CertificateExtractAlert = () => {
-  const t = useI18n();
-  return (
-    <Alert
-      icon={<IconExclamationCircle size={16} />}
-      title={t("integration.testConnection.error.certificate.alert.extract.title")}
-      color="red"
-    >
-      {t.rich("integration.testConnection.error.certificate.alert.extract.message", {
-        docsLink: () => (
-          <Anchor
-            href={createDocumentationLink("/docs/management/certificates", "#obtaining-certificates")}
-            target="_blank"
-          >
-            {t("common.here")}
-          </Anchor>
-        ),
-      })}
-    </Alert>
-  );
-};
-
-interface CertificateDetailsProps {
-  certificate: MappedCertificate;
-}
-
-export const CertificateDetailsCard = ({ certificate }: CertificateDetailsProps) => {
-  const { openModal } = useModalAction(PemContentModal);
-  const locale = useCurrentLocale();
-  const tDetails = useScopedI18n("integration.testConnection.error.certificate.details");
-  const tCertificateField = useScopedI18n("certificate.field");
-
-  return (
-    <Card withBorder>
-      <Text fw={500}>{tDetails("title")}</Text>
-      <Group justify="space-between">
-        <Text size="sm" c="dimmed">
-          {tDetails("description")}
-        </Text>
-        <Anchor
-          size="sm"
-          ta="start"
-          component="button"
-          type="button"
-          onClick={() => openModal({ content: certificate.pem })}
-        >
-          {tDetails("content.action")}
-        </Anchor>
-      </Group>
-
-      <SimpleGrid cols={{ base: 1, md: 2 }} mt="md">
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("subject.label")}
-          </Text>
-          <Text size="sm">{certificate.subject}</Text>
-        </Stack>
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("issuer.label")}
-          </Text>
-          <Text size="sm">{certificate.issuer}</Text>
-        </Stack>
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("validFrom.label")}
-          </Text>
-          <Text size="sm">
-            {new Intl.DateTimeFormat(locale, {
-              dateStyle: "full",
-              timeStyle: "long",
-            }).format(certificate.validFrom)}
-          </Text>
-        </Stack>
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("validTo.label")}
-          </Text>
-          <Text size="sm">
-            {new Intl.DateTimeFormat(locale, {
-              dateStyle: "full",
-              timeStyle: "long",
-            }).format(certificate.validTo)}
-          </Text>
-        </Stack>
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("serialNumber.label")}
-          </Text>
-          <Text size="sm">{certificate.serialNumber}</Text>
-        </Stack>
-      </SimpleGrid>
-
-      <SimpleGrid cols={1} mt="md">
-        <Stack gap={0}>
-          <Text size="xs" c="dimmed">
-            {tCertificateField("fingerprint.label")}
-          </Text>
-          <Text size="sm">{certificate.fingerprint}</Text>
-        </Stack>
-      </SimpleGrid>
-    </Card>
-  );
-};
-
-const PemContentModal = createModal<{ content: string }>(({ actions, innerProps }) => {
-  const t = useI18n();
-
-  return (
-    <Stack>
-      <Card w="100%" pos="relative" bg="dark.6" fz="xs" p="sm">
-        <pre
-          style={{
-            whiteSpace: "pre-wrap",
-            wordWrap: "break-word",
-          }}
-        >
-          {innerProps.content}
-        </pre>
-        <CopyButton value={innerProps.content}>
-          {({ copy, copied }) => (
-            <ActionIcon onClick={copy} pos="absolute" top={8} right={8} variant="default">
-              {copied ? (
-                <IconCheck size={16} stroke={1.5} color={getMantineColor("green", 6)} />
-              ) : (
-                <IconCopy size={16} stroke={1.5} />
-              )}
-            </ActionIcon>
-          )}
-        </CopyButton>
-      </Card>
-
-      <Button variant="light" color="gray" onClick={actions.closeModal}>
-        {t("common.action.close")}
-      </Button>
-    </Stack>
-  );
-}).withOptions({
-  defaultTitle(t) {
-    return t("integration.testConnection.error.certificate.details.content.title");
-  },
-  size: "lg",
-});
-
-const getHeighestCertificate = (certificate: MappedCertificate): MappedCertificate => {
-  if (certificate.issuerCertificate) return getHeighestCertificate(certificate.issuerCertificate);
-  return certificate;
-};
@@ -1,6 +0,0 @@
-import type { RouterOutputs } from "@homarr/api";
-
-export type AnyMappedTestConnectionError = Exclude<RouterOutputs["integration"]["create"], undefined>["error"];
-export type MappedTestConnectionCertificateError = Extract<AnyMappedTestConnectionError, { type: "certificate" }>;
-export type MappedCertificate = MappedTestConnectionCertificateError["data"]["certificate"];
-export type MappedError = Exclude<AnyMappedTestConnectionError["cause"], undefined>;
@@ -1,110 +1,82 @@
 "use client";

-import { useState } from "react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { Alert, Anchor, Button, ButtonGroup, Fieldset, Group, Stack, Text, TextInput } from "@mantine/core";
-import { IconInfoCircle, IconPencil, IconPlus, IconUnlink } from "@tabler/icons-react";
-import { z } from "zod/v4";
+import { Button, Fieldset, Group, Stack, TextInput } from "@mantine/core";
+import type { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { getAllSecretKindOptions, getDefaultSecretKinds } from "@homarr/definitions";
 import { useZodForm } from "@homarr/form";
-import { useConfirmModal, useModalAction } from "@homarr/modals";
-import { AppSelectModal } from "@homarr/modals-collection";
+import { convertIntegrationTestConnectionError } from "@homarr/integrations/client";
+import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
-import { Link } from "@homarr/ui";
-import { integrationUpdateSchema } from "@homarr/validation/integration";
+import { validation } from "@homarr/validation";

 import { SecretCard } from "../../_components/secrets/integration-secret-card";
 import { IntegrationSecretInput } from "../../_components/secrets/integration-secret-inputs";
-import { SecretKindsSegmentedControl } from "../../_components/secrets/integration-secret-segmented-control";
-import { IntegrationTestConnectionError } from "../../_components/test-connection/integration-test-connection-error";
-import type { AnyMappedTestConnectionError } from "../../_components/test-connection/types";

 interface EditIntegrationForm {
  integration: RouterOutputs["integration"]["byId"];
 }

-const formSchema = integrationUpdateSchema.omit({ id: true, appId: true }).and(
-  z.object({
-    app: z
-      .object({
-        id: z.string(),
-        name: z.string(),
-        iconUrl: z.string(),
-        href: z.string().nullable(),
-      })
-      .nullable(),
-  }),
-);
-
 export const EditIntegrationForm = ({ integration }: EditIntegrationForm) => {
  const t = useI18n();
  const { openConfirmModal } = useConfirmModal();
-  const allSecretKinds = getAllSecretKindOptions(integration.kind);
-
-  const initialSecretsKinds =
+  const secretsKinds =
    getAllSecretKindOptions(integration.kind).find((secretKinds) =>
      integration.secrets.every((secret) => secretKinds.includes(secret.kind)),
    ) ?? getDefaultSecretKinds(integration.kind);

-  const hasUrlSecret = initialSecretsKinds.includes("url");
-
  const router = useRouter();
-  const form = useZodForm(formSchema, {
+  const form = useZodForm(validation.integration.update.omit({ id: true }), {
    initialValues: {
      name: integration.name,
      url: integration.url,
-      secrets: initialSecretsKinds.map((kind) => ({
+      secrets: secretsKinds.map((kind) => ({
        kind,
        value: integration.secrets.find((secret) => secret.kind === kind)?.value ?? "",
      })),
-      app: integration.app ?? null,
    },
  });
  const { mutateAsync, isPending } = clientApi.integration.update.useMutation();
-  const [error, setError] = useState<null | AnyMappedTestConnectionError>(null);

  const secretsMap = new Map(integration.secrets.map((secret) => [secret.kind, secret]));

-  const handleSubmitAsync = async ({ app, ...values }: FormType) => {
-    const url = hasUrlSecret
-      ? new URL(values.secrets.find((secret) => secret.kind === "url")?.value ?? values.url).origin
-      : values.url;
+  const handleSubmitAsync = async (values: FormType) => {
    await mutateAsync(
      {
        id: integration.id,
        ...values,
-        url,
        secrets: values.secrets.map((secret) => ({
          kind: secret.kind,
          value: secret.value === "" ? null : secret.value,
        })),
-        appId: app?.id ?? null,
      },
      {
-        onSuccess: (data) => {
-          // We do it this way as we are unable to send a typesafe error through onError
-          if (data?.error) {
-            setError(data.error);
-            showErrorNotification({
-              title: t("integration.page.edit.notification.error.title"),
-              message: t("integration.page.edit.notification.error.message"),
-            });
-            return;
-          }
-
+        onSuccess: () => {
          showSuccessNotification({
            title: t("integration.page.edit.notification.success.title"),
            message: t("integration.page.edit.notification.success.message"),
          });
          void revalidatePathActionAsync("/manage/integrations").then(() => router.push("/manage/integrations"));
        },
-        onError: () => {
+        onError: (error) => {
+          const testConnectionError = convertIntegrationTestConnectionError(error.data?.error);
+
+          if (testConnectionError) {
+            showErrorNotification({
+              title: t(`integration.testConnection.notification.${testConnectionError.key}.title`),
+              message:
+                testConnectionError.message ??
+                t(`integration.testConnection.notification.${testConnectionError.key}.message`),
+            });
+            return;
+          }
+
          showErrorNotification({
            title: t("integration.page.edit.notification.error.title"),
            message: t("integration.page.edit.notification.error.message"),
@@ -114,82 +86,48 @@ export const EditIntegrationForm = ({ integration }: EditIntegrationForm) => {
    );
  };

-  const isInitialSecretKinds =
-    initialSecretsKinds.every((kind) => form.values.secrets.some((secret) => secret.kind === kind)) &&
-    form.values.secrets.length === initialSecretsKinds.length;
-
  return (
-    <form onSubmit={form.onSubmit(async (values) => await handleSubmitAsync(values))}>
+    <form onSubmit={form.onSubmit((values) => void handleSubmitAsync(values))}>
      <Stack>
        <TextInput withAsterisk label={t("integration.field.name.label")} {...form.getInputProps("name")} />

-        {hasUrlSecret ? null : (
-          <TextInput withAsterisk label={t("integration.field.url.label")} {...form.getInputProps("url")} />
-        )}
+        <TextInput withAsterisk label={t("integration.field.url.label")} {...form.getInputProps("url")} />

        <Fieldset legend={t("integration.secrets.title")}>
          <Stack gap="sm">
-            {allSecretKinds.length > 1 && (
-              <SecretKindsSegmentedControl
-                defaultKinds={initialSecretsKinds}
-                secretKinds={allSecretKinds}
-                form={form}
-              />
-            )}
-            {!isInitialSecretKinds
-              ? null
-              : form.values.secrets.map((secret, index) => (
-                  <SecretCard
-                    key={secret.kind}
-                    secret={secretsMap.get(secret.kind) ?? { kind: secret.kind, value: null, updatedAt: null }}
-                    onCancel={() =>
-                      new Promise((resolve) => {
-                        // When nothing changed, just close the secret card
-                        if ((secret.value ?? "") === (secretsMap.get(secret.kind)?.value ?? "")) {
-                          return resolve(true);
-                        }
-                        openConfirmModal({
-                          title: t("integration.secrets.reset.title"),
-                          children: t("integration.secrets.reset.message"),
-                          onCancel: () => resolve(false),
-                          onConfirm: () => {
-                            form.setFieldValue(`secrets.${index}.value`, secretsMap.get(secret.kind)?.value ?? "");
-                            resolve(true);
-                          },
-                        });
-                      })
+            {secretsKinds.map((kind, index) => (
+              <SecretCard
+                key={kind}
+                secret={secretsMap.get(kind) ?? { kind, value: null, updatedAt: null }}
+                onCancel={() =>
+                  new Promise((resolve) => {
+                    // When nothing changed, just close the secret card
+                    if ((form.values.secrets[index]?.value ?? "") === (secretsMap.get(kind)?.value ?? "")) {
+                      return resolve(true);
                    }
-                  >
-                    <IntegrationSecretInput
-                      label={t(`integration.secrets.kind.${secret.kind}.newLabel`)}
-                      key={secret.kind}
-                      kind={secret.kind}
-                      {...form.getInputProps(`secrets.${index}.value`)}
-                    />
-                  </SecretCard>
-                ))}
-            {isInitialSecretKinds
-              ? null
-              : form.values.secrets.map(({ kind }, index) => (
-                  <IntegrationSecretInput
-                    withAsterisk
-                    key={kind}
-                    kind={kind}
-                    {...form.getInputProps(`secrets.${index}.value`)}
-                  />
-                ))}
-            {form.values.secrets.length === 0 && (
-              <Alert icon={<IconInfoCircle size={"1rem"} />} color={"blue"}>
-                <Text c={"blue"}>{t("integration.secrets.noSecretsRequired.text")}</Text>
-              </Alert>
-            )}
+                    openConfirmModal({
+                      title: t("integration.secrets.reset.title"),
+                      children: t("integration.secrets.reset.message"),
+                      onCancel: () => resolve(false),
+                      onConfirm: () => {
+                        form.setFieldValue(`secrets.${index}.value`, secretsMap.get(kind)?.value ?? "");
+                        resolve(true);
+                      },
+                    });
+                  })
+                }
+              >
+                <IntegrationSecretInput
+                  label={t(`integration.secrets.kind.${kind}.newLabel`)}
+                  key={kind}
+                  kind={kind}
+                  {...form.getInputProps(`secrets.${index}.value`)}
+                />
+              </SecretCard>
+            ))}
          </Stack>
        </Fieldset>

-        <IntegrationLinkApp value={form.values.app} onChange={(app) => form.setFieldValue("app", app)} />
-
-        {error !== null && <IntegrationTestConnectionError error={error} url={form.values.url} />}
-
        <Group justify="end" align="center">
          <Button variant="default" component={Link} href="/manage/integrations">
            {t("common.action.backToOverview")}
@@ -203,80 +141,4 @@ export const EditIntegrationForm = ({ integration }: EditIntegrationForm) => {
  );
 };

-type FormType = z.infer<typeof formSchema>;
-
-interface IntegrationAppSelectProps {
-  value: FormType["app"];
-  onChange: (app: FormType["app"]) => void;
-}
-
-const IntegrationLinkApp = ({ value, onChange }: IntegrationAppSelectProps) => {
-  const { openModal } = useModalAction(AppSelectModal);
-  const t = useI18n();
-  const { data: session } = useSession();
-  const canCreateApps = session?.user.permissions.includes("app-create") ?? false;
-
-  const handleChange = () =>
-    openModal(
-      {
-        onSelect: onChange,
-        withCreate: canCreateApps,
-      },
-      {
-        title: t("integration.page.edit.app.action.select"),
-      },
-    );
-
-  if (!value) {
-    return (
-      <Button
-        variant="subtle"
-        color="gray"
-        leftSection={<IconPlus size={16} stroke={1.5} />}
-        fullWidth
-        onClick={handleChange}
-      >
-        {t("integration.page.edit.app.action.add")}
-      </Button>
-    );
-  }
-
-  return (
-    <Fieldset legend={t("integration.field.app.sectionTitle")}>
-      <Group justify="space-between">
-        <Group gap="sm">
-          {/* eslint-disable-next-line @next/next/no-img-element */}
-          <img src={value.iconUrl} alt={value.name} width={32} height={32} />
-          <Stack gap={0}>
-            <Text size="sm" fw="bold">
-              {value.name}
-            </Text>
-            {value.href !== null && (
-              <Anchor href={value.href} target="_blank" rel="noopener noreferrer" size="sm">
-                {value.href}
-              </Anchor>
-            )}
-          </Stack>
-        </Group>
-        <ButtonGroup>
-          <Button
-            variant="subtle"
-            color="gray"
-            leftSection={<IconUnlink size={16} stroke={1.5} />}
-            onClick={() => onChange(null)}
-          >
-            {t("integration.page.edit.app.action.remove")}
-          </Button>
-          <Button
-            variant="subtle"
-            color="gray"
-            leftSection={<IconPencil size={16} stroke={1.5} />}
-            onClick={handleChange}
-          >
-            {t("common.action.change")}
-          </Button>
-        </ButtonGroup>
-      </Group>
-    </Fieldset>
-  );
-};
+type FormType = Omit<z.infer<typeof validation.integration.update>, "id">;
@@ -2,27 +2,23 @@

 import type { ChangeEvent } from "react";
 import React, { useMemo, useState } from "react";
+import Link from "next/link";
 import { Flex, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
 import { IconSearch } from "@tabler/icons-react";

 import { getIntegrationName, integrationKinds } from "@homarr/definitions";
 import { useI18n } from "@homarr/translation/client";
-import { IntegrationAvatar, Link } from "@homarr/ui";
+import { IntegrationAvatar } from "@homarr/ui";

-interface IntegrationCreateDropdownContentProps {
-  enableMockIntegration: boolean;
-}
-
-export const IntegrationCreateDropdownContent = ({ enableMockIntegration }: IntegrationCreateDropdownContentProps) => {
+export const IntegrationCreateDropdownContent = () => {
  const t = useI18n();
  const [search, setSearch] = useState("");

  const filteredKinds = useMemo(() => {
-    return integrationKinds
-      .filter((kind) => enableMockIntegration || kind !== "mock")
-      .filter((kind) => getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()))
-      .sort((kindA, kindB) => getIntegrationName(kindA).localeCompare(getIntegrationName(kindB)));
-  }, [search, enableMockIntegration]);
+    return integrationKinds.filter((kind) =>
+      getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()),
+    );
+  }, [search]);

  const handleSearch = React.useCallback(
    (event: ChangeEvent<HTMLInputElement>) => setSearch(event.target.value),
@@ -1,144 +1,75 @@
 "use client";

-import { startTransition, useState } from "react";
+import { useCallback } from "react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
-import {
-  Alert,
-  Button,
-  Checkbox,
-  Collapse,
-  Fieldset,
-  Group,
-  Loader,
-  SegmentedControl,
-  Select,
-  Stack,
-  Text,
-  TextInput,
-} from "@mantine/core";
-import { IconCheck, IconInfoCircle } from "@tabler/icons-react";
-import { z } from "zod/v4";
+import { Alert, Button, Checkbox, Fieldset, Group, SegmentedControl, Stack, Text, TextInput } from "@mantine/core";
+import { IconInfoCircle } from "@tabler/icons-react";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import type { Modify } from "@homarr/common/types";
-import type { IntegrationKind } from "@homarr/definitions";
-import {
-  getAllSecretKindOptions,
-  getIconUrl,
-  getIntegrationDefaultUrl,
-  getIntegrationName,
-  integrationDefs,
-} from "@homarr/definitions";
-import type { GetInputPropsReturnType, UseFormReturnType } from "@homarr/form";
+import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions";
+import { getAllSecretKindOptions, getIntegrationName, integrationDefs } from "@homarr/definitions";
+import type { UseFormReturnType } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
+import { convertIntegrationTestConnectionError } from "@homarr/integrations/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { Link } from "@homarr/ui";
-import { appHrefSchema } from "@homarr/validation/app";
-import { integrationCreateSchema } from "@homarr/validation/integration";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import { validation } from "@homarr/validation";

 import { IntegrationSecretInput } from "../_components/secrets/integration-secret-inputs";
-import { SecretKindsSegmentedControl } from "../_components/secrets/integration-secret-segmented-control";
-import { IntegrationTestConnectionError } from "../_components/test-connection/integration-test-connection-error";
-import type { AnyMappedTestConnectionError } from "../_components/test-connection/types";

 interface NewIntegrationFormProps {
-  searchParams: Partial<z.infer<typeof integrationCreateSchema>> & {
+  searchParams: Partial<z.infer<typeof validation.integration.create>> & {
    kind: IntegrationKind;
  };
 }

-const formSchema = integrationCreateSchema.omit({ kind: true, app: true }).and(
-  z.object({
-    hasApp: z.boolean(),
-    appHref: appHrefSchema,
-    appId: z.string().nullable(),
-  }),
-);
-
 export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) => {
  const t = useI18n();
  const secretKinds = getAllSecretKindOptions(searchParams.kind);
-  const hasUrlSecret = secretKinds.some((kinds) => kinds.includes("url"));
  const router = useRouter();
-  const { data: session } = useSession();
-  const canCreateApps = session?.user.permissions.includes("app-create") ?? false;
-
-  let url = searchParams.url ?? getIntegrationDefaultUrl(searchParams.kind) ?? "";
-  if (hasUrlSecret) {
-    // Placeholder Url, replaced with origin of the secret Url on submit
-    url = "http://localhost";
-  }
-  const form = useZodForm(formSchema, {
+  const form = useZodForm(validation.integration.create.omit({ kind: true }), {
    initialValues: {
      name: searchParams.name ?? getIntegrationName(searchParams.kind),
-      url,
+      url: searchParams.url ?? "",
      secrets: secretKinds[0].map((kind) => ({
        kind,
        value: "",
      })),
      attemptSearchEngineCreation: true,
-      hasApp: false,
-      appHref: url,
-      appId: null,
    },
  });
+  const { mutateAsync, isPending } = clientApi.integration.create.useMutation();

-  const { mutateAsync: createIntegrationAsync, isPending } = clientApi.integration.create.useMutation({
-    async onSuccess() {
-      await revalidatePathActionAsync("/manage/integrations");
-    },
-  });
-  const [error, setError] = useState<null | AnyMappedTestConnectionError>(null);
-
-  const handleSubmitAsync = async ({ appId, appHref, hasApp, ...values }: FormType) => {
-    const url = hasUrlSecret
-      ? new URL(values.secrets.find((secret) => secret.kind === "url")?.value ?? values.url).origin
-      : values.url;
-
-    const hasCustomHref = appHref !== null && appHref.trim().length >= 1;
-
-    const app = hasApp
-      ? appId !== null
-        ? { id: appId }
-        : {
-            name: values.name,
-            href: hasCustomHref ? appHref : url,
-            iconUrl: getIconUrl(searchParams.kind),
-            description: null,
-            pingUrl: url,
-          }
-      : undefined;
-
-    await createIntegrationAsync(
+  const handleSubmitAsync = async (values: FormType) => {
+    await mutateAsync(
      {
        kind: searchParams.kind,
        ...values,
-        url,
-        app,
      },
      {
-        onSuccess(data) {
-          // We do it this way as we are unable to send a typesafe error through onError
-          if (data?.error) {
-            setError(data.error);
-            showErrorNotification({
-              title: t("integration.page.create.notification.error.title"),
-              message: t("integration.page.create.notification.error.message"),
-            });
-            return;
-          }
-
+        onSuccess: () => {
          showSuccessNotification({
            title: t("integration.page.create.notification.success.title"),
            message: t("integration.page.create.notification.success.message"),
          });
-
-          router.push("/manage/integrations");
+          void revalidatePathActionAsync("/manage/integrations").then(() => router.push("/manage/integrations"));
        },
-        onError: () => {
+        onError: (error) => {
+          const testConnectionError = convertIntegrationTestConnectionError(error.data?.error);
+
+          if (testConnectionError) {
+            showErrorNotification({
+              title: t(`integration.testConnection.notification.${testConnectionError.key}.title`),
+              message:
+                testConnectionError.message ??
+                t(`integration.testConnection.notification.${testConnectionError.key}.message`),
+            });
+            return;
+          }
+
          showErrorNotification({
            title: t("integration.page.create.notification.error.title"),
            message: t("integration.page.create.notification.error.message"),
@@ -155,9 +86,7 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
      <Stack>
        <TextInput withAsterisk label={t("integration.field.name.label")} autoFocus {...form.getInputProps("name")} />

-        {hasUrlSecret ? null : (
-          <TextInput withAsterisk label={t("integration.field.url.label")} {...form.getInputProps("url")} />
-        )}
+        <TextInput withAsterisk label={t("integration.field.url.label")} {...form.getInputProps("url")} />

        <Fieldset legend={t("integration.secrets.title")}>
          <Stack gap="sm">
@@ -178,8 +107,6 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
          </Stack>
        </Fieldset>

-        {error !== null && <IntegrationTestConnectionError error={error} url={form.values.url} />}
-
        {supportsSearchEngine && (
          <Checkbox
            label={t("integration.field.attemptSearchEngineCreation.label")}
@@ -190,8 +117,6 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
          />
        )}

-        <AppForm form={form} canCreateApps={canCreateApps} />
-
        <Group justify="end" align="center">
          <Button variant="default" component={Link} href="/manage/integrations">
            {t("common.action.backToOverview")}
@@ -205,115 +130,40 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
  );
 };

-type FormType = z.infer<typeof formSchema>;
+interface SecretKindsSegmentedControlProps {
+  secretKinds: IntegrationSecretKind[][];
+  form: UseFormReturnType<FormType, (values: FormType) => FormType>;
+}

-const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; canCreateApps: boolean }) => {
-  const t = useI18n();
-  const checkboxInputProps = form.getInputProps("hasApp", { type: "checkbox" });
+const SecretKindsSegmentedControl = ({ secretKinds, form }: SecretKindsSegmentedControlProps) => {
+  const t = useScopedI18n("integration.secrets");

-  return (
-    <>
-      <Checkbox
-        {...checkboxInputProps}
-        onChange={(event) => {
-          startTransition(() => {
-            form.setFieldValue("appHref", event.currentTarget.checked ? form.values.url : null);
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-            checkboxInputProps.onChange(event);
-          });
-        }}
-        label={t("integration.field.createApp.label")}
-        description={t("integration.field.createApp.description")}
-      />
+  const secretKindGroups = secretKinds.map((kinds) => ({
+    label:
+      kinds.length === 0
+        ? t("noSecretsRequired.segmentTitle")
+        : kinds.map((kind) => t(`kind.${kind}.label`)).join(" & "),
+    value: kinds.length === 0 ? "empty" : kinds.join("-"),
+  }));

-      <Collapse in={form.values.hasApp}>
-        <Fieldset legend={t("integration.field.app.sectionTitle")}>
-          <Stack gap="sm">
-            {canCreateApps && (
-              <SegmentedControl
-                data={(["new", "existing"] as const).map((value) => ({
-                  value,
-                  label: t(`integration.page.create.app.option.${value}.title`),
-                }))}
-                value={form.values.appHref === null ? "existing" : "new"}
-                onChange={(value) => {
-                  if (value === "existing") {
-                    form.setFieldValue("appId", null);
-                    form.setFieldValue("appHref", null);
-                  } else {
-                    form.setFieldValue("appId", null);
-                    form.setFieldValue("appHref", form.values.url);
-                  }
-                }}
-              />
-            )}
-
-            {typeof form.values.appHref === "string" && canCreateApps ? (
-              <TextInput
-                placeholder={t("integration.field.appHref.placeholder")}
-                withAsterisk
-                label={t("integration.page.create.app.option.new.url.label")}
-                description={t("integration.page.create.app.option.new.url.description")}
-                {...form.getInputProps("appHref")}
-              />
-            ) : (
-              <IntegrationAppSelect {...form.getInputProps("appId")} />
-            )}
-          </Stack>
-        </Fieldset>
-      </Collapse>
-    </>
-  );
-};
-
-type IntegrationAppSelectProps = Modify<
-  GetInputPropsReturnType,
-  {
-    value?: string | null;
-    onChange: (value: string | null) => void;
-  }
->;
-
-const IntegrationAppSelect = ({ value, ...props }: IntegrationAppSelectProps) => {
-  const { data, isPending } = clientApi.app.selectable.useQuery();
-  const t = useI18n();
-
-  const appMap = new Map(data?.map((app) => [app.id, app] as const));
-
-  return (
-    <Select
-      withAsterisk
-      label={t("integration.page.create.app.option.existing.label")}
-      searchable
-      clearable
-      leftSection={
-        // eslint-disable-next-line @next/next/no-img-element
-        value ? <img width={20} height={20} src={appMap.get(value)?.iconUrl} alt={appMap.get(value)?.name} /> : null
+  const onChange = useCallback(
+    (value: string) => {
+      if (value === "empty") {
+        form.setFieldValue("secrets", []);
+        return;
      }
-      renderOption={({ option, checked }) => (
-        <Group flex="1" gap="xs">
-          {/* eslint-disable-next-line @next/next/no-img-element */}
-          <img width={20} height={20} src={appMap.get(option.value)?.iconUrl} alt={option.label} />
-          <Stack gap={0}>
-            <Text>{option.label}</Text>
-            <Text size="xs" c="dimmed">
-              {appMap.get(option.value)?.href}
-            </Text>
-          </Stack>
-          {checked && (
-            <IconCheck
-              style={{ marginInlineStart: "auto" }}
-              stroke={1.5}
-              color="currentColor"
-              opacity={0.6}
-              size={18}
-            />
-          )}
-        </Group>
-      )}
-      {...props}
-      data={data?.map((app) => ({ value: app.id, label: app.name }))}
-      rightSection={isPending ? <Loader size="sm" /> : null}
-    />
+
+      const kinds = value.split("-") as IntegrationSecretKind[];
+      const secrets = kinds.map((kind) => ({
+        kind,
+        value: "",
+      }));
+      form.setFieldValue("secrets", secrets);
+    },
+    [form],
  );
+
+  return <SegmentedControl fullWidth data={secretKindGroups} onChange={onChange}></SegmentedControl>;
 };
+
+type FormType = Omit<z.infer<typeof validation.integration.create>, "kind">;
@@ -1,20 +1,20 @@
 import { notFound } from "next/navigation";
 import { Container, Group, Stack, Title } from "@mantine/core";
-import { z } from "zod/v4";
+import { z } from "zod";

 import { auth } from "@homarr/auth/next";
 import type { IntegrationKind } from "@homarr/definitions";
 import { getIntegrationName, integrationKinds } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { IntegrationAvatar } from "@homarr/ui";
-import type { integrationCreateSchema } from "@homarr/validation/integration";
+import type { validation } from "@homarr/validation";

 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NewIntegrationForm } from "./_integration-new-form";

 interface NewIntegrationPageProps {
  searchParams: Promise<
-    Partial<z.infer<typeof integrationCreateSchema>> & {
+    Partial<z.infer<typeof validation.integration.create>> & {
      kind: IntegrationKind;
    }
  >;
@@ -1,5 +1,6 @@
 import { Fragment } from "react";
 import type { PropsWithChildren } from "react";
+import Link from "next/link";
 import { redirect } from "next/navigation";
 import {
  AccordionControl,
@@ -35,12 +36,11 @@ import { objectEntries } from "@homarr/common";
 import type { IntegrationKind } from "@homarr/definitions";
 import { getIntegrationName } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
-import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
+import { CountBadge, IntegrationAvatar } from "@homarr/ui";

 import { ManageContainer } from "~/components/manage/manage-container";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
-import { env } from "~/env";
 import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
 import { DeleteIntegrationActionButton } from "./_integration-buttons";
 import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown";
@@ -114,7 +114,7 @@ const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
    >
      {children}
      <MenuDropdown>
-        <IntegrationCreateDropdownContent enableMockIntegration={env.UNSAFE_ENABLE_MOCK_INTEGRATION} />
+        <IntegrationCreateDropdownContent />
      </MenuDropdown>
    </Menu>
  );
@@ -208,20 +208,21 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
                  <Stack gap={0}>
                    <Group justify="space-between" align="center" wrap="nowrap">
                      <Text>{integration.name}</Text>
-                      {(hasFullAccess || integration.permissions.hasFullAccess) && (
-                        <ActionIconGroup>
-                          <ActionIcon
-                            component={Link}
-                            href={`/manage/integrations/edit/${integration.id}`}
-                            variant="subtle"
-                            color="gray"
-                            aria-label={t("page.edit.title", { name: getIntegrationName(integration.kind) })}
-                          >
-                            <IconPencil size={16} stroke={1.5} />
-                          </ActionIcon>
-                          <DeleteIntegrationActionButton integration={integration} count={integrations.length} />
-                        </ActionIconGroup>
-                      )}
+                      {hasFullAccess ||
+                        (integration.permissions.hasFullAccess && (
+                          <ActionIconGroup>
+                            <ActionIcon
+                              component={Link}
+                              href={`/manage/integrations/edit/${integration.id}`}
+                              variant="subtle"
+                              color="gray"
+                              aria-label={t("page.edit.title", { name: getIntegrationName(integration.kind) })}
+                            >
+                              <IconPencil size={16} stroke={1.5} />
+                            </ActionIcon>
+                            <DeleteIntegrationActionButton integration={integration} count={integrations.length} />
+                          </ActionIconGroup>
+                        ))}
                    </Group>
                    <Anchor href={integration.url} target="_blank" rel="noreferrer" size="sm">
                      {integration.url}
@@ -28,7 +28,6 @@ import {
 import { auth } from "@homarr/auth/next";
 import { isProviderEnabled } from "@homarr/auth/server";
 import { createDocumentationLink } from "@homarr/definitions";
-import { env } from "@homarr/docker/env";
 import { getScopedI18n } from "@homarr/translation/server";

 import { MainHeader } from "~/components/layout/header";
@@ -114,13 +113,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
          label: t("items.tools.items.docker"),
          icon: IconBrandDocker,
          href: "/manage/tools/docker",
-          hidden: !(session?.user.permissions.includes("admin") && env.ENABLE_DOCKER),
-        },
-        {
-          label: t("items.tools.items.kubernetes"),
-          icon: IconBox,
-          href: "/manage/tools/kubernetes",
-          hidden: !(session?.user.permissions.includes("admin") && env.ENABLE_KUBERNETES),
+          hidden: !session?.user.permissions.includes("admin"),
        },
        {
          label: t("items.tools.items.api"),
@@ -14,7 +14,7 @@ export const UploadMediaButton = () => {
  };

  return (
-    <UploadMedia onSettled={onSettledAsync} multiple>
+    <UploadMedia onSettled={onSettledAsync}>
      {({ onClick, loading }) => (
        <Button onClick={onClick} loading={loading} rightSection={<IconUpload size={16} stroke={1.5} />}>
          {t("media.action.upload.label")}
@@ -1,3 +1,4 @@
+import Link from "next/link";
 import { notFound } from "next/navigation";
 import {
  ActionIcon,
@@ -15,7 +16,7 @@ import {
  Tooltip,
 } from "@mantine/core";
 import { IconExternalLink } from "@tabler/icons-react";
-import { z } from "zod/v4";
+import { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -24,7 +25,7 @@ import { humanFileSize } from "@homarr/common";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { createLocalImageUrl } from "@homarr/icons/local";
 import { getI18n } from "@homarr/translation/server";
-import { Link, SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
+import { SearchInput, TablePagination, UserAvatar } from "@homarr/ui";

 import { ManageContainer } from "~/components/manage/manage-container";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
@@ -91,8 +92,7 @@ export default async function GroupsListPage(props: MediaListPageProps) {
          </TableTbody>
        </Table>

-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
        </Group>
      </Stack>
@@ -1,16 +1,25 @@
-import type { Metadata } from "next";
+import Link from "next/link";
 import { Card, Group, SimpleGrid, Space, Stack, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";

 import { api } from "@homarr/api/server";
+import { auth } from "@homarr/auth/next";
+import { isProviderEnabled } from "@homarr/auth/server";
 import { getScopedI18n } from "@homarr/translation/server";
-import { Link } from "@homarr/ui";

 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { createMetaTitle } from "~/metadata";
 import { HeroBanner } from "./_components/hero-banner";

-export async function generateMetadata(): Promise<Metadata> {
+interface LinkProps {
+  title: string;
+  subtitle: string;
+  count: number;
+  href: string;
+  hidden?: boolean;
+}
+
+export async function generateMetadata() {
  const t = await getScopedI18n("management");

  return {
@@ -20,32 +29,78 @@ export async function generateMetadata(): Promise<Metadata> {

 export default async function ManagementPage() {
  const statistics = await api.home.getStats();
+  const session = await auth();
  const t = await getScopedI18n("management.page.home");

+  const links: LinkProps[] = [
+    {
+      count: statistics.countBoards,
+      href: "/manage/boards",
+      subtitle: t("statisticLabel.boards"),
+      title: t("statistic.board"),
+    },
+    {
+      count: statistics.countUsers,
+      href: "/manage/users",
+      subtitle: t("statisticLabel.authentication"),
+      title: t("statistic.user"),
+      hidden: !session?.user.permissions.includes("admin"),
+    },
+    {
+      count: statistics.countInvites,
+      href: "/manage/users/invites",
+      subtitle: t("statisticLabel.authentication"),
+      title: t("statistic.invite"),
+      hidden: !isProviderEnabled("credentials") || !session?.user.permissions.includes("admin"),
+    },
+    {
+      count: statistics.countIntegrations,
+      href: "/manage/integrations",
+      subtitle: t("statisticLabel.resources"),
+      title: t("statistic.integration"),
+    },
+    {
+      count: statistics.countApps,
+      href: "/manage/apps",
+      subtitle: t("statisticLabel.resources"),
+      title: t("statistic.app"),
+      hidden: !session?.user,
+    },
+    {
+      count: statistics.countGroups,
+      href: "/manage/users/groups",
+      subtitle: t("statisticLabel.authorization"),
+      title: t("statistic.group"),
+      hidden: !session?.user.permissions.includes("admin"),
+    },
+  ];
  return (
    <>
      <DynamicBreadcrumb />
      <HeroBanner />
      <Space h="md" />
      <SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
-        {statistics.map((statistic) => (
-          <Card component={Link} href={statistic.path} key={statistic.path} radius="lg">
-            <Group justify="space-between" wrap="nowrap">
-              <Group wrap="nowrap">
-                <Text size="2.4rem" fw="bolder">
-                  {statistic.count}
-                </Text>
-                <Stack gap={0}>
-                  <Text c="red" size="xs">
-                    {t(`statisticLabel.${statistic.subtitleKey}`)}
-                  </Text>
-                  <Text fw="bold">{t(`statistic.${statistic.titleKey}`)}</Text>
-                </Stack>
-              </Group>
-              <IconArrowRight />
-            </Group>
-          </Card>
-        ))}
+        {links.map(
+          (link) =>
+            !link.hidden && (
+              <Card component={Link} href={link.href} key={link.href} radius="lg">
+                <Group justify="space-between" wrap="nowrap">
+                  <Group wrap="nowrap">
+                    <Text size="2.4rem" fw="bolder">
+                      {link.count}
+                    </Text>
+                    <Stack gap={0}>
+                      <Text c="red" size="xs">
+                        {link.subtitle}
+                      </Text>
+                      <Text fw="bold">{link.title}</Text>
+                    </Stack>
+                  </Group>
+                  <IconArrowRight />
+                </Group>
+              </Card>
+            ),
+        )}
      </SimpleGrid>
    </>
  );
@@ -1,9 +1,10 @@
 "use client";

+import Link from "next/link";
 import type { SegmentedControlItem } from "@mantine/core";
 import { Button, Fieldset, Grid, Group, SegmentedControl, Stack, Textarea, TextInput } from "@mantine/core";
 import { WidgetIntegrationSelect } from "node_modules/@homarr/widgets/src/widget-integration-select";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
 import { searchEngineTypes } from "@homarr/definitions";
@@ -11,10 +12,9 @@ import { useZodForm } from "@homarr/form";
 import { IconPicker } from "@homarr/forms-collection";
 import type { TranslationFunction } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";
-import { Link } from "@homarr/ui";
-import { searchEngineManageSchema } from "@homarr/validation/search-engine";
+import { validation } from "@homarr/validation";

-type FormType = z.infer<typeof searchEngineManageSchema>;
+type FormType = z.infer<typeof validation.searchEngine.manage>;

 interface SearchEngineFormProps {
  submitButtonTranslation: (t: TranslationFunction) => string;
@@ -30,7 +30,7 @@ export const SearchEngineForm = (props: SearchEngineFormProps) => {

  const [integrationData] = clientApi.integration.allThatSupportSearch.useSuspenseQuery();

-  const form = useZodForm(searchEngineManageSchema, {
+  const form = useZodForm(validation.searchEngine.manage, {
    initialValues: initialValues ?? {
      name: "",
      short: "",
@@ -23,9 +23,7 @@ export const SearchEngineDeleteButton = ({ searchEngine }: SearchEngineDeleteBut
  const onClick = useCallback(() => {
    openConfirmModal({
      title: t("title"),
-      children: t("message", {
-        name: searchEngine.name,
-      }),
+      children: t("message", searchEngine),
      onConfirm: () => {
        mutate(
          { id: searchEngine.id },
@@ -2,7 +2,7 @@

 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -10,7 +10,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import type { TranslationFunction } from "@homarr/translation";
 import { useScopedI18n } from "@homarr/translation/client";
-import type { searchEngineManageSchema } from "@homarr/validation/search-engine";
+import type { validation } from "@homarr/validation";

 import { SearchEngineForm } from "../../_form";

@@ -41,7 +41,7 @@ export const SearchEngineEditForm = ({ searchEngine }: SearchEngineEditFormProps
  });

  const handleSubmit = useCallback(
-    (values: z.infer<typeof searchEngineManageSchema>) => {
+    (values: z.infer<typeof validation.searchEngine.manage>) => {
      mutate({
        id: searchEngine.id,
        ...values,
@@ -2,14 +2,14 @@

 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod/v4";
+import type { z } from "zod";

 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import type { TranslationFunction } from "@homarr/translation";
 import { useScopedI18n } from "@homarr/translation/client";
-import type { searchEngineManageSchema } from "@homarr/validation/search-engine";
+import type { validation } from "@homarr/validation";

 import { SearchEngineForm } from "../_form";

@@ -35,7 +35,7 @@ export const SearchEngineNewForm = () => {
  });

  const handleSubmit = useCallback(
-    (values: z.infer<typeof searchEngineManageSchema>) => {
+    (values: z.infer<typeof validation.searchEngine.manage>) => {
      mutate(values);
    },
    [mutate],
@@ -1,14 +1,15 @@
+import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconPencil, IconSearch } from "@tabler/icons-react";
-import { z } from "zod/v4";
+import { z } from "zod";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
-import { Link, SearchInput, TablePagination } from "@homarr/ui";
+import { SearchInput, TablePagination } from "@homarr/ui";

 import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
@@ -60,8 +61,7 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {
          </Stack>
        )}

-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
        </Group>
      </Stack>
@@ -0,0 +1,23 @@
+"use client";
+
+import type { OpenAPIObject } from "openapi3-ts/oas31";
+import SwaggerUI from "swagger-ui-react";
+
+// workaround for CSS that cannot be processed by next.js, https://github.com/swagger-api/swagger-ui/issues/10045
+import "../swagger-ui-dark.css";
+import "../swagger-ui-overrides.css";
+import "../swagger-ui.css";
+
+interface SwaggerUIClientProps {
+  document: OpenAPIObject;
+}
+
+export const SwaggerUIClient = ({ document }: SwaggerUIClientProps) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const requestInterceptor = (req: Record<string, any>) => {
+    req.credentials = "omit";
+    return req;
+  };
+
+  return <SwaggerUI requestInterceptor={requestInterceptor} spec={document} />;
+};
@@ -1,7 +1,6 @@
 import { headers } from "next/headers";
 import { notFound } from "next/navigation";
 import { Stack, Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";
-import { ApiReferenceReact } from "@scalar/api-reference-react";

 import { openApiDocument } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -9,14 +8,11 @@ import { auth } from "@homarr/auth/next";
 import { extractBaseUrlFromHeaders } from "@homarr/common";
 import { getScopedI18n } from "@homarr/translation/server";

+import { SwaggerUIClient } from "~/app/[locale]/manage/tools/api/components/swagger-ui";
 import { createMetaTitle } from "~/metadata";
 import { ApiKeysManagement } from "./components/api-keys";

-import "@scalar/api-reference-react/style.css";
-
-import { Metadata } from "next";
-
-export async function generateMetadata(): Promise<Metadata> {
+export async function generateMetadata() {
  const session = await auth();
  if (!session?.user || !session.user.permissions.includes("admin")) {
    return {};
@@ -49,21 +45,7 @@ export default async function ApiPage() {
          <ApiKeysManagement apiKeys={apiKeys} />
        </TabsPanel>
        <TabsPanel value={"documentation"}>
-          <ApiReferenceReact
-            configuration={{
-              content: document,
-              layout: "classic",
-              showSidebar: false,
-              hideDarkModeToggle: true,
-              showDeveloperTools: "never",
-              hiddenClients: true,
-              darkMode: session.user.colorScheme === "dark",
-              authentication: {
-                preferredSecurityScheme: "apikey",
-              },
-              hideSearch: true,
-            }}
-          />
+          <SwaggerUIClient document={document} />
        </TabsPanel>
      </Tabs>
    </Stack>
@@ -0,0 +1,4 @@
+.swagger-ui .info {
+  margin: 0 !important;
+  margin-bottom: 20px !important;
+}
@@ -1 +1 @@
 .12.0
 .14.0
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 139.3 512.2 233.5"><path d="M256 139.3c-53 0-97.9 35.8-112.1 84.4-12.2-25.5-38.2-43.4-68.2-43.4C34.2 180.2 0 214.4 0 256s34.2 75.8 75.8 75.8c30 0 55.9-17.9 68.2-43.4 14.1 48.6 59.1 84.4 112.1 84.4S354 337 368.2 288.4c12.2 25.5 38.2 43.4 68.2 43.4 41.6 0 75.8-34.2 75.8-75.8s-34.2-75.8-75.8-75.8c-30 0-55.9 17.9-68.2 43.4-14.3-48.5-59.2-84.3-112.2-84.3m0 45c39.9 0 71.7 31.8 71.7 71.7s-31.8 71.7-71.7 71.7-71.7-31.8-71.7-71.7 31.8-71.7 71.7-71.7m-180.2 41c17.2 0 30.7 13.5 30.7 30.7S93 286.7 75.8 286.7 45.1 273.2 45.1 256s13.4-30.7 30.7-30.7m360.4 0c17.2 0 30.7 13.5 30.7 30.7s-13.5 30.7-30.7 30.7-30.7-13.5-30.7-30.7 13.5-30.7 30.7-30.7" style="fill:#3784c9"/></svg>