diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index fba4cac7bc..1b91e14d7a 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -88,6 +88,9 @@
   :dynamic-var-not-earmuffed
   {:level :off}
 
+  :type-mismatch
+  {:level :off}
+
   :used-underscored-binding
   {:level :warning}
 
diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000000..b8c352b7cd
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,3 @@
+# Penpot API configuration for error-reports CLI tool
+PENPOT_API_URI=http://localhost:3450
+PENPOT_ACCESS_TOKEN=your-access-token-here
diff --git a/.github/workflows/build-bundle.yml b/.github/workflows/build-bundle.yml
index 441587eea3..e785f2c84e 100644
--- a/.github/workflows/build-bundle.yml
+++ b/.github/workflows/build-bundle.yml
@@ -9,16 +9,6 @@ on:
         type: string
         required: true
         default: 'develop'
-      build_wasm:
-        description: 'BUILD_WASM. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
-      build_storybook:
-        description: 'BUILD_STORYBOOK. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
   workflow_call:
     inputs:
       gh_ref:
@@ -26,29 +16,21 @@ on:
         type: string
         required: true
         default: 'develop'
-      build_wasm:
-        description: 'BUILD_WASM. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
-      build_storybook:
-        description: 'BUILD_STORYBOOK. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.gh_ref }}
   cancel-in-progress: true
 
 jobs:
-  build-bundle:
-    name: Build and Upload Penpot Bundle
+  # ── 1. Decide whether there is anything to build ───────────────────────
+  check:
+    name: Check current bundle
     runs-on: penpot-runner-01
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+    timeout-minutes: 10
+    outputs:
+      gh_ref: ${{ steps.vars.outputs.gh_ref }}
+      bundle_version: ${{ steps.vars.outputs.bundle_version }}
+      exists: ${{ steps.check.outputs.exists }}
 
     steps:
       - name: Checkout repository
@@ -63,10 +45,52 @@ jobs:
           echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
           echo "bundle_version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
 
+      # The uploaded zip carries its version as S3 metadata. If the
+      # existing object was already built from this same commit, the
+      # whole build job is skipped.
+      - name: Check if this bundle is already built
+        id: check
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          EXISTING_VERSION=$(aws s3api head-object \
+            --bucket ${{ secrets.S3_BUCKET }} \
+            --key "penpot-${{ steps.vars.outputs.gh_ref }}.zip" \
+            --query 'Metadata."bundle-version"' \
+            --output text 2>/dev/null || echo "none")
+
+          if [ "$EXISTING_VERSION" = "${{ steps.vars.outputs.bundle_version }}" ]; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            {
+              echo "### ⏭️ Bundle build skipped"
+              echo ""
+              echo "The bundle in S3 was already built from \`${{ steps.vars.outputs.bundle_version }}\`."
+            } >> "$GITHUB_STEP_SUMMARY"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+          fi
+
+  # ── 2. Build and upload, only when needed ──────────────────────────────
+  build:
+    name: Build and Upload Penpot Bundle
+    runs-on: penpot-runner-01
+    timeout-minutes: 90
+    needs: check
+    if: needs.check.outputs.exists == 'false'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.gh_ref }}
+
       - name: Build bundle
         env:
-          BUILD_WASM: ${{ inputs.build_wasm }}
-          BUILD_STORYBOOK: ${{ inputs.build_storybook }}
+          BUILD_WASM: 'yes'
+          BUILD_STORYBOOK: 'yes'
         run: ./manage.sh build-bundle
 
       - name: Prepare directories for zipping
@@ -80,18 +104,32 @@ jobs:
           zip -r zips/penpot.zip penpot
 
       - name: Upload Penpot bundle to S3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
         run: |
-          aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip --metadata bundle-version=${{ steps.vars.outputs.bundle_version }}
+          aws s3 cp zips/penpot.zip \
+            s3://${{ secrets.S3_BUCKET }}/penpot-${{ needs.check.outputs.gh_ref }}.zip \
+            --metadata bundle-version=${{ needs.check.outputs.bundle_version }}
 
+  # ── 3. Single failure notification for the whole workflow ─────────────
+  notify:
+    name: Notify failure
+    runs-on: penpot-runner-01
+    timeout-minutes: 5
+    needs: [check, build]
+    if: failure()
+
+    steps:
       - name: Notify Mattermost
-        if: failure()
         uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd
           TEXT: |
             ❌ 📦 *[PENPOT] Error building penpot bundles.*
-            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
-               Bundle version: `${{ steps.vars.outputs.bundle_version }}`
+            📄 Triggered from ref: `${{ needs.check.outputs.gh_ref || inputs.gh_ref }}`
+               Bundle version: `${{ needs.check.outputs.bundle_version || 'n/a' }}`
             🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
             @infra
diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
index 8125c81e12..b0edcb63cb 100644
--- a/.github/workflows/build-develop.yml
+++ b/.github/workflows/build-develop.yml
@@ -11,8 +11,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "develop"
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -20,3 +18,9 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "develop"
+
+  build-docker-admin-console:
+    uses: ./.github/workflows/build-docker-admin-console.yml
+    secrets: inherit
+    with:
+      gh_ref: "develop"
diff --git a/.github/workflows/build-docker-admin-console.yml b/.github/workflows/build-docker-admin-console.yml
new file mode 100644
index 0000000000..b3f8384636
--- /dev/null
+++ b/.github/workflows/build-docker-admin-console.yml
@@ -0,0 +1,91 @@
+name: Admin Console Docker Builder
+
+on:
+  workflow_dispatch:
+    inputs:
+      gh_ref:
+        description: 'Name of the branch or ref to build in penpot-nitrate'
+        type: string
+        required: true
+        default: 'develop'
+      dispatch_ref:
+        description: 'Branch of penpot-nitrate from which the workflow definition is read'
+        type: string
+        required: false
+        default: 'develop'
+  workflow_call:
+    inputs:
+      gh_ref:
+        description: 'Name of the branch or ref to build in penpot-nitrate'
+        type: string
+        required: true
+      dispatch_ref:
+        description: 'Branch of penpot-nitrate from which the workflow definition is read'
+        type: string
+        required: false
+        default: 'develop'
+    secrets:
+      ORG_WORKFLOW_TOKEN:
+        description: 'Token with Actions write access on penpot-nitrate'
+        required: true
+
+jobs:
+  build-nitrate-docker:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.ORG_WORKFLOW_TOKEN }}
+      REPO: penpot/penpot-nitrate
+      WORKFLOW: build-docker-admin-console.yml
+      GH_REF: ${{ inputs.gh_ref }}
+      DISPATCH_REF: ${{ inputs.dispatch_ref }}
+    steps:
+      - name: Trigger nitrate docker build
+        id: dispatch
+        run: |
+          DISTINCT_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          CALLER_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+          gh workflow run "$WORKFLOW" --repo "$REPO" --ref "$DISPATCH_REF" \
+            -f gh_ref="$GH_REF" \
+            -f caller_run_id="$DISTINCT_ID" \
+            -f caller_run_url="$CALLER_URL"
+
+          # Locate the dispatched run using the correlation id embedded in its run-name
+          RUN_ID=""
+          for i in $(seq 1 24); do
+            sleep 5
+            RUN_ID=$(gh run list --repo "$REPO" --workflow "$WORKFLOW" \
+              --limit 10 --json databaseId,displayTitle \
+              --jq ".[] | select(.displayTitle | contains(\"$DISTINCT_ID\")) | .databaseId" \
+              | head -n1)
+            [ -n "$RUN_ID" ] && break
+          done
+
+          if [ -z "$RUN_ID" ]; then
+            echo "::error::Could not locate the dispatched run in $REPO"
+            exit 1
+          fi
+
+          RUN_URL="https://github.com/$REPO/actions/runs/$RUN_ID"
+          echo "run_id=$RUN_ID" >> "$GITHUB_OUTPUT"
+          echo "run_url=$RUN_URL" >> "$GITHUB_OUTPUT"
+          echo "::notice title=Nitrate docker build::$RUN_URL"
+
+      - name: Wait for nitrate docker build
+        run: |
+          gh run watch "${{ steps.dispatch.outputs.run_id }}" \
+            --repo "$REPO" \
+            --interval 30 \
+            --exit-status
+
+      - name: Report result
+        if: always() && steps.dispatch.outputs.run_id != ''
+        run: |
+          CONCLUSION=$(gh run view "${{ steps.dispatch.outputs.run_id }}" \
+            --repo "$REPO" --json conclusion --jq '.conclusion')
+          {
+            echo "### 🐳 Nitrate docker build"
+            echo ""
+            echo "- Result: \`${CONCLUSION:-in_progress}\`"
+            echo "- Run: ${{ steps.dispatch.outputs.run_url }}"
+          } >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/build-docker-devenv.yml b/.github/workflows/build-docker-devenv.yml
index 5faafba350..b0340d329b 100644
--- a/.github/workflows/build-docker-devenv.yml
+++ b/.github/workflows/build-docker-devenv.yml
@@ -20,12 +20,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Login to Docker Registry
+      - name: Login to Docker Registry (push destination)
         uses: docker/login-action@v4
         with:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
+      - name: Login to Docker Hardened Images registry (base image pull)
+        uses: docker/login-action@v4
+        with:
+          registry: dhi.io
+          username: ${{ secrets.PUB_DOCKER_USERNAME }}
+          password: ${{ secrets.PUB_DOCKER_PASSWORD }}
+
       - name: Build and push DevEnv Docker image
         uses: docker/build-push-action@v7
         env:
@@ -35,6 +42,8 @@ jobs:
           file: ./docker/devenv/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
+          provenance: mode=max
+          sbom: true
           tags: ${{ env.DOCKER_IMAGE }}:latest
           cache-from: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache
           cache-to: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache,mode=max
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index e2497f3093..0d03490194 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -20,55 +20,117 @@ concurrency:
   group: ${{ github.workflow }}-${{ inputs.gh_ref }}
   cancel-in-progress: true
 
+env:
+  ALL_IMAGES: backend frontend exporter storybook mcp
+  # All runner instances live on the same server, so the bundle is
+  # downloaded from S3 once and shared between build jobs through this
+  # host-local directory. Each build job falls back to S3 if the file is
+  # missing (e.g. if runners ever move to separate machines).
+  BUNDLE_CACHE: /var/tmp/penpot-bundle-cache
+
 jobs:
-  build-and-push:
-    name: Build and Push Penpot Docker Images
+  # ── 1. Resolve the build key and check the whole set at once ───────────
+  prepare:
+    name: Prepare
     runs-on: penpot-runner-02
+    timeout-minutes: 15
+    outputs:
+      gh_ref: ${{ steps.vars.outputs.gh_ref }}
+      bundle_version: ${{ steps.vars.outputs.bundle_version }}
+      build_key: ${{ steps.vars.outputs.build_key }}
+      exists: ${{ steps.check.outputs.exists }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.gh_ref }}
+
+      - name: Extract some useful variables
+        id: vars
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          GH_REF="${{ inputs.gh_ref || github.ref_name }}"
+          echo "gh_ref=$GH_REF" >> $GITHUB_OUTPUT
+
+          BUNDLE_VERSION=$(aws s3api head-object \
+            --bucket ${{ secrets.S3_BUCKET }} \
+            --key "penpot-$GH_REF.zip" \
+            --query 'Metadata."bundle-version"' \
+            --output text)
+          echo "bundle_version=$BUNDLE_VERSION" >> $GITHUB_OUTPUT
+
+          # Image content = bundle + docker build context, so the build key
+          # combines both.
+          CTX_HASH=$(git rev-parse "HEAD:docker/images" | cut -c1-12)
+          echo "build_key=${BUNDLE_VERSION}-${CTX_HASH}" >> $GITHUB_OUTPUT
+
+      # The image set is a single block, so a single set-level check is
+      # enough: `promote` drops a marker object in S3 only after every
+      # image was built AND every branch tag was moved. Marker present
+      # means there is nothing at all to do for this build key.
+      - name: Check if this image set is already built
+        id: check
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          if aws s3api head-object \
+               --bucket ${{ secrets.S3_BUCKET }} \
+               --key "markers/images-${{ steps.vars.outputs.build_key }}" \
+               > /dev/null 2>&1; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            {
+              echo "### ⏭️ Image set build skipped"
+              echo ""
+              echo "The whole set was already built and promoted for \`${{ steps.vars.outputs.build_key }}\`."
+            } >> "$GITHUB_STEP_SUMMARY"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+
+            # Stage the bundle in the host-local cache, once, for all the
+            # build jobs. Download to a temp name and mv for atomicity;
+            # prune stale bundles while at it.
+            mkdir -p "$BUNDLE_CACHE"
+            find "$BUNDLE_CACHE" -type f -mtime +1 -delete || true
+            ZIP="$BUNDLE_CACHE/penpot-${{ steps.vars.outputs.build_key }}.zip"
+            if [ ! -f "$ZIP" ]; then
+              aws s3 cp "s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip" "$ZIP.$$.tmp"
+              mv "$ZIP.$$.tmp" "$ZIP"
+            fi
+          fi
+
+  # ── 2. One build per image, in parallel, only when needed ──────────────
+  build:
+    name: Build ${{ matrix.image }}
+    runs-on: penpot-runner-02
+    timeout-minutes: 60
+    needs: prepare
+    if: needs.prepare.outputs.exists == 'false'
+    strategy:
+      fail-fast: true
+      # 4 runner slots are available for build jobs on this server; cap the
+      # matrix at 3 so short jobs (prepare and other workflows' checks)
+      # never queue behind long builds.
+      max-parallel: 3
+      matrix:
+        image: [backend, frontend, exporter, storybook, mcp]
 
     steps:
       - name: Set common environment variables
         run: |
           # Each job execution will use its own docker configuration.
-          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
+          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}-${{ matrix.image }}" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v6
         with:
-          fetch-depth: 0
           ref: ${{ inputs.gh_ref }}
 
-      - name: Extract some useful variables
-        id: vars
-        run: |
-          echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
-
-      - name: Download Penpot Bundles
-        id: bundles
-        env:
-          FILE_NAME: penpot-${{ steps.vars.outputs.gh_ref }}.zip
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
-        run: |
-          tmp=$(aws s3api head-object \
-            --bucket ${{ secrets.S3_BUCKET }} \
-            --key "$FILE_NAME" \
-            --query 'Metadata."bundle-version"' \
-            --output text)
-          echo "bundle_version=$tmp" >> $GITHUB_OUTPUT
-          pushd docker/images
-          aws s3 cp s3://${{ secrets.S3_BUCKET }}/$FILE_NAME .
-          unzip $FILE_NAME > /dev/null
-          mv penpot/backend bundle-backend
-          mv penpot/frontend bundle-frontend
-          mv penpot/exporter bundle-exporter
-          mv penpot/storybook bundle-storybook
-          mv penpot/mcp bundle-mcp
-          popd
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
       - name: Login to Docker Registry
         uses: docker/login-action@v4
         with:
@@ -85,103 +147,140 @@ jobs:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
+      # Images now build FROM Docker Hardened Images (dhi.io). DHI
+      # is free (Apache 2.0, no subscription), but pulling from it
+      # still requires an authenticated login -- a separate `docker
+      # login` against a different registry host, even though it
+      # reuses the same PUB_DOCKER_* credentials as the DockerHub
+      # login above.
+      - name: Login to Docker Hardened Images registry (base image pull)
+        uses: docker/login-action@v4
+        with:
+          registry: dhi.io
+          username: ${{ secrets.PUB_DOCKER_USERNAME }}
+          password: ${{ secrets.PUB_DOCKER_PASSWORD }}
+
+      # Bundle staged once by `prepare` on this host; the S3 fallback only
+      # triggers if the cache is unavailable (runners on another machine,
+      # cache pruned mid-run, ...).
+      - name: Prepare Penpot bundle
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          ZIP="$BUNDLE_CACHE/penpot-${{ needs.prepare.outputs.build_key }}.zip"
+          if [ ! -f "$ZIP" ]; then
+            echo "Bundle not found in host cache; falling back to S3."
+            mkdir -p "$BUNDLE_CACHE"
+            aws s3 cp "s3://${{ secrets.S3_BUCKET }}/penpot-${{ needs.prepare.outputs.gh_ref }}.zip" "$ZIP.$$.tmp"
+            mv "$ZIP.$$.tmp" "$ZIP"
+          fi
+          # Extract only the bundle this job needs.
+          pushd docker/images
+          unzip -q "$ZIP" "penpot/${{ matrix.image }}/*"
+          mv "penpot/${{ matrix.image }}" "bundle-${{ matrix.image }}"
+          popd
+
+      - name: Set up QEMU (stable)
+        uses: docker/setup-qemu-action@v4
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
       - name: Extract metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v6
         with:
-          images:
-            frontend
-            backend
-            exporter
-            storybook
-            mcp
+          images: ${{ matrix.image }}
           labels: |
-            bundle_version=${{ steps.bundles.outputs.bundle_version }}
+            bundle_version=${{ needs.prepare.outputs.bundle_version }}
 
-      - name: Build and push Backend Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'backend'
-          BUNDLE_PATH: './bundle-backend'
         with:
           context: ./docker/images/
-          file: ./docker/images/Dockerfile.backend
+          file: ./docker/images/Dockerfile.${{ matrix.image }}
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
+          provenance: mode=max
+          sbom: true
+          # Immutable tag only; branch tags are moved atomically for the
+          # whole image set by the `promote` job.
+          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:build-${{ needs.prepare.outputs.build_key }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:buildcache,mode=max
 
-      - name: Build and push Frontend Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'frontend'
-          BUNDLE_PATH: './bundle-frontend'
+  # ── 3. Move the branch tags of ALL images together ─────────────────────
+  # Runs only when every build succeeded (default `needs` semantics); if
+  # the set was already complete, `build` is skipped and so is this job —
+  # the S3 marker guarantees the branch tags were already moved.
+  promote:
+    name: Promote image set
+    runs-on: penpot-runner-02
+    timeout-minutes: 10
+    needs: [prepare, build]
+
+    steps:
+      - name: Set common environment variables
+        run: |
+          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to Docker Registry
+        uses: docker/login-action@v4
         with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.frontend
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push Exporter Docker image
-        uses: docker/build-push-action@v7
+      - name: Point branch tags to the new build key
+        run: |
+          set -e
+          for image in $ALL_IMAGES; do
+            docker buildx imagetools create \
+              -t "${{ secrets.DOCKER_REGISTRY }}/$image:${{ needs.prepare.outputs.gh_ref }}" \
+              "${{ secrets.DOCKER_REGISTRY }}/$image:build-${{ needs.prepare.outputs.build_key }}"
+          done
+
+      # The marker is written LAST: its presence certifies that all five
+      # images exist and all branch tags point to this build key.
+      - name: Write set-completed marker
         env:
-          DOCKER_IMAGE: 'exporter'
-          BUNDLE_PATH: './bundle-exporter'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.exporter
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          echo "${{ github.run_id }}" | aws s3 cp - \
+            "s3://${{ secrets.S3_BUCKET }}/markers/images-${{ needs.prepare.outputs.build_key }}"
+          {
+            echo "### ✅ Image set promoted"
+            echo ""
+            echo "All \`:${{ needs.prepare.outputs.gh_ref }}\` tags now point to \`build-${{ needs.prepare.outputs.build_key }}\`."
+          } >> "$GITHUB_STEP_SUMMARY"
 
-      - name: Build and push Storybook Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'storybook'
-          BUNDLE_PATH: './bundle-storybook'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.storybook
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
-
-      - name: Build and push MCP Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'mcp'
-          BUNDLE_PATH: './bundle-mcp'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.mcp
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+  # ── 4. Single failure notification for the whole workflow ─────────────
+  notify:
+    name: Notify failure
+    runs-on: penpot-runner-02
+    timeout-minutes: 5
+    needs: [prepare, build, promote]
+    if: failure()
 
+    steps:
       - name: Notify Mattermost
-        if: failure()
         uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd
           TEXT: |
-            ❌ 🐳 *[PENPOT] Error building penpot docker images.*
-            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
-            📦 Bundle: `${{ steps.bundles.outputs.bundle_version }}`
+            ❌ 🐳 *[PENPOT] Error building/promoting the penpot docker image set.*
+            📄 Triggered from ref: `${{ needs.prepare.outputs.gh_ref || inputs.gh_ref }}`
+            📦 Bundle: `${{ needs.prepare.outputs.bundle_version || 'n/a' }}`
             🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
             @infra
diff --git a/.github/workflows/build-staging.yml b/.github/workflows/build-staging.yml
index 572d8c2a95..ec3003a4b2 100644
--- a/.github/workflows/build-staging.yml
+++ b/.github/workflows/build-staging.yml
@@ -11,8 +11,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "staging"
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -20,3 +18,9 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "staging"
+
+  build-docker-admin-console:
+    uses: ./.github/workflows/build-docker-admin-console.yml
+    secrets: inherit
+    with:
+      gh_ref: "staging"
diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml
index c47d19570c..18f81d10f1 100644
--- a/.github/workflows/build-tag.yml
+++ b/.github/workflows/build-tag.yml
@@ -12,8 +12,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: ${{ github.ref_name }}
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -22,11 +20,18 @@ jobs:
     with:
       gh_ref: ${{ github.ref_name }}
 
+  build-docker-admin-console:
+    uses: ./.github/workflows/build-docker-admin-console.yml
+    secrets: inherit
+    with:
+      gh_ref: ${{ github.ref_name }}
+
   notify:
     name: Notifications
     runs-on: ubuntu-24.04
-    needs: build-docker
-
+    needs:
+      - build-docker
+      - build-docker-admin-console
     steps:
       - name: Notify Mattermost
         uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
@@ -40,7 +45,9 @@ jobs:
 
   publish-final-tag:
     if: ${{ !contains(github.ref_name, '-RC') && !contains(github.ref_name, '-alpha') && !contains(github.ref_name, '-beta')  && contains(github.ref_name, '.') }}
-    needs: build-docker
+    needs:
+      - build-docker
+      - build-docker-admin-console
     uses: ./.github/workflows/release.yml
     secrets: inherit
     with:
diff --git a/.github/workflows/tests-composable-suite.yml b/.github/workflows/tests-composable-suite.yml
new file mode 100644
index 0000000000..1ad48c0edf
--- /dev/null
+++ b/.github/workflows/tests-composable-suite.yml
@@ -0,0 +1,69 @@
+name: "CI: Composable Test Suite"
+
+# Runs the composable component test suite (it exercises component semantics
+# through the real Plugin API against the full frontend, so it needs the
+# frontend bundle + the plugin runtime, but no backend): the driver serves the
+# prebuilt frontend bundle and intercepts every backend RPC with Playwright
+# fixtures. See plugins/apps/composable-test-suite/README.md ("Running in CI").
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  pull_request:
+    paths:
+      - 'plugins/**'
+      - 'frontend/**'
+      - 'common/**'
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+
+  push:
+    branches:
+      - develop
+      - staging
+    paths:
+      - 'plugins/**'
+      - 'frontend/**'
+      - 'common/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  composable-test-suite:
+    if: ${{ !github.event.pull_request.draft }}
+    name: "Run composable test suite (mocked backend)"
+    runs-on: penpot-runner-02
+    container:
+      image: penpotapp/devenv:latest
+      volumes:
+        - /var/cache/github-runner/m2:/root/.m2
+        - /var/cache/github-runner/gitlib:/root/.gitlibs
+
+    steps:
+      - uses: actions/checkout@v6
+
+      # The driver serves the prebuilt bundle from frontend/resources/public.
+      - name: Build frontend bundle
+        working-directory: ./frontend
+        run: ./scripts/build
+
+      - name: Install deps
+        working-directory: ./plugins
+        run: |
+          corepack enable;
+          corepack install;
+          pnpm install;
+
+      - name: Install Playwright Chromium
+        working-directory: ./plugins
+        run: pnpm --filter composable-test-suite exec playwright install --with-deps chromium
+
+      - name: Run composable test suite (mocked)
+        working-directory: ./plugins
+        run: pnpm --filter composable-test-suite run test:ci
diff --git a/.gitignore b/.gitignore
index 2fbd8f5971..81e6733053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,8 @@ opencode.json
 /docker/images/bundle*
 /exporter/target
 /exporter/.shadow-cljs
+/exporter/resources/wasm/
+/exporter/src/app/wasm/shared.js
 /frontend/.storybook/preview-body.html
 /frontend/.storybook/preview-head.html
 /frontend/playwright-report/
@@ -89,6 +91,7 @@ opencode.json
 /blob-report/
 /playwright/.cache/
 /render-wasm/target/
+/media-processor/dist/
 /**/node_modules
 /**/.yarn/*
 /.pnpm-store
@@ -102,6 +105,7 @@ opencode.json
 /.opencode/plans
 /.opencode/reports
 /.opencode/prompts
+/.ci-logs
 /.codex/
 /tools/__pycache__
 /performance/results/
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
index 5bcf9c6e6a..87d8620cc6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v24.18.0
+v24.18.1
diff --git a/.opencode/agents/commiter.md b/.opencode/agents/commiter.md
deleted file mode 100644
index a5e128e4d1..0000000000
--- a/.opencode/agents/commiter.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-name: commiter
-description: Git commit assistant
-mode: subagent
-permission:
-  read: allow
-  glob: allow
-  grep: allow
-  edit: deny
-  webfetch: deny
-  websearch: deny
-  task: deny
-  skill: deny
-  lsp: deny
-  todowrite: deny
-  question: deny
-  external_directory: deny
-  bash: allow
----
-
-## Role
-
-You are the Penpot commit assistant. You produce git commits that follow the
-repository's commit conventions. You do not implement features, review code, or
-push branches — you commit.
-
-## Required Reading
-
-Before drafting any commit, **read `.serena/memories/workflow/creating-commits.md`
-end-to-end**. It is the authoritative source for the commit message format, the
-emoji menu, subject/body limits, and the `AI-assisted-by` trailer. Follow it
-exactly — do not improvise the format and do not restate its contents here.
-
-## Pre-commit Workflow
-
-1. **Stage the files** specified by the calling agent. Do not ask for
-   confirmation — the calling agent knows exactly which files to commit.
-2. Run `git diff --staged` to review the content. If you see secrets (API
-   keys, tokens, passwords, private keys, `.env` values), debug prints, or
-   anything that does not match the stated intent, STOP and tell the user
-   before committing.
-3. Following the format in the doc, draft the message and run
-   `git commit -m "<subject>" -m "<body>"` (or `git commit -F -` if the body has
-   unusual characters). The `AI-assisted-by` trailer value is provided by the
-   calling agent — use it verbatim.
-
-## Constraints
-
-- Do not push. Pushing is a separate workflow handled by the user.
-- Do not run `git reset`, `git checkout`, `git restore`, `git clean`, or `rm` — these are destructive operations.
-- Do not pass `--author`. Author identity comes from the local git config.
-- Do not amend a commit you did not create in this session, unless the user explicitly asks.
-- Do not bypass pre-commit hooks (`--no-verify`) unless the user explicitly asks.
-- Do not add untracked files that were not created in this session.
-- Do not ask questions. The calling agent provides all necessary information. If something is unclear, proceed with what you know and note any assumptions in your response.
diff --git a/.opencode/commands/implement-plan.md b/.opencode/commands/implement-plan.md
index f6cb42f6b8..20eedb3fe5 100644
--- a/.opencode/commands/implement-plan.md
+++ b/.opencode/commands/implement-plan.md
@@ -1,5 +1,5 @@
 ---
-description: Execute a ready plan end-to-end — create a GitHub issue, branch issue-NNNN, implement the plan, then commit via the commiter subagent
+description: Execute a ready plan end-to-end — create a GitHub issue, branch issue-NNNN, implement the plan, then commit via the create-commit skill
 agent: build
 ---
 
@@ -32,12 +32,11 @@ Implement the prepared plan from the session context. Work methodically, keeping
 changes focused on what the issue requires. Do not commit — the commit happens in
 step 4.
 
-## 4. Commit with the commiter subagent
+## 4. Commit with the create-commit skill
 
-After the implementation is complete, delegate the commit to the **`commiter`**
-subagent. Give it a brief summary of what was implemented and why, the issue
-reference (`issue-NNNN`), and the model name you are running as so it sets the
-`AI-assisted-by` trailer correctly. The subagent owns the commit format and
-conventions.
+After the implementation is complete, load the **`create-commit`** skill and
+follow its workflow to commit the changes. Provide a brief summary of what was
+implemented and why, the issue reference (`issue-NNNN`), and the model name you
+are running as so the `AI-assisted-by` trailer is set correctly.
 
 Do not push. Pushing is handled separately by the user.
diff --git a/.opencode/commands/review.md b/.opencode/commands/review.md
index 7736620e89..3e6f59cee5 100644
--- a/.opencode/commands/review.md
+++ b/.opencode/commands/review.md
@@ -1,21 +1,79 @@
----
-description: Review a commit (defaults to the last commit) with the code-review-and-quality skill across all five axes
-agent: plan
-subtask: true
----
+Act as a senior software engineer and perform a thorough code review.
 
-You are performing a code review of a git commit. You MUST conduct it using the **`code-review-and-quality`** skill (the five-axis review: correctness, readability, architecture, security, performance).
+## Instructions
 
-The user may specify a commit or revision range as an argument ($ARGUMENTS). If no argument is given, default to reviewing the **last commit** (`HEAD`, i.e. the changes introduced by `HEAD` vs its parent).
+1. Load the **`code-review-and-quality`** skill — it defines the five axes, core principles (DRY, KISS, YAGNI), severity taxonomy, and output format.
+2. Determine the diff or code to review from the provided context.
+3. **Skip generated files, lockfile-only changes, and unrelated modifications** unless they introduce security risks.
+4. Read the diff and the surrounding context for each changed file.
+5. Review across all five axes: correctness, readability, architecture, security, performance.
+6. Produce the review using this structure:
+   - **Summary**: One-paragraph overview of the change and its impact
+   - **Critical/High Findings**: Blockers that must be fixed (with file:line, severity, description, and proposed fix)
+   - **Other Findings**: Medium/Low issues and suggestions
+   - **Testing Recommendations**: Missing test coverage or test quality issues
+   - **Positive Observations**: What was done well (brief, specific)
+   - **Verdict**: Approve / Request Changes / Needs Discussion
+7. For each finding:
+   - State the severity (Critical / High / Medium / Low / Suggestion)
+   - Identify the file and line
+   - Describe failure circumstances
+   - **For Critical/High**: Provide a concrete fix with a code snippet showing the corrected code
+   - **For Medium/Low**: Describe the fix clearly; code snippet optional
+    - If multiple approaches exist, briefly note trade-offs
+8. **Perform a second review pass if the change is complex:**
+   - **Complex indicators**: Critical/High findings, multiple files (>5), architectural changes, security-sensitive code, >300 lines changed
+   - **Skip for simple changes**: Typo fixes, formatting, small bug fixes (<50 lines), single-file changes with no findings
+   - Second pass checks:
+     - Validate severity assignments: Are Critical/High findings truly blockers?
+     - Catch missed issues: Edge cases, error paths, test gaps overlooked in first pass
+     - Remove false positives: Discard findings that aren't real issues
+     - Verify fixes: Are the proposed solutions actually correct and complete?
 
-Workflow:
+## Strong Rules
 
-1. Determine the target to review:
-   - If the user provided a revision/range in $ARGUMENTS, use it.
-   - Otherwise, default to the last commit: review `HEAD` (the diff of `HEAD` against `HEAD~1`).
-2. Inspect the change with `git show <target>` / `git diff <target>~1 <target>` and `git log -1 --stat <target>` to understand the intent and the files touched.
-3. Invoke the **`code-review-and-quality`** skill and review the commit across all five axes. Categorize every finding as Critical / Required / Optional / Nit / FYI, and lead with correctness and security.
-4. For each finding, state the axis it belongs to, the severity, and a concrete suggested fix (propose the structural remedy, not just the problem).
-5. Conclude with a clear verdict: **Approve** (ready to merge) or **Request changes** (issues that must be addressed), and summarize the highest-leverage items.
+1. Do not invent problems. Every finding must be real and actionable.
+2. Do not modify any code and do not create a commit — this command only reviews.
+3. Be specific and constructive. "This could be better" is not helpful — explain why and how.
+4. Prioritize by impact. One structural issue outweighs ten nits.
+5. If tests are missing for new functionality, flag it as High severity.
 
-Do not modify any code and do not create a commit — this command only reviews.
+## Context
+
+$ARGUMENTS
+
+## Expected Format
+
+```
+## Review Summary
+[1-2 sentences on what the change does and overall assessment]
+
+## Critical/High Findings
+### [Severity] file.ts:123
+**Issue**: [Description of the problem]
+**Impact**: [What could go wrong]
+**Fix**:
+```[language]
+// Current code
+[problematic code]
+
+// Fixed code
+[corrected code]
+```
+[Optional: note trade-offs if multiple approaches exist]
+
+## Other Findings
+### [Severity] file.ts:456
+**Issue**: [Description]
+**Fix**: [Clear description; code snippet optional]
+
+## Testing Recommendations
+[List specific test cases that should be added]
+
+## Positive Observations
+[2-3 specific things done well]
+
+## Verdict
+[Approve / Request Changes / Needs Discussion]
+[If Request Changes: list the must-fix items]
+```
diff --git a/.opencode/skills/code-review-and-quality/SKILL.md b/.opencode/skills/code-review-and-quality/SKILL.md
index 21b0b71771..a0f75e7f99 100644
--- a/.opencode/skills/code-review-and-quality/SKILL.md
+++ b/.opencode/skills/code-review-and-quality/SKILL.md
@@ -19,9 +19,18 @@ Multi-dimensional code review with quality gates. Every change gets reviewed bef
 - When refactoring existing code
 - After any bug fix (review both the fix and the regression test)
 
+## Core Principles
+
+These principles underpin every axis. When in doubt, default to them.
+
+- **DRY (Don't Repeat Yourself):** Every piece of knowledge has one authoritative representation. If the same logic appears in two places, extract it into a shared helper, model, or type. Reviewers: flag duplicated logic as a required change — it's not "just similar," it's drift that will diverge.
+- **KISS (Keep It Simple, Stupid):** The simplest solution that works is the best solution. Complexity must earn its place. Reviewers: if you need more than one sentence to explain what a piece of code does, it's too complex — push for simplification before merge.
+- **YAGNI (You Aren't Gonna Need It):** Don't add abstractions, hooks, or generalizations for hypothetical future use cases. Generalize on the third occurrence, not the first. Reviewers: delete speculative generality.
+- **Don't invent problems:** Do not manufacture issues to produce more feedback. Every finding must be a real risk, a real readability barrier, or a real architectural concern — not a hypothetical or a stylistic preference disguised as a problem.
+
 ## The Five-Axis Review
 
-Every review evaluates code across these dimensions:
+Every review evaluates code across these dimensions.
 
 ### 1. Correctness
 
@@ -39,14 +48,13 @@ Can another engineer (or agent) understand this code without the author explaini
 
 - Are names descriptive and consistent with project conventions? (No `temp`, `data`, `result` without context)
 - Is the control flow straightforward (avoid nested ternaries, deep callbacks)?
-- Is the code organized logically (related code grouped, clear module boundaries)?
 - Are there any "clever" tricks that should be simplified?
-- **Could this be done in fewer lines?** (1000 lines where 100 suffice is a failure)
-- **Are abstractions earning their complexity?** (Don't generalize until the third use case)
-- Would comments help clarify non-obvious intent? (But don't comment obvious code.)
-- Are there dead code artifacts: no-op variables (`_unused`), backwards-compat shims, or `// removed` comments?
-- **Is a new conditional bolted onto an unrelated flow?** That's a design smell, not a nit — push the logic into its own helper, state, or policy instead of tangling an existing path.
-- **Do repeated conditionals on the same shape appear?** They signal a missing model or dispatcher. A "temporary" branch is usually permanent debt.
+- **KISS check:** Is this the simplest approach that solves the problem? A 20-line straightforward function beats a 5-line clever one that requires a comment to explain.
+- Could this be done in fewer lines? (1000 lines where 100 suffice is a failure)
+- Are abstractions earning their complexity? (Don't generalize until the third use case)
+- Is a new conditional bolted onto an unrelated flow? Push the logic into its own helper, state, or policy.
+- Do repeated conditionals on the same shape appear? They signal a missing model or dispatcher.
+- Are there dead code artifacts: no-op variables, backwards-compat shims, or `// removed` comments?
 
 ### 3. Architecture
 
@@ -54,16 +62,17 @@ Does the change fit the system's design?
 
 - Does it follow existing patterns or introduce a new one? If new, is it justified?
 - Does it maintain clean module boundaries?
-- Is there code duplication that should be shared?
+- **DRY check:** Is there existing code that does the same thing? Reuse the canonical helper instead of writing a near-duplicate. If two branches do nearly the same thing, collapse them.
 - Are dependencies flowing in the right direction (no circular dependencies)?
 - Is the abstraction level appropriate (not over-engineered, not too coupled)?
-- **Does this refactor reduce complexity or just relocate it?** Count the concepts a reader must hold to follow the change. If a "cleaner" version leaves that count unchanged, it isn't cleaner — prefer the restructuring that makes whole branches, modes, or layers disappear over one that re-centralizes the same logic. Prefer deleting an abstraction to polishing it.
-- **Is feature-specific logic leaking into a shared or general-purpose module?** Keep logic in its owning layer, reuse the existing canonical helper instead of a near-duplicate, and don't normalize architectural drift.
-- **Are type boundaries explicit?** Question gratuitous `any`/`unknown`/optional/casts and silent fallbacks that paper over an unclear invariant — making the boundary explicit often makes the surrounding control flow simpler.
+- Does this refactor reduce complexity or just relocate it? Count the concepts a reader must hold. Prefer the restructuring that makes whole branches disappear over one that re-centralizes the same logic. Prefer deleting an abstraction to polishing it.
+- Is feature-specific logic leaking into a shared or general-purpose module?
+- Are type boundaries explicit? Question gratuitous `any`/`unknown`/optional/casts and silent fallbacks.
+- **Structural remedies:** When you flag a problem, propose the move — not just the problem. Replace conditionals with dispatchers, collapse duplicate branches, separate orchestration from business logic, extract helpers, split large files. Prefer the remedy that removes moving pieces over one that spreads the same complexity around.
 
 ### 4. Security
 
-For detailed security guidance, see `security-and-hardening`. Does the change introduce vulnerabilities?
+For detailed security guidance, see `security-and-hardening`.
 
 - Is user input validated and sanitized?
 - Are secrets kept out of code, logs, and version control?
@@ -72,12 +81,9 @@ For detailed security guidance, see `security-and-hardening`. Does the change in
 - Are outputs encoded to prevent XSS?
 - Are dependencies from trusted sources with no known vulnerabilities?
 - Is data from external sources (APIs, logs, user content, config files) treated as untrusted?
-- Are external data flows validated at system boundaries before use in logic or rendering?
 
 ### 5. Performance
 
-Does the change introduce performance problems?
-
 - Any N+1 query patterns?
 - Any unbounded loops or unconstrained data fetching?
 - Any synchronous operations that should be async?
@@ -85,24 +91,66 @@ Does the change introduce performance problems?
 - Any missing pagination on list endpoints?
 - Any large objects created in hot paths?
 
-## Structural Remedies
+## Review Process
 
-When you flag a structural problem, propose the move — not just the problem. A review that only says "this is complex" leaves the author guessing. Reach for a named restructuring:
+1. **Understand the intent** — What is this change trying to accomplish? What spec or task does it implement?
+2. **Review tests first** — Tests reveal intent and coverage. Do they test behavior, not implementation details? Are edge cases covered?
+3. **Review the implementation** — Walk through each file with the five axes in mind.
+4. **Categorize findings** — Label every comment with its severity:
 
-- **Replace a chain of conditionals** with a typed model or an explicit dispatcher.
-- **Collapse duplicate branches** into a single clearer flow.
-- **Separate orchestration from business logic** so each reads on its own.
-- **Move feature-specific logic** out of a shared module into the package that owns the concept.
-- **Reuse the canonical helper** instead of a bespoke near-duplicate.
-- **Make a type boundary explicit** so downstream branching disappears.
-- **Delete a pass-through wrapper** that adds indirection without clarifying the API.
-- **Extract a helper, or split a large file** into focused modules.
+| Prefix | Meaning | Author Action |
+|--------|---------|---------------|
+| **Critical:** | Blocks merge | Security vulnerability, data loss, broken functionality |
+| **High:** | Required change | Must address before merge |
+| **Medium:** | Should fix | Strongly recommended, not a blocker |
+| **Low:** | Minor, optional | Author may ignore — formatting, style preferences |
+| **Suggestion:** | Worth considering | Not required, but improves the code |
 
-Prefer the remedy that removes moving pieces over one that spreads the same complexity around.
+For each finding, describe the circumstances under which it could fail: specific inputs, load conditions, timing, or user actions that trigger the problem. "This crashes when input is null" is actionable; "this might crash" is not.
+
+Lead with what matters: correctness and security first, then structural issues, then everything else. A few high-conviction comments beat a long list.
+
+5. **Verify the verification** — What tests were run? Did the build pass? Was the change tested manually? Screenshots for UI changes?
+
+## Review Output
+
+Structure every review using this format:
+
+### Summary
+
+Briefly explain what the code does and give an overall assessment.
+
+### Critical and High-Priority Issues
+
+List problems that could cause security incidents, data loss, crashes, incorrect behavior, or major performance degradation. For each: state the severity, identify the file/function/code section, explain why it's a problem, describe failure circumstances, and provide a concrete improvement with corrected code when useful.
+
+### Other Findings
+
+List medium- and low-priority issues, including maintainability and design concerns.
+
+### Suggested Refactoring
+
+Provide focused code changes or revised snippets. Preserve existing behavior unless a behavior change is explicitly justified.
+
+### Testing Recommendations
+
+Identify missing tests and describe specific test cases, including edge cases and failure scenarios.
+
+### Positive Observations
+
+Mention implementation choices that are clear, safe, efficient, or well designed. This is not fluff — it reinforces good patterns and tells the author what to keep doing.
+
+### Final Verdict
+
+Choose one:
+
+- **Approve** — Ready to merge
+- **Approve with minor changes** — Good to merge after addressing low/medium issues
+- **Request changes** — Critical or high issues must be resolved before merge
 
 ## Change Sizing
 
-Small, focused changes are easier to review, faster to merge, and safer to deploy. Target these sizes:
+Small, focused changes are easier to review, faster to merge, and safer to deploy.
 
 ```
 ~100 lines changed   → Good. Reviewable in one sitting.
@@ -110,11 +158,9 @@ Small, focused changes are easier to review, faster to merge, and safer to deplo
 ~1000 lines changed  → Too large. Split it.
 ```
 
-**Watch file size, not just diff size.** A small diff can still push a file past a healthy boundary — around 1000 *total* lines in a single file (distinct from the ~1000 *changed*-lines threshold above) is a common inspection signal, not a hard cap. When a change materially grows an already-large file, ask whether to extract helpers, subcomponents, or modules *first*, before piling more on. Decompose, then add.
+**Watch file size, not just diff size.** Around 1000 *total* lines in a single file is a common inspection signal. When a change materially grows an already-large file, decompose first.
 
-**What counts as "one change":** A single self-contained modification that addresses one thing, includes related tests, and keeps the system functional after submission. One part of a feature — not the whole feature.
-
-**Splitting strategies when a change is too large:**
+**Splitting strategies:**
 
 | Strategy | How | When |
 |----------|-----|------|
@@ -123,164 +169,17 @@ Small, focused changes are easier to review, faster to merge, and safer to deplo
 | **Horizontal** | Create shared code/stubs first, then consumers | Layered architecture |
 | **Vertical** | Break into smaller full-stack slices of the feature | Feature work |
 
-**When large changes are acceptable:** Complete file deletions and automated refactoring where the reviewer only needs to verify intent, not every line.
-
-**Separate refactoring from feature work.** A change that refactors existing code and adds new behavior is two changes — submit them separately. Small cleanups (variable renaming) can be included at reviewer discretion.
+**Separate refactoring from feature work.** A change that refactors and adds new behavior is two changes — submit them separately.
 
 ## Change Descriptions
 
-Every change needs a description that stands alone in version control history.
+- **First line:** Short, imperative, standalone. "Delete the FizzBuzz RPC" not "Deleting the FizzBuzz RPC."
+- **Body:** What is changing and why. Include context and reasoning not visible in the code itself.
+- **Anti-patterns:** "Fix bug," "Fix build," "Add patch," "Phase 1."
 
-**First line:** Short, imperative, standalone. "Delete the FizzBuzz RPC" not "Deleting the FizzBuzz RPC." Must be informative enough that someone searching history can understand the change without reading the diff.
+## Dependencies
 
-**Body:** What is changing and why. Include context, decisions, and reasoning not visible in the code itself. Link to bug numbers, benchmark results, or design docs where relevant. Acknowledge approach shortcomings when they exist.
-
-**Anti-patterns:** "Fix bug," "Fix build," "Add patch," "Moving code from A to B," "Phase 1," "Add convenience functions."
-
-## Review Process
-
-### Step 1: Understand the Context
-
-Before looking at code, understand the intent:
-
-```
-- What is this change trying to accomplish?
-- What spec or task does it implement?
-- What is the expected behavior change?
-```
-
-### Step 2: Review the Tests First
-
-Tests reveal intent and coverage:
-
-```
-- Do tests exist for the change?
-- Do they test behavior (not implementation details)?
-- Are edge cases covered?
-- Do tests have descriptive names?
-- Would the tests catch a regression if the code changed?
-```
-
-### Step 3: Review the Implementation
-
-Walk through the code with the five axes in mind:
-
-```
-For each file changed:
-1. Correctness: Does this code do what the test says it should?
-2. Readability: Can I understand this without help?
-3. Architecture: Does this fit the system?
-4. Security: Any vulnerabilities?
-5. Performance: Any bottlenecks?
-```
-
-### Step 4: Categorize Findings
-
-Label every comment with its severity so the author knows what's required vs optional:
-
-| Prefix | Meaning | Author Action |
-|--------|---------|---------------|
-| *(no prefix)* | Required change | Must address before merge |
-| **Critical:** | Blocks merge | Security vulnerability, data loss, broken functionality |
-| **Nit:** | Minor, optional | Author may ignore — formatting, style preferences |
-| **Optional:** / **Consider:** | Suggestion | Worth considering but not required |
-| **FYI** | Informational only | No action needed — context for future reference |
-
-This prevents authors from treating all feedback as mandatory and wasting time on optional suggestions.
-
-**Lead with what matters.** Order findings by leverage: correctness and security first, then structural regressions and missed simplifications, then everything else. Don't bury a real issue under cosmetic nits — a few high-conviction comments beat a long list. If you have one structural problem and ten nits, the structural problem *is* the review.
-
-### Step 5: Verify the Verification
-
-Check the author's verification story:
-
-```
-- What tests were run?
-- Did the build pass?
-- Was the change tested manually?
-- Are there screenshots for UI changes?
-- Is there a before/after comparison?
-```
-
-## Multi-Model Review Pattern
-
-Use different models for different review perspectives:
-
-```
-Model A writes the code
-    │
-    ▼
-Model B reviews for correctness and architecture
-    │
-    ▼
-Model A addresses the feedback
-    │
-    ▼
-Human makes the final call
-```
-
-This catches issues that a single model might miss — different models have different blind spots.
-
-**Example prompt for a review agent:**
-```
-Review this code change for correctness, security, and adherence to
-our project conventions. The spec says [X]. The change should [Y].
-Flag any issues as Critical, Required, Optional, or Nit.
-```
-
-## Dead Code Hygiene
-
-After any refactoring or implementation change, check for orphaned code:
-
-1. Identify code that is now unreachable or unused
-2. List it explicitly
-3. **Ask before deleting:** "Should I remove these now-unused elements: [list]?"
-
-Don't leave dead code lying around — it confuses future readers and agents. But don't silently delete things you're not sure about. When in doubt, ask.
-
-```
-DEAD CODE IDENTIFIED:
-- formatLegacyDate() in src/utils/date.ts — replaced by formatDate()
-- OldTaskCard component in src/components/ — replaced by TaskCard
-- LEGACY_API_URL constant in src/config.ts — no remaining references
-→ Safe to remove these?
-```
-
-## Review Speed
-
-Slow reviews block entire teams. The cost of context-switching to review is less than the waiting cost imposed on others.
-
-- **Respond within one business day** — this is the maximum, not the target
-- **Ideal cadence:** Respond shortly after a review request arrives, unless deep in focused coding. A typical change should complete multiple review rounds in a single day
-- **Prioritize fast individual responses** over quick final approval. Quick feedback reduces frustration even if multiple rounds are needed
-- **Large changes:** Ask the author to split them rather than reviewing one massive changeset
-
-## Handling Disagreements
-
-When resolving review disputes, apply this hierarchy:
-
-1. **Technical facts and data** override opinions and preferences
-2. **Style guides** are the absolute authority on style matters
-3. **Software design** must be evaluated on engineering principles, not personal preference
-4. **Codebase consistency** is acceptable if it doesn't degrade overall health
-
-**Don't accept "I'll clean it up later."** Experience shows deferred cleanup rarely happens. Require cleanup before submission unless it's a genuine emergency. If surrounding issues can't be addressed in this change, require filing a bug with self-assignment.
-
-## Honesty in Review
-
-When reviewing code — whether written by you, another agent, or a human:
-
-- **Don't rubber-stamp.** "LGTM" without evidence of review helps no one.
-- **Don't soften real issues.** "This might be a minor concern" when it's a bug that will hit production is dishonest.
-- **Quantify problems when possible.** "This N+1 query will add ~50ms per item in the list" is better than "this could be slow."
-- **Push back on approaches with clear problems.** Sycophancy is a failure mode in reviews. If the implementation has issues, say so directly and propose alternatives.
-- **Accept override gracefully.** If the author has full context and disagrees, defer to their judgment. Comment on code, not people — reframe personal critiques to focus on the code itself.
-
-## Dependency Discipline
-
-Part of code review is dependency review:
-
-**Before adding any dependency:**
+Before adding any dependency:
 
 1. Does the existing stack solve this? (Often it does.)
 2. How large is the dependency? (Check bundle impact.)
@@ -290,67 +189,14 @@ Part of code review is dependency review:
 
 **Rule:** Prefer standard library and existing utilities over new dependencies. Every dependency is a liability.
 
-**Upgrading an existing dependency** is a code change like any other, and the riskiest upgrades are the ones merged in bulk with a message like "bump deps." Review them with the same discipline:
+**Upgrading dependencies:**
 
-1. **Read the changelog, not just the version number.** Semver is a promise the maintainer may not have kept — a "patch" can carry a behavioral change. For a major bump, read the migration notes and find what breaks.
-2. **One dependency per change.** Upgrade and merge them individually (or in small related groups). When a bulk bump breaks the build, you've lost which package did it; a single-package change makes the cause obvious and the revert clean.
-3. **Let the tests decide.** The upgrade is verified by a green suite before *and* after, not by "it installed." If coverage around the dependency's behavior is thin, that gap is the real finding — add a test first.
-4. **Mind the transitive graph.** Most installed packages are ones nobody chose directly. Review the lockfile diff, not just `package.json`; a single direct bump can pull in dozens of indirect changes.
-5. **Keep the lockfile honest.** Commit it, review its diff, and never hand-edit it. The lockfile is the thing that actually pins what ships.
+- Read the changelog, not just the version number. Semver is a promise the maintainer may not have kept.
+- One dependency per change. When a bulk bump breaks the build, you've lost which package did it.
+- Let the tests decide — a green suite before *and* after, not just "it installed."
+- Review the lockfile diff, not just `package.json`. Commit it and never hand-edit it.
 
-For triaging `npm audit` findings and supply-chain risk (typosquatting, compromised maintainers), follow the `security-and-hardening` skill — this section covers the upgrade *workflow*, that one covers the security verdict.
-
-## The Review Checklist
-
-```markdown
-## Review: [PR/Change title]
-
-### Context
-- [ ] I understand what this change does and why
-
-### Correctness
-- [ ] Change matches spec/task requirements
-- [ ] Edge cases handled
-- [ ] Error paths handled
-- [ ] Tests cover the change adequately
-
-### Readability
-- [ ] Names are clear and consistent
-- [ ] Logic is straightforward
-- [ ] No unnecessary complexity
-
-### Architecture
-- [ ] Follows existing patterns
-- [ ] No unnecessary coupling or dependencies
-- [ ] Appropriate abstraction level
-- [ ] Refactors reduce complexity rather than relocate it
-- [ ] No feature logic in shared modules; file stays within a healthy size
-
-### Security
-- [ ] No secrets in code
-- [ ] Input validated at boundaries
-- [ ] No injection vulnerabilities
-- [ ] Auth checks in place
-- [ ] External data sources treated as untrusted
-
-### Performance
-- [ ] No N+1 patterns
-- [ ] No unbounded operations
-- [ ] Pagination on list endpoints
-
-### Verification
-- [ ] Tests pass
-- [ ] Build succeeds
-- [ ] Manual verification done (if applicable)
-
-### Verdict
-- [ ] **Approve** — Ready to merge
-- [ ] **Request changes** — Issues must be addressed
-```
-
-## See Also
-
-- For detailed security review guidance, see `security-and-hardening`
+For supply-chain risk triage, follow the `security-and-hardening` skill.
 
 ## Common Rationalizations
 
@@ -358,13 +204,16 @@ For triaging `npm audit` findings and supply-chain risk (typosquatting, compromi
 |---|---|
 | "It works, that's good enough" | Working code that's unreadable, insecure, or architecturally wrong creates debt that compounds. |
 | "I wrote it, so I know it's correct" | Authors are blind to their own assumptions. Every change benefits from another set of eyes. |
-| "We'll clean it up later" | Later never comes. The review is the quality gate — use it. Require cleanup before merge, not after. |
+| "We'll clean it up later" | Later never comes. The review is the quality gate — use it. |
 | "AI-generated code is probably fine" | AI code needs more scrutiny, not less. It's confident and plausible, even when wrong. |
-| "The tests pass, so it's good" | Tests are necessary but not sufficient. They don't catch architecture problems, security issues, or readability concerns. |
-| "The refactor makes it cleaner" | Relocating complexity isn't reducing it. If the reader still holds the same number of concepts, the structure didn't improve — look for the version where branches disappear. |
-| "It's only a small addition to this file" | Small diffs still push files past a healthy size and bolt branches onto unrelated flows. Judge the resulting structure, not the diff size. |
-| "It's just a version bump" | A bump is a behavior change you didn't write. Read the changelog; semver doesn't guarantee no breakage. |
-| "I'll upgrade everything in one PR to save time" | A bulk bump that breaks the build hides which package did it. One dependency per change keeps the cause and the revert clean. |
+| "The tests pass, so it's good" | Tests are necessary but not sufficient. They don't catch architecture, security, or readability problems. |
+| "The refactor makes it cleaner" | Relocating complexity isn't reducing it. If the reader still holds the same number of concepts, the structure didn't improve. |
+| "It's only a small addition to this file" | Small diffs still push files past healthy size and bolt branches onto unrelated flows. |
+| "It's just a version bump" | A bump is a behavior change you didn't write. Read the changelog. |
+| "I'll upgrade everything in one PR" | A bulk bump hides which package broke the build. One per change. |
+| "It's duplicated but it's only two places" | Two becomes three becomes five. Extract now, before the copies diverge. |
+| "The abstraction is future-proof" | YAGNI. Delete speculative generality — generalize on the third occurrence, not the first. |
+| "It's clever but efficient" | Cleverness is a readability tax. If it needs a comment to understand, simplify it. |
 
 ## Red Flags
 
@@ -374,14 +223,11 @@ For triaging `npm audit` findings and supply-chain risk (typosquatting, compromi
 - Security-sensitive changes without security-focused review
 - Large PRs that are "too big to review properly" (split them)
 - No regression tests with bug fix PRs
-- Review comments without severity labels — makes it unclear what's required vs optional
 - Accepting "I'll fix it later" — it never happens
 - A refactor that moves code around without reducing the number of concepts a reader must hold
-- A change that grows an already-large file instead of decomposing it
 - New conditionals scattered into unrelated code paths (a missing abstraction)
-- A bespoke helper that duplicates an existing canonical one, or feature logic placed in a shared module
-- A bulk "bump dependencies" PR with no changelog review and no per-package isolation
-- A lockfile change that's hand-edited, uncommitted, or merged without reviewing its diff
+- A bespoke helper that duplicates an existing canonical one
+- A bulk "bump dependencies" PR with no changelog review
 
 ## Verification
 
@@ -392,6 +238,18 @@ After review is complete:
 - [ ] Tests pass
 - [ ] Build succeeds
 - [ ] The verification story is documented (what changed, how it was verified)
-- [ ] Dependency upgrades were reviewed against their changelog, isolated per package, and verified by a green suite with the lockfile diff reviewed
+- [ ] Dependency upgrades reviewed against changelog, isolated per package, verified by green suite
 
-**Presumptive blockers:** surface and propose the simpler design for each of these; escalate to Required only when the change actively makes structure worse: a refactor that relocates complexity instead of reducing it; a change that pushes a file past the size boundary with no decomposition; feature logic added to a shared module; a near-duplicate of an existing canonical helper; a silent fallback that hides an unclear invariant.
+## Multi-Model Review Pattern
+
+Use different models for different review perspectives:
+
+```
+Model A writes the code → Model B reviews → Model A addresses feedback → Human makes the final call
+```
+
+Different models have different blind spots.
+
+## See Also
+
+- For detailed security review guidance, see `security-and-hardening`
diff --git a/.opencode/skills/create-commit/SKILL.md b/.opencode/skills/create-commit/SKILL.md
new file mode 100644
index 0000000000..790ba1b585
--- /dev/null
+++ b/.opencode/skills/create-commit/SKILL.md
@@ -0,0 +1,47 @@
+---
+name: create-commit
+description: Stage, review, and commit files following Penpot commit conventions.
+---
+
+# Skill: create-commit
+
+Produce a git commit that follows Penpot's commit message conventions. This
+skill owns the commit format, staging review, and safety checks — it does not
+implement features or push.
+
+## When to Use
+
+- After code changes are complete and files need to be committed
+- When delegated by a workflow step (e.g. implement-plan) to handle the commit
+
+## Required Reading
+
+Before drafting any commit, read `mem:workflow/creating-commits` end-to-end. It
+is the authoritative source for the commit message format, the emoji menu,
+subject/body limits, and the `AI-assisted-by` trailer. Follow it exactly.
+
+## Workflow
+
+1. **Stage the files** specified by the calling context. Do not ask for
+   confirmation.
+2. Run `git diff --staged` to review the content. If you see secrets (API keys,
+   tokens, passwords, private keys, `.env` values), debug prints, or anything
+   that does not match the stated intent, **STOP** and tell the user before
+   committing.
+3. Draft the message following the format in the memory doc, wrapping the body
+   at 72 characters per line, and run:
+   ```bash
+   git commit -m "<subject>" -m "<body>"
+   ```
+   (or `git commit -F -` if the body has unusual characters).
+4. The `AI-assisted-by` trailer value is provided by the calling context — use
+   it verbatim.
+
+## Constraints
+
+- Do not push. Pushing is a separate workflow handled by the user.
+- Do not run `git reset`, `git checkout`, `git restore`, `git clean`, or `rm`.
+- Do not pass `--author`. Author identity comes from the local git config.
+- Do not amend a commit you did not create in this session, unless explicitly asked.
+- Do not bypass pre-commit hooks (`--no-verify`) unless explicitly asked.
+- Do not add untracked files that were not created in this session.
diff --git a/.opencode/skills/testing/SKILL.md b/.opencode/skills/testing/SKILL.md
new file mode 100644
index 0000000000..5ad5d04e6e
--- /dev/null
+++ b/.opencode/skills/testing/SKILL.md
@@ -0,0 +1,57 @@
+---
+name: testing
+description: Enforce TDD workflow and testing best practices for Penpot. Use when implementing features, fixing bugs, or modifying behavior. Reads testing memory for full guidance.
+---
+
+# Testing Skill
+
+Enforces test-driven development and Penpot testing conventions.
+
+## When to Use
+
+- Implementing new logic or behavior
+- Fixing any bug (reproduction test required)
+- Modifying existing functionality
+- Adding edge case handling
+
+**Skip:** Pure configuration changes, documentation updates, or static content with no behavioral impact.
+
+## Workflow
+
+Follow TDD (Red → Green → Refactor) whenever practical:
+
+1. **RED** — Write a failing test first
+2. **GREEN** — Write minimal code to pass
+3. **REFACTOR** — Clean up while tests stay green
+
+For bug fixes, use the Prove-It Pattern: write a test that reproduces the bug, confirm it fails, implement the fix, confirm it passes.
+
+## Required Reading
+
+Before writing any test, read:
+
+1. `.serena/memories/testing.md` — cross-cutting testing principles, TDD workflow, anti-patterns, execution discipline
+2. Module-specific testing memory for the affected module:
+   - `mem:common/testing` — CLJC unit tests
+   - `mem:frontend/testing` — CLJS unit tests, Playwright E2E
+   - `mem:backend/core` — JVM clojure.test conventions
+
+## Key Rules
+
+- Every behavior change needs a test
+- Test state, not interactions
+- DAMP over DRY — tests are specifications; duplication is OK if each test is self-contained and readable
+- Prefer Real > Fake > Stub > Mock
+- Arrange-Act-Assert structure
+- One assertion per concept
+- Never pipe test output to filters — redirect to file first
+- Register new test files in the module's runner/entrypoint
+
+## Verification
+
+After completing implementation:
+
+- [ ] Every new behavior has a test
+- [ ] All tests pass for touched modules
+- [ ] Bug fixes include a reproduction test
+- [ ] Lint/formatter passes
diff --git a/.serena/memories/backend/core.md b/.serena/memories/backend/core.md
index 6530f74308..708d30fc5d 100644
--- a/.serena/memories/backend/core.md
+++ b/.serena/memories/backend/core.md
@@ -92,8 +92,8 @@ Fixtures can populate local data for manual testing/perf work. From the backend
 
 IMPORTANT: all CLI commands must be executed from the `backend/` subdirectory.
 
-* **Linting:** `clj-kondo --lint ../common/src/ src/`.
-* **Formatting:** `cljfmt check src/ test/` to check, `cljfmt fix src/ test/` to fix. Avoid unrelated whitespace diffs.
+* **Linting:** `pnpm run lint:clj`.
+* **Formatting:** `pnpm run check-fmt:clj` to check, `pnpm run fmt:clj` to fix. After running `fmt:clj`, `check-fmt:clj` is redundant. Avoid unrelated whitespace diffs.
 
 **Before linting:** if delimiter errors are suspected (after LLM edits), run
 `scripts/paren-repair` on the affected files first. Delimiter errors produce
diff --git a/.serena/memories/common/component-data-model.md b/.serena/memories/common/component-data-model.md
index 4ed1a47f9a..ef3343797c 100644
--- a/.serena/memories/common/component-data-model.md
+++ b/.serena/memories/common/component-data-model.md
@@ -24,6 +24,12 @@ Variant masters are main instances and component roots. Their descendants may th
 
 Masters are not normally touched through `set-shape-attr`, but touched flags can appear on master shapes through cloning/duplication paths. `add-touched-from-ref-chain` in `app.common.logic.variants` unions touched flags from ancestors into the copy being processed, so upstream/master touched state can affect downstream switch behavior.
 
+## Swap slots and positional matching
+
+- A swap slot (stored via `ctk/set-swap-slot`, a `:touched` group `swap-slot-<uuid>`) marks a copy sub-head that was SWAPPED to another component; `compare-children` then pairs it to the main child by slot instead of by `shape-ref`.
+- Copy sub-heads without a slot are paired to main children by `shape-ref` (seek, not index). `find-near-match` (positional) is only a validator/repair heuristic; validity requires membership of the ref among the near-main parent's children, not index equality (`mem:common/file-change-validation-migration-subtleties`).
+- Copy child ORDER converges to the main's via the async sync (`moved` branch of `compare-children`); local code must never reorder copy children directly (guards in `:mov-objects`/`:reorder-children`).
+
 ## Cloning paths
 
 `make-component-instance` in `app.common.types.container` produces a clean component copy through `update-new-shape`, dissociating attrs such as `:touched`, `:variant-id`, and `:variant-name` on cloned shapes.
diff --git a/.serena/memories/common/core.md b/.serena/memories/common/core.md
index 6ae8f084e8..816d131e14 100644
--- a/.serena/memories/common/core.md
+++ b/.serena/memories/common/core.md
@@ -5,7 +5,7 @@
 ## Stable namespace map
 
 - `app.common.data` and `app.common.data.macros`: generic data helpers and performance macros that do not depend on Penpot domain entities.
-- `app.common.types.*`: shared shape/file/page/component/token data types, schemas, predicates, and entity-local operations. `app.common.types.nitrate-permissions` contains shared fail-closed Nitrate organization/team permission rules.
+- `app.common.types.*`: shared shape/file/page/component/token data types, schemas, predicates, and entity-local operations. `app.common.types.organization` contains organization schemas, `apply-organization`, and fail-closed organization/team permission rules (`allowed?`, `can-send-invitations?`).
 - `app.common.files.*`: file-level operations, shape tree helpers, change application, migrations, validation, and undo/redo-related logic.
 - `app.common.logic.*`: higher-level workflows/algorithms over files, shapes, components, variants, libraries, tokens, etc.
 - `app.common.geom.*`: geometry helpers and transformations.
diff --git a/.serena/memories/common/file-change-validation-migration-subtleties.md b/.serena/memories/common/file-change-validation-migration-subtleties.md
index 7ff830a38d..014a458a30 100644
--- a/.serena/memories/common/file-change-validation-migration-subtleties.md
+++ b/.serena/memories/common/file-change-validation-migration-subtleties.md
@@ -7,6 +7,8 @@
 - `set-shape-attr` treats `:position-data` as derived and never touched. Geometry/content-path changes use approximate equality; geometry differences under about 1px can be ignored for touched purposes.
 - Width/height are excluded from the `is-geometry?` branch in `set-shape-attr`; do not assume all geometry-group attrs follow identical ignore-geometry behavior.
 - `process-touched-change` marks the owning component modified when a touched shape belongs to a main instance; component-data changes can come from shape ops through this second pass.
+- Copy structure is guarded at change application: `:mov-objects` (`is-valid-move?`) and `:reorder-children` both refuse to alter children of shapes inside component copies unless the change carries `allow-altering-copies` (sync/swap flows set it). New structural change types must follow the same rule.
+- `cls/generate-delete-shapes` propagates deletions from INSIDE a component main to the copy shapes referencing them (transitively, all pages of the file) so no dangling `shape-ref`s remain; skipped when the main root itself is deleted (copies then resolve into the deleted component) and for `allow-altering-copies` flows (swap replaces the shape; sync reconciles).
 
 ## Shape tree edits
 
@@ -19,6 +21,7 @@
 - Full referential/semantic validation currently runs only when file features contain `"components/v2"`.
 - Validation starts at root plus orphan shapes, then validates component records. `validate-file!` raises `:validation :referential-integrity` with collected details.
 - `repair-file` does not mutate data directly; it reduces validation errors into redo changes using `changes-builder`. Callers must apply or persist those changes.
+- `:missing-slot` fires only for a REAL swap: a copy sub-head whose `shape-ref` is no longer a child of the near main parent. A pure positional mismatch (ref still a sibling elsewhere) is a reorder — valid, realigned by the async component sync; do not "repair" it by assigning swap slots (a slot freezes the child out of normal sync). `fix-missing-swap-slots` (migration 0019) follows the same membership rule.
 
 ## Migrations
 
diff --git a/.serena/memories/common/layout-grid-subtleties.md b/.serena/memories/common/layout-grid-subtleties.md
index a3070efefb..2a48b9d149 100644
--- a/.serena/memories/common/layout-grid-subtleties.md
+++ b/.serena/memories/common/layout-grid-subtleties.md
@@ -8,6 +8,9 @@
 ## Grid assignment
 
 - Grid `assign-cells` ensures at least one column and row, skips absolute-position children, creates non-tracked rows/cols when children exceed tracked cells, and asserts that assigned cells do not overlap.
+- `position-absolute?` counts HIDDEN shapes as absolute: hiding a grid child frees its cell on the next `assign-cells`.
+- `reorder-grid-children` rewrites the parent's `:shapes` to the REVERSE of the sorted cell order, but children with no cell (hidden/absolute) keep their original index — do not "fix" this into moving them to an end; that broke copy/main positional slot alignment (referential-integrity crash).
+- The `:reorder-children` change it emits is refused on parents inside component copies unless `allow-altering-copies` (same rule as `:mov-objects`); `pcb/reorder-grid-children` also skips copy grids producer-side. Copy child order is owned by the component sync engine.
 - Grid deassignment removes cells for shapes that are no longer direct children or have become absolute-positioned.
 - Auto-positioning is not just sorting: some auto cells are converted to manual when empty/manual/span state would break the auto sequence, then auto single-span items can be compacted.
 - `fix-overlaps` is marked dev-only and removes one overlapping cell, preferring empty cells first. Avoid depending on it as normal production repair.
\ No newline at end of file
diff --git a/.serena/memories/critical-info.md b/.serena/memories/critical-info.md
index fcc2394424..117e8ff464 100644
--- a/.serena/memories/critical-info.md
+++ b/.serena/memories/critical-info.md
@@ -39,6 +39,7 @@ This is a monorepo. Principles that apply to one module do *not* generally apply
 - `plugins/`: TypeScript plugin runtime/examples and Plugin API types; core conventions: `mem:plugins/core`.
 - `library/`: design library workflows; core conventions: `mem:library/core`.
 - `docs/`: documentation site; core workflow and conventions: `mem:docs/core`.
+- `media-processor/`: TypeScript/Node.js HTTP service for image (sharp) and font (FontForge) processing; core conventions: `mem:media-processor/core`.
 
 The memory is structured in a way that you can get the critical information about the
 module. You can read it from `mem:<MODULE>/core`
@@ -52,7 +53,7 @@ module. You can read it from `mem:<MODULE>/core`
 - `experiments/` contains standalone experimental HTML/JS/scripts; treat it as non-core unless the user explicitly asks about it.
 - `sample_media/` contains sample image/icon media and config used as fixtures/demo material; do not infer app behavior from it.
 
-# Dev tools
+# Dev Scripts (scripts/)
 
 - `scripts/nrepl-eval.mjs` — Evaluate Clojure/ClojureScript code via nREPL.
   Supports `--backend` (port 6064) and `--frontend` (port 3447) aliases.
diff --git a/.serena/memories/devenv/core.md b/.serena/memories/devenv/core.md
index 82e4e704f3..0651f872fe 100644
--- a/.serena/memories/devenv/core.md
+++ b/.serena/memories/devenv/core.md
@@ -25,7 +25,9 @@ Compose-based dev environment under `docker/devenv/`, driven by `manage.sh`. Par
 
 ## Worker policy
 
-Backend workers run only on ws0. `_env` gates `enable-backend-worker` on `PENPOT_BACKEND_WORKER`; ws1+ inject it as false. ws0 must be running whenever any ws1+ is running, and is the last instance to stop — `run-devenv --agentic --ws N` (N≥1) auto-starts ws0 first; `stop-devenv` refuses to stop ws0 while any ws1+ is up. Workers are pure fire-and-forget: `wrk/submit!` inserts a row into the shared Postgres `task` table and returns; RPC handlers never wait on completion and workers never publish to msgbus. The reason for "ws0 only" is avoiding multi-instance worker races (cron dedup is best-effort across instances, `wrk/submit!` `dedupe` is racy across submitters); details in `mem:prod-infra/core`.
+Backend workers run only on ws0. `_env` gates `enable-backend-worker` on `PENPOT_BACKEND_WORKER`; ws1+ inject it as false. Workers are pure fire-and-forget: `wrk/submit!` inserts a row into the shared Postgres `task` table and returns; RPC handlers never wait on completion and workers never publish to msgbus. The reason for "ws0 only" is avoiding multi-instance worker races (cron dedup is best-effort across instances, `wrk/submit!` `dedupe` is racy across submitters); details in `mem:prod-infra/core`.
+
+Each workspace is independent and can be started/stopped in any order. Shared infra (postgres, minio, etc.) is shut down only when no instances remain running.
 
 ## Port layout
 
@@ -63,8 +65,8 @@ No `--delete` on the working-tree pass: gitignored caches in the workspace survi
 
 ## CLI surface
 
-- `run-devenv --agentic [--ws main|0|wsN|N] [--sync] [--serena-context CTX]`: bring one instance up. Agentic only — MCP and Serena windows are always created. Default target main. Errors out if the target is already running. `--sync` is rejected on main; on ws1+ it's optional (forced only when the workspace dir does not exist yet). Auto-starts ws0 first when the target is ws1+ and ws0 is not yet up.
-- `stop-devenv [--ws main|0|wsN|N] [--all]`: stop instances. Flags mutually exclusive. `--ws N` (N≥1) stops just that workspace. `--ws 0` or no flag stops ws0 + shared infra, refused while any ws1+ is running. `--all` stops every ws highest-first then ws0, then infra.
+- `run-devenv --agentic [--ws main|0|wsN|N] [--sync] [--serena-context CTX]`: bring one instance up. Agentic only — MCP and Serena windows are always created. Default target main. Errors out if the target is already running. `--sync` is rejected on main; on ws1+ it's optional (forced only when the workspace dir does not exist yet).
+- `stop-devenv [--ws main|0|wsN|N] [--all]`: stop instances. Flags mutually exclusive. `--ws N` stops just that workspace. `--ws 0` or no flag stops ws0; shared infra shuts down only if no other instances remain. `--all` stops every ws highest-first then ws0, then infra.
 - `run-devenv`: legacy alias, ws0 non-agentic attached.
 - `attach-devenv [--ws main|0|wsN|N]`: pure attach. Fails fast if instance/session missing.
 - `run-devenv-shell [--instance 0|wsN|N] [cmd...]`: bash in target instance. (`--instance` flag not yet renamed to `--ws`.)
diff --git a/.serena/memories/frontend/composable-component-tests.md b/.serena/memories/frontend/composable-component-tests.md
index 28c0605569..865a381133 100644
--- a/.serena/memories/frontend/composable-component-tests.md
+++ b/.serena/memories/frontend/composable-component-tests.md
@@ -1,316 +1,151 @@
 # Composable component tests
 
-A framework for systematically testing Penpot's component subsystem (synchronisation/propagation,
-swaps, variant switches, nesting), plus the suite of cases built on it. Lives entirely in the
-**frontend** test tree as `.cljs`; it is test-only code with a single consumer (the frontend test
-suite, which runs the real app). There is nothing "common" about it — it is not under `app/common`.
+A framework concept for systematically testing Penpot's component subsystem
+(synchronisation/propagation, swaps, variant switches, nesting, overrides), implemented in TWO test
+suites that share the principles below:
 
-## Core idea
-A test is a **composition of operations** over a **situation**, plus assertions. You describe a
-test as data (a setup + a sequence of operations) rather than writing bespoke imperative code, and
-coverage grows by COMPOSITION: a new variation is one combinator wrapped around existing pieces,
-not a copied test. One written case stands for a whole matrix of concrete cases.
+1. **ClojureScript suite** — in the frontend test tree (`frontend/test/frontend_tests/
+   composable_tests/`), driving a minimally-assembled real app headlessly. The original.
+2. **TypeScript suite** — a Penpot plugin (`plugins/apps/composable-test-suite/`), driving the FULL
+   production app end-to-end through the Plugin API, with a slightly more elaborate set of
+   abstractions. Runs interactively (panel), remotely (Playwright), and headlessly in CI. Its
+   README is the authoritative operational reference.
 
-- **Situation** — the in-memory Penpot file value, plus named **roles** (meaningful shapes, e.g.
-  `:main-instance`/`:copy-instance`), a `:vars` map (named non-shape values), and an ordered
-  **applied-log** of what ran.
-- **Operation** — a step, reified as a DATA record implementing `IOperation` (single method
-  `apply-to`; `apply` collides with core). Operations are printable, navigable, and enumerable.
-  Most transform the situation; some do not — hence the genus is "operation", not "transformation"
-  (`Test` asserts and returns the situation unchanged; `Skip` is a no-op).
-- **Assertions** — inline `Test` operations placed in the sequence (assert at intermediate points)
-  and/or a trailing asserter (a `situation -> any` lambda calling `t/is`). The runner makes NO
-  judgment; it applies operations and returns the situation. Only *retrieval* helpers live outside
-  the test (role accessors, `has-property-of`, `applied?`).
+## Shared core idea
+A test is a **composition of operations** over a starting configuration, plus assertions. You
+describe a test as data (a setup + a sequence of operations) rather than writing bespoke imperative
+code, and coverage grows by COMPOSITION: a new variation is one combinator wrapped around existing
+pieces, not a copied test. Choice points (one-of alternatives, optional steps) EXPAND the
+composition into a full sweep of variants — one written case stands for a whole matrix of concrete
+tests.
 
-## Principles
-- **Operations are data with identity.** Each node gets a unique id at construction (`assign-id`),
-  records what it did under that id (`record-application`), and is interrogated by identity
-  (`applied?`, `get-choice`). No flat keyword-tagged log.
-- **Drive the real production pipeline.** Every operation routes through the actual production
-  change functions (`generate-update-shapes`, `generate-component-swap`, `generate-reset-component`,
-  `generate-sync-file-changes`, …) — never raw field writes, or propagation would have nothing to
-  react to. The test exercises genuine Penpot logic, not a reimplementation.
-- **The frontend runs the real app.** Synchronous file-ops apply directly to the store; event-ops
-  dispatch the REAL workspace events and await settlement, so the production watcher's AUTOMATIC
-  propagation is what's under test. Observed semantics are genuine.
-- **Roles resolve to ids at setup time.** The global label→id map (`thi`) is shared and
-  time-varying, so a role is captured as an id when the situation is built; resolving late (across
-  enumerated variants) would be unsound. Absence throws a diagnostic (never silent nil).
-- **Targets resolve at apply-time and may be rebound.** A target is a `(situation -> id)` FUNCTION,
-  else a currently-bound ROLE, else a LABEL (`target-shape-id`). So one operation targeting a role
-  follows that role as state-building ops re-point it — which is what lets a single operation be
-  swept across depth.
-- **Enumeration is authored, not exhaustive.** You compose only VALID cases (every `one-of` branch
-  must be valid against the setup), so outcomes are just pass / fail / error — no not-applicable
-  cells. Adding a variation across a matrix is a one-expression edit.
+## Shared principles
+- **Every producing object is the accessor interface to what it produces downstream.** An
+  operation — and related objects such as content-creation strategies — is not merely an action:
+  the SAME object instance the case holds is the typed interface through which everything it
+  created or changed is later retrieved, checked, and asserted, parameterized by the situation. A
+  foundation operation exposes accessors for the participants it built; an edit operation exposes
+  its dual check (`assertHasChangedProperty` / `has-property-of`); a choice is recovered by asking
+  the one-of object (`getChoice`/`get-choice`); "did this step run" is asked of the step
+  (`wasApplied`/`applied?`). NEVER reach into a situation (or the document) for something an
+  upstream object produced — ask the producer. This is what keeps sweeps sound (object identity
+  ties the question to the exact node that ran) and what keeps retrieval logic in exactly one
+  place. Particularly explicit in the TS OOP implementation, where these accessors are methods on
+  the operation/strategy classes; repeatedly violating it (reading the document directly,
+  duplicating retrieval) was the most common review correction while building the suites.
+- **Operations are data with identity.** Each operation node has a unique id at construction and
+  records what it did under that id; interrogation is by identity. Bind an operation to a value
+  ONCE and reuse it in the composition and in every query about it.
+- **Drive the real production pipeline.** Operations route through genuine Penpot logic — real
+  change functions / real workspace events / the real Plugin API, never raw field writes — so the
+  production watcher's AUTOMATIC propagation is what's under test.
+- **Roles, not internals.** A starting configuration names its participants (roles). Role→id
+  capture happens when the configuration is built; operation TARGETS resolve at apply-time and may
+  be re-bound, so an operation targeting a role follows it as state-building ops re-point it —
+  which lets a single operation be swept across depth.
+- **Enumeration is authored, not exhaustive.** Compose only VALID cases, so outcomes are just
+  pass / fail / error — no not-applicable cells.
 - **Naming discipline.** Penpot domain nouns ("component", "variant") must not name framework
-  abstractions (they collide with real domain concepts). Framework vocabulary is testing concepts
-  only; an operation may name the domain *action* it performs (`swap`, `propagate`).
+  abstractions; an operation may name the domain ACTION it performs.
+- **Operator algebra** (same in both suites): sequence (cartesian product of the steps' variants),
+  one-of (union, choice recorded), optional(X) = one-of([X, skip]), inline assertion ops, trailing
+  asserters.
+- **Case authoring:** a case carries a CamelCase identifier and a plain-terms description in three
+  parts — situation setup, actions/variations, asserted requirement.
 
-## Composition operators
-- `in-sequence` — ordered application, threads the situation; enumerates to the CARTESIAN PRODUCT
-  of its steps' variants. Operations do not commute, so order is explicit. The workhorse.
-- `one-of` — exactly one branch; applying it throws (must be enumerated); enumerates to the UNION
-  of branches, each wrapped in a `RecordedChoice` so `get-choice` recovers which ran.
-- `optional(X)` = `one-of([X, skip])` — sweeps "with and without X" (two variants). `skip` is the
-  identity operation. The workhorse for adding a state-building step as an axis over a case.
-- `test-that [assert-fn]` — an inline `Test`: asserts at this point in the sequence, situation
-  unchanged. Lets checkpoints sit at intermediate steps. Engine stays clojure.test-free (it just
-  calls the supplied fn).
-- `applied? [situation operation]` — whether that exact node ran (identity-based). Composes with
-  `optional`/`one-of` for free. REQUIREMENT: bind an operation to a value ONCE and reuse it (in the
-  composition AND any `Test` querying it), so the id you ask about is the id that ran.
+---
 
-## Structure (frontend/test/frontend_tests/composable_tests/)
-Two boundaries: the domain-agnostic **engine** and the **comp** subject library (about components;
-naming the domain is correct there).
+# ClojureScript suite (frontend test tree)
 
-- `core.cljs` (ns `frontend-tests.composable-tests.core`) — the engine, one file:
-  - situation: `make-situation`, `file`/`with-file`, `with-aux-files`/`aux-files` (carry extra
-    files, e.g. a library for case H), the applied-log.
-  - identity & transcript: `assign-id`, `node-id`, `record-application` (also stores a `::kind`
-    from the record type), `node-data`, `describe-applied` (readable ordered transcript, attached
-    to every failure so a failing variant in a sweep is identifiable).
-  - roles & lookup: `role-shape` (strict, by stored id), `has-role?`, `rebind-role`/`rebind-role-id`
-    (re-point a role — used by state-building ops), `target-shape-id` (fn | role | label),
-    `shape-by-id` (read a shape whose id is held in a `:vars` object), `resolve-shape`/`-id`.
-  - protocols: `IOperation`(`apply-to`); `IEnumerable`(`-enumerate`) + `enumerate`.
-  - operators: `Sequence`/`in-sequence`; `OneOf`/`one-of`/`RecordedChoice`/`get-choice`;
-    `Skip`/`skip`; `optional`; `Test`/`test-that`; `applied?`; vars `set-var`/`get-var`.
-  - runners (clojure.test-free): `run-variant`, `run-all` (enumerate → vector, `thi/reset-idmap!`
-    per variant).
-  - per-op-interpreter helpers: `sequence-ops` (flatten a concrete variant — flattens `Sequence`,
-    keeps `RecordedChoice` as a unit), `recorded-choice?`, `choice-of`, `choice-one-of-id`.
-- `comp/setups.cljs` — setup fns returning a situation, + role accessors (`main-instance`/
-  `copy-instance`/`main-root`/`copy-root`, `copy-child` 1-based): `simple-component-with-copy`,
-  `simple-component-with-labeled-copy`, `component-with-many-children` (E, F),
-  `nested-component-with-copy`, `cross-file-component-with-copy` (H: main in a linked library, copy
-  in the consuming file; primary `:file` = consuming, aux = library), and `empty-situation` (empty
-  file, no roles — the `:setup` for the sweep cases, whose first operation is `create-component`).
-- `comp/nodes.cljs` — the component OPERATIONS. General edit/structure ops:
-  `change-property [target property value]` (`:fills`/`:opacity`) with its dual `has-property-of`
-  (`IPropertyCheck`); `change-attr`/`has-attr?` are aliases. `add-child`/`remove-child`/`move-child`
-  (with `IStructuralCheck`). `sync-from-library` (H: `generate-sync-file-changes`, libraries =
-  primary + aux). `undo` (I; frontend `dwu/undo`). Plus the scenario building blocks below.
-- `interpreter.cljs` (ns `frontend-tests.composable-tests.interpreter`) — runs a case against the
-  real frontend (see "Interpreter").
-- `comp/sync_test.cljs` (ns `frontend-tests.composable-tests.comp.sync-test`) — the cases;
-  registered in `frontend_tests/runner.cljs`.
+Test-only `.cljs` code in the frontend test tree (nothing "common" about it). A **situation** =
+the in-memory file value + named roles + `:vars` + an ordered applied-log. Operations are records
+implementing `IOperation`/`apply-to` (`apply` collides with core). Assertions = inline `Test` ops
+and/or a trailing asserter; the runner makes no judgment. Failures carry `describe-applied` (the
+transcript), which is what makes a failing variant in a sweep identifiable.
 
-## Scenario object model (behind the sweep cases)
-Scenario ops track one or more named component LINEAGES as OBJECTS under `:vars :components` (keyed
-by name, e.g. "main"). Grouping a lineage's fields into one object lets several lineages coexist
-(a swap targets a DIFFERENT component) and makes each op "read object `name`, update, write back".
+Layout: `core.cljs` (the domain-agnostic engine: situation, identity/transcript, roles/targets,
+operators, runners), `comp/setups.cljs` (setups + role accessors), `comp/nodes.cljs` (the component
+operations and their check duals), `interpreter.cljs` (runs cases against the real frontend),
+`comp/sync_test.cljs` (the cases; registered in `frontend_tests/runner.cljs`). Case letters B..N;
+the sweeps (K: depth × edit-precedence; L: swaps; M: variant switches; N: rotated-instance
+geometry, on the #10109 fix branch until merged) are the flagship pattern — read them before
+writing a new sweep.
 
-A lineage object has:
-- `:main-component-id` — the component the next instantiate/nest uses (advances to the new OUTER
-  component per `make-nested-component`).
-- `:remote-head`/`:remote-rect` — the FIXED deepest origin (the original component everything is
-  derived from). For a plain lineage this is never re-pointed; a variant nesting DOES re-point it
-  (see below).
-- `:main-head`/`:main-rect` — the current outer main (advances per nesting).
-- `:nesting-count`; `:copies`, `:copy-head`/`:copy-rect` (from `instantiate-copy`).
-- `:nesting-data` — vector, one entry per level i: `{:main-head, :nested-head, :nested-rect,
-  :nested-head-parent}`.
-  - `:nested-head` is the DEEPEST instance at level i — the descendant of the level's copy head
-    that corresponds to `:remote-head`, found by descending the `:shape-ref` chain (at level 0 the
-    inner copy itself; deeper, the corresponding shape nested within the outer wrapper). This is THE
-    SWAP / SWITCH TARGET; it carries a `:component-id`.
-  - `:nested-head-parent` is the SWAP-STABLE anchor: a swap/switch replaces the head in place but
-    keeps its parent, so assertions re-resolve parent → current head → rect.
+**Scenario lineage model** (behind the sweeps): scenario ops track named component lineages as
+objects under `:vars`, each holding the FIXED deepest origin (`:remote-*`), the ADVANCING outer
+main (`:main-*`), and per-nesting-level data whose `:nested-head` (the deepest instance at that
+level, found by descending the `:shape-ref` chain — matching chain MEMBERSHIP, not terminus) is
+the swap/switch target, anchored by its swap-stable parent. Nesting seeks the FIXED origin, not
+the advancing main — that is what makes each level's `:nested-head` land on the deepest instance.
+A variant nesting re-points the lineage's remote to the chosen member. Construction lesson:
+cross-level propagation requires progressively NESTED levels (one variant + plain wraps); sibling
+nestings do not propagate between each other.
 
-Accessors / targets (in nodes): `lineage-component-id`, `lineage-rect`, `lineage-copy-rect`,
-`lineage-nesting`, `level-rect`/`level-rect-of` (level i's CURRENT rect via the parent anchor);
-target-fns `remote-rect-of`/`main-rect-of`/`copy-rect-of` and `nested-head-of` (return a
-`(situation -> id)` for use as an operation target). "Corresponds to" across layers follows the
-`:shape-ref` CHAIN, matching on chain MEMBERSHIP not terminus (a copy rect refs its near-main,
-which carries a further `:shape-ref`, so the terminus over-walks). Single-file setups, so the chain
-resolves in the local page objects.
+**Interpreter:** installs the situation's files into the global `st/state` (aux files tagged
+`:library-of`), starts the real `watch-component-changes` (+ harness `watch-undo-stack`), maps
+event-ops to REAL workspace events (`dwsh/update-shapes`, `dwl/component-swap`,
+`dwv/variants-switch`, `dwt/increase-rotation` — which runs the `check-delta` placement
+classification — `dwt/update-dimensions`, `dwu/undo`, `dwl/sync-file`, …) and runs sync-ops'
+`apply-to` against the live store file; awaits settlement (idle-gap heuristic + per-op grace) and
+re-reads `:file` each step so the shared accessors keep working.
+STORE-SWAP IMMUNITY: other test namespaces `set!` `st/state`/`st/stream` and never restore, while
+the `app.main.refs` lenses stay bound to the ORIGINAL atoms — propagation then dies silently. The
+interpreter captures the atoms at namespace-load time and re-`set!`s them per variant.
 
-Scenario operations (each takes a lineage `name`):
-- `create-component [name color]` — a component (frame + rect child of `color`); remote == main,
-  count 0.
-- `make-nested-component [name]` — wrap `name`'s component in a NEW OUTER component whose main
-  contains a COPY of it inside a board (add-frame → instantiate inside → make-component); the OUTER
-  becomes `:main-component-id`; advance `:main-*`; append a `:nesting-data` entry; bump count.
-  ITERABLE: `×N` = board-within-board nesting with one rect at the bottom. Each level's
-  `:nested-head` is the deepest instance there, so swapping/switching it propagates (via the
-  watcher) outward to copies of it in OUTER levels.
-- `instantiate-copy [name]` — instantiate `name`'s current component; track `:copy-head` and the
-  rect corresponding to its main rect as `:copy-rect`.
-- `reset-copy-instance [name]` — reset overrides on `:copy-head` (production
-  `generate-reset-component`, `:validate? false` — a file-op on the frontend too: the real reset
-  event reads browser globals and cannot run headless).
-- `swap-component [name level target & {:keys [keep-touched?]}]` — swap level `level`'s
-  `:nested-head` for lineage `target`'s component, via production `generate-component-swap`.
-  Frontend = the REAL `dwl/component-swap` event, so the watcher AUTOMATICALLY propagates the swap
-  to copies (incl. deeper levels). A swap replaces the head in place: Penpot keeps the head id,
-  rewrites it to the new component, stamps a `:swap-slot-<uuid>` touched group. `keep-touched?`
-  default false (discards overrides); true is the variant-switch flavour.
-- Shared nesting helper `nest-in-new-outer-component [situation name op seek-rect-id seek-head-id
-  instantiate-inner-fn]` — the contain-outward mechanism behind BOTH nesting ops. Adds the outer
-  frame, calls `instantiate-inner-fn` to place the inner instance, makes the outer a component,
-  then computes this level's `:nested-rect`/`:nested-head` as the IMAGES (inside the new inner copy)
-  of `seek-rect-id`/`seek-head-id` — the FIXED deepest origin — and does the bookkeeping. A flavour
-  supplies only the two origin ids + the instantiate fn. Seeking the FIXED origin (not the advancing
-  `:main-*`) is what makes `:nested-head` land on the deepest instance at every level.
-  `self-or-descendant-corresponding-to` is the chain-descent that also matches the head itself
-  (needed at level 0, where the inner copy head IS the origin's image).
+Running: `cd frontend && pnpm run build:test`, then
+`node target/tests/test.js --focus frontend-tests.composable-tests.comp.sync-test`
+(var-level focus for one case).
 
-## Variant operations
-A variant switch IS a keep-touched swap whose target is resolved by a property VALUE (the
-production `variants-switch`/`variant-switch` reduces to `component-swap … keep-touched? true`), so
-it routes through the SAME `generate-component-swap` and the watcher auto-propagates it across
-nesting levels exactly like a swap.
-- `make-variant-container [name members]` (sync-op) — build a variant SET synchronously, mirroring
-  the test-helpers' `add-variant` idiom: a container frame (`:is-variant-container`), each `members`
-  entry `[value color]` becoming a member component whose ROOT is a child of the container carrying
-  the shared `:variant-id`/`:variant-name`, then `update-component` stamps `:variant-id` +
-  `:variant-properties [{:name "Property 1" :value value}]` on the component. Read the container id
-  via `(thi/id container-label)` only AFTER adding the container frame (`thi/id` returns nil before
-  the shape exists). Records the set in `:vars` (`variant-set`/`variant-member`/
-  `variant-member-component-id` read it back).
-- `make-nested-component-with-variant [name set-name value]` (sync-op) — nest a chosen member via
-  the shared nesting helper, AND re-point the lineage's `:remote-head`/`:remote-rect` to that
-  member's root/rect: nesting a variant makes the member the new deepest origin, so subsequent plain
-  `make-nested-component` descends to the variant's image (its `:nested-head`) at every level.
-- `switch-variant [target value]` (frontend event) — switch the variant copy head bound to `target`
-  to the sibling member with property value `value`, via the REAL `dwv/variants-switch` event (which
-  DISCOVERS the sibling in the container via `find-variant-components`). `target` uses the standard
-  resolution (role | label | fn), so the op knows nothing about nesting; cases supply
-  `nested-head-of name i`.
+**Fidelity warning:** the harness drives a MINIMALLY-ASSEMBLED app — only some
+`initialize-workspace` subscriptions are wired. Risk = SILENT UNDER-WIRING (e.g. undo needs the
+harness `watch-undo-stack`). When a case needs app behaviour beyond a raw edit, check for an
+unwired subscription and verify by PROBING store state, not by trusting a green assertion.
 
-## Interpreter (interpreter.cljs)
-Drives the real app:
-- `op->events [op situation]` maps each event-dispatching operation to its real workspace event(s):
-  `ChangeProperty`→`dwsh/update-shapes` (the SHARED `set-property`, target via `target-shape-id`);
-  `MoveChild`→`dwsh/relocate-shapes`; `RemoveChild`→`dwsh/delete-shapes`; `AddChild`→`dwsh/add-shape`;
-  `SyncFromLibrary`→`dwl/sync-file`; `Undo`→`dwu/undo`; `SwapComponent`→`dwl/component-swap`;
-  `SwitchVariant`→`dwv/variants-switch {:shapes [head] :pos 0 :val value}`. All real events, so the
-  watcher auto-propagates.
-- `sync-op?` ops (`MakeNestedComponent`, `CreateComponent`, `InstantiateCopy`, `ResetCopyInstance`,
-  `MakeVariantContainer`, `MakeNestedComponentWithVariant`, `Skip`, `Test`) are NOT dispatched as
-  events: `run-sync-op` runs the shared `apply-to` against a situation whose `:file` is the live
-  store file, then writes back synchronously. The property under test is still exercised by the
-  subsequent real-event ops + the watcher.
-- It installs the situation's files into the global `st/state` store (primary as current; aux files
-  tagged `:library-of` the current file so the library-sync machinery treats them as linked), starts
-  the real `watch-component-changes` and the harness `watch-undo-stack`, then folds the operations:
-  dispatch events → await settlement → re-read the current file into `:file` → record. Re-reading
-  `:file` each step is why the shared role accessors keep working.
-- `watch-undo-stack` mirrors the production undo-append subscription from `initialize-workspace`
-  (which the harness does not run); without it `dwu/undo` has an empty stack.
-- Settlement (`await-settle`): subscribe to the commit stream, resolve on the first 60ms idle gap
-  after a commit (captures the edit commit and the watcher's follow-up sync commit), 2000ms timeout.
-  Debounce-based, not a deterministic per-op stopper. After settling, `op-grace-ms` adds a per-op
-  grace wait (currently only `SyncFromLibrary`, ~3.2s — see the Running note).
-- Thumbnail rendering is stubbed for this suite (`install-thumbnail-noop!` no-ops
-  `dwth/update-thumbnail`): the propagation watcher schedules thumbnail renders that reach `window`,
-  absent headless.
-- `check [done case-map asserter]` enumerates, runs each variant via the async fold, wraps the
-  asserter in `describe-applied`, and calls `done`. Per-variant isolation = id-map reset + global
-  state re-install (the global `st/state` is a shared `defonce`).
-- STORE-SWAP IMMUNITY (`original-store`/`restore-global-store!`): many plugins-suite namespaces
-  `set!` `st/state`/`st/stream` to isolated stores and never restore them. The `app.main.refs`
-  lenses (through which the watcher observes commits) are okulary lenses bound to the ORIGINAL
-  atom instance at load time — after such a swap, events commit to a store the watcher cannot see
-  and ALL propagation dies silently (assertions see base/unsynced state; no error). The interpreter
-  therefore captures `st/state`/`st/stream` at namespace-LOAD time (before any test runs) and
-  re-`set!`s them at the start of every variant, making the harness immune to run order. Diagnosed
-  by bisecting the runner's deterministic execution order (it is NOT the `test-namespaces` vector
-  order: `t/test-vars-block` groups vars by namespace, and the group-by hash order decides — same
-  order locally and in CI).
+**Caveats:** inline `Test` exceptions are UNCAUGHT on the frontend (crash the runner — assert in
+the trailing asserter). `(optional (in-sequence …))` is not flattened for the interpreter — use
+independent optionals. The Serena/clj-kondo cache for `nodes.cljs` goes stale (phantom symbols) —
+trust the build. Cross-namespace global-state leaks land in this suite first; suspect them before
+the framework on inexplicable full-run-only failures. Case H's `sync-file` schedules a delayed RPC
+that fails headless (benign; absorbed by per-op grace).
 
-## Cases
-Asserters are inline; no `doseq`, no count assertions.
-- **B** — an override on the copy survives a later main change (override present + `:touched`
-  contains the fill group + `:shape-ref` present).
-- **C** — attribute sweep via `one-of {fills, opacity}`: assert `(has-attr? (get-choice …) copy)`
-  per enumerated variant.
-- **D** — `add-child` to the main gives the copy a ref-integral child (`is-main-of?` +
-  `parent-of?` + untouched).
-- **E** — `remove-child` of the MIDDLE of three: survivors keep order `[child1, child3]`,
-  `:shape-ref` intact, untouched (middle removal is where index maintenance is tested).
-- **F** — `move-child` of child1 to index 2: copy mirrors `[child2, child1, child3]`, identity
-  preserved.
-- **H** — locality (cross-file): main in a linked library, copy in the consuming (current) file,
-  library main diverged. The in-file watcher does not cross a library boundary; the cross-file
-  mechanism is the library-update action (`sync-from-library` → `sync-file file-id library-id`).
-  Setup order matters: instantiate the copy first (captures the old value), diverge the library main
-  after.
-- **I** — undo: an edit then `undo`; copy and main return to baseline, copy untouched. A single
-  `dwu/undo` reverses the whole logical action — the edit AND its auto-propagation — because the two
-  commits share an undo-group.
-- **K** — SYNC-SCENARIO SWEEP (the flagship). On `empty-situation`: `create-component` → two
-  `(optional make-nested-component)` (depths 0/1/2) → `instantiate-copy` → three `(optional change-*)`
-  over remote/main/copy → INLINE checkpoints: (1) override-precedence at the copy (copy wins, else
-  main, else remote — branch via `applied?`), (2) force a copy override and confirm it wins, (3)
-  after `reset-copy-instance`, copy reverts to main's value if main changed, else remote's. No
-  explicit propagate (the watcher auto-propagates at all depths, incl. chained remote→deep-copy).
-- **L** — SWAP SWEEP. On `empty-situation`: `create-component` (base) + one swap-target lineage per
-  level → three `make-nested-component` → three `(optional (swap-component "main" i target_i))` →
-  one `Test` asserting each level's colour. A swap at level i auto-propagates to level i and every
-  OUTER level until a higher swap overrides; colour at level i = applied swap at highest j<=i, else
-  base.
-- **M** — VARIANT-SWITCH SWEEP (case L with a variant switch instead of the plain swap, driving the
-  REAL variant-switch machinery). On `empty-situation`: `create-component` (base lineage "main") +
-  `make-variant-container` (4 peer members `v0..v3`) → ONE `make-nested-component-with-variant
-  "main" "vset" "v0"` (introduce the variant innermost) + two plain `make-nested-component`
-  (progressive wraps, so each outer level CONTAINS the one below) → three
-  `(optional (switch-variant (nested-head-of "main" i) v_{i+1}))` → one `Test` with case L's exact
-  precedence asserter. Because the single variant instance has a switchable `:nested-head` at EVERY
-  level and the levels are progressively nested, a switch at level i propagates outward like a swap.
-  NOTE on structure: ONE variant + plain wraps is required for cross-level propagation (the levels
-  nest WITHIN each other). Three independent `make-nested-component-with-variant` would nest SIBLING
-  variants (none a descendant of another), so switches would not propagate between them — the right
-  construction for a different test (one asserting switches DON'T cross unrelated instances).
+---
 
-Running: `cd frontend && pnpm run build:test` then `node target/tests/test.js --focus
-frontend-tests.composable-tests.comp.sync-test`. To run one case, use var-level focus, e.g.
-`…/case-m-variant-switch-scenarios`. NOTE: the production `sync-file` event (case H) additionally
-schedules a 3s-delayed `update-file-library-sync-status` RPC, which fails headless (no backend; a
-swallowed URL-parse trace is benign). The interpreter absorbs it: `op-grace-ms` makes the run wait
-~3.2s after a `SyncFromLibrary` settles, so the failure lands inside case H instead of leaking into
-(and potentially destabilising) whichever test runs next.
+# TypeScript suite (the plugin) — full e2e
 
-## Frontend fidelity — read before extending
-The frontend runs the REAL production logic from the dispatched event onward, so observed semantics
-are genuine. But it drives a MINIMALLY-ASSEMBLED app: it installs a file into the global store and
-starts only the watchers known to be needed. The real app assembles its workspace via
-`initialize-workspace`, which wires many subscriptions; the harness reproduces only some.
+`plugins/apps/composable-test-suite/` — same principles against the FULL production app through the
+Plugin API (real frontend, real propagation). Continuation of the CLJS suite per issue #10584.
+Operational details (build/run, connect URL, remote control, reading logs, auto-reload, CI): the
+plugin README.
 
-The risk is SILENT UNDER-WIRING — a behaviour that works in the real app can be silently absent in
-the harness with no error (e.g. the undo stack is empty unless `watch-undo-stack` is started).
-Therefore: when adding a case needing app behaviour beyond a raw edit (undo, persistence, selection,
-layout, thumbnails, library auto-detection), first check whether that behaviour lives in an
-`initialize-workspace` subscription the harness has not wired — and verify by PROBING store state,
-not by trusting a green assertion. The harness hand-wires two stand-ins (`install-file-event`,
-`watch-undo-stack`); track them for drift. A durable fix would be to drive the real
-`initialize-workspace` headlessly (not done — full init may pull in machinery that doesn't run
-cleanly headless).
+Distinguishing abstractions (the OOP articulation of the shared principles):
+- `TestCase {identifier, description, operation}` with the three-part description mandated in the
+  constructor docstring.
+- The accessor-interface principle is class-level: foundation operations (e.g.
+  `OpCreateSimpleComponentWithCopy`) expose the roles they build; **content-creation strategies**
+  (pluggable: what content a foundation builds around) expose accessors for the content they
+  created; edit operations expose their checks (`OpChangeProperty.assertHasChangedProperty`);
+  `OpOneOf`/`OpOptional` are queried for what ran. Tests never grope the document for something a
+  producer can be asked for.
+- `ShapeProp` model: property duals with numeric tolerance; rotation is a writable attr, height
+  goes via resize (readonly in the Plugin API).
+- `TestSuite` enumerates cases into a `TestTree` with stable per-test ids;
+  `run(ids, TestRunObserver)` is the ONLY output channel — the framework is UI-free by
+  construction. `plugin.ts` (panel adapter), `main.ts` (panel UI) and `src/ci/headless.ts`
+  (CI adapter) are three thin consumers.
+- Cases live in `src/composable-tests/cases/` as `case<Identifier>.ts` (e.g. `MainEditSyncs` — the
+  sweep that found #10109).
+- Panel checkboxes carry stable DOM ids (case identifier / `Identifier-N` composites) for remote
+  control via Playwright; recipe in the README.
 
-## Other caveats
-- Cross-namespace leaks land in this suite first because it (correctly) uses the real global
-  store: besides the store swap above, `frontend-tests.helpers.wasm/teardown-wasm-mocks!` used to
-  `set!` every WASM fn to nil when run against an empty snapshot (double teardown / async misuse of
-  `with-wasm-mocks*`), which a leaked debounced `resize-wasm-text` event then tripped over during
-  our cases (a "Store error: initialized? is not a function"). The teardown is now guarded
-  (no-op on empty snapshot). If a new inexplicable full-run-only failure appears here, suspect
-  leaked global state from a preceding namespace before suspecting the framework.
-- INLINE `Test` exceptions on the frontend are UNCAUGHT (they run during the async fold, not under
-  `check`'s try): a throwing checkpoint crashes the whole runner rather than failing one test.
-- A `RecordedChoice` wrapping a `Sequence` (i.e. `(optional (in-sequence […]))`) is NOT flattened by
-  `sequence-ops`, so `op->events` chokes on the `Sequence`. Use independent optionals instead (as
-  case K does with two `(optional make-nested-component)`), or have the interpreter recurse into a
-  choice's composite alternative.
-- The Serena symbol index / clj-kondo cache for `nodes.cljs` can go STALE and report PHANTOM symbols
-  or spurious "unresolved symbol" errors against code that compiles — TRUST THE BUILD (a real
-  `pnpm run build:test`), not the lint or the symbol overview, for this file.
-- Label-after-the-fact resolution: `add-child`'s `added-shape` resolves `:new-label` via `thi/id`,
-  relying on the global label map still reflecting that run's setup — unsound if a structural node
-  is swept via `one-of`. Fix when needed by capturing the created shape's id at apply-time (as roles
-  already do).
+## CI
+Headless per-PR gate: `.github/workflows/tests-composable-suite.yml` runs
+`pnpm --filter composable-test-suite run test:ci` — mocked backend (frontend e2e static server +
+Playwright RPC fixtures, no backend/login), the in-sandbox bundle injected via `ɵloadPlugin`,
+results streamed via console markers, `TEST_FILTER` by identifier substring. The mocked backend is
+NOT a limitation for this suite (everything asserted is frontend store logic; empirically
+confirmed against the interactive runs). Architecture mirrors `plugin-api-test-suite`'s CI driver;
+the mock harness exists in THREE places that must stay in sync (provenance note in `ci/run-ci.ts`).
+Details: README, "Running in CI".
 
 ## Substrate
 `mem:common/test-setup`, `mem:common/component-data-model`, `mem:common/component-swap-pipeline`,
diff --git a/.serena/memories/frontend/core.md b/.serena/memories/frontend/core.md
index b229e2b124..b5fb47dce4 100644
--- a/.serena/memories/frontend/core.md
+++ b/.serena/memories/frontend/core.md
@@ -23,7 +23,7 @@ From `frontend/`:
 - JS lint currently no-ops via `pnpm run lint:js`.
 - SCSS lint: `pnpm run lint:scss`.
 - Format checks: `pnpm run check-fmt:clj`, `pnpm run check-fmt:js`, `pnpm run check-fmt:scss`.
-- Format fix: `pnpm run fmt`, or targeted `fmt:clj` / `fmt:js` / `fmt:scss`.
+- Format fix: `pnpm run fmt`, or targeted `fmt:clj` / `fmt:js` / `fmt:scss`. After running `fmt:*`, `check-fmt:*` is redundant.
 - Translation formatting after i18n edits: `pnpm run translations`.
 
 **Before linting:** if delimiter errors are suspected (after LLM edits, or
diff --git a/.serena/memories/media-processor/core.md b/.serena/memories/media-processor/core.md
new file mode 100644
index 0000000000..209d4b1a37
--- /dev/null
+++ b/.serena/memories/media-processor/core.md
@@ -0,0 +1,100 @@
+# Media Processor
+
+Stateless HTTP service for Penpot image and font processing. Handles image info extraction, thumbnail generation (sharp), and font conversion (FontForge, woff-tools).
+
+## Tech Stack
+
+- Language: TypeScript
+- Runtime: Node.js
+- Framework: Express
+- Image processing: sharp (libvips)
+- Font processing: FontForge (TTF/OTF), sfnt2woff, woff2_decompress
+- Upload handling: multer (hybrid storage: memory for small, disk for large)
+- Logging: pino (with optional Loki transport)
+- Config validation: Zod
+- Testing: Vitest
+- Package Manager: pnpm
+
+## Project Structure
+
+```
+media-processor/
+├── src/
+│   ├── index.ts              # Express app setup, routes, middleware
+│   ├── config.ts             # Zod-validated env config, HKDF key derivation
+│   ├── types.ts              # TypeScript type definitions
+│   ├── upload.ts             # Multer configuration, getFileBuffer helper
+│   ├── upload-storage.ts     # Hybrid storage engine (memory < threshold, disk >= threshold)
+│   ├── logger.ts             # Pino logger setup
+│   ├── middleware/
+│   │   ├── auth.ts           # Timing-safe shared key authentication
+│   │   ├── error-handler.ts  # ProcessingError class, centralized error handling
+│   │   └── timeout.ts        # Request timeout middleware
+│   ├── routes/
+│   │   ├── health.ts         # GET /api/health
+│   │   ├── image.ts          # POST /api/image/info, /api/image/thumbnail
+│   │   └── font.ts           # POST /api/font/convert
+│   └── services/
+│       ├── image.ts          # sharp-based image info/thumbnail generation
+│       ├── font.ts           # FontForge/woff-tools font conversion
+│       └── errors.ts         # throwValidation, throwRestriction, throwProcessing
+├── test/                     # Vitest test files
+├── vitest.config.ts          # Test configuration
+├── tsconfig.json             # TypeScript configuration
+├── esbuild.config.mjs        # Build configuration
+└── package.json              # Dependencies and scripts
+```
+
+## Key Conventions
+
+### Auth
+- Requests authenticated via `x-shared-key` header using timing-safe comparison
+- When no key configured, all requests rejected with 403
+- Key derived from `PENPOT_SECRET_KEY` via HKDF (blake2b512) or set directly via `PENPOT_MEDIA_PROCESSOR_SHARED_KEY`
+
+### Resource Limits
+- Image: max pixels, max width/height enforced before processing
+- Font: prlimit wraps FontForge processes with memory (AS) and CPU time limits
+- Concurrency: p-queue limits concurrent requests (default 10)
+- Upload: hybrid storage — memory for files < 10MB, disk for larger; configurable via `PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD`
+- Max file size: configurable (default 350MB)
+
+### Error Handling
+- `throwValidation(code, hint)` — 400 errors for invalid input
+- `throwRestriction(code, hint)` — 413 errors for resource limits exceeded
+- `throwProcessing(code, hint)` — 503 errors for processing failures (e.g., resource limit kills)
+
+### Image Processing
+- EXIF orientation applied before dimension validation and thumbnail generation
+- sharp caching disabled to prevent unbounded memory growth
+- `withoutEnlargement: true` prevents upscaling small images
+
+### Font Conversion
+- Supported formats: TTF, OTF, WOFF, WOFF2
+- SFNT type detected via magic bytes (0x4f54544f = OTF, 0x00010000 = TTF)
+- Temp files cleaned up in finally blocks (best-effort)
+
+## Commands
+
+All commands run from `media-processor/` directory:
+
+- `pnpm run test` — Run Vitest test suite
+- `pnpm run types:check` — TypeScript type checking (tsc --noEmit)
+- `pnpm run fmt` — Format code with Prettier
+- `pnpm run fmt:check` — Check formatting without modifying
+- `pnpm run build` — Build for production (esbuild)
+- `pnpm run start:dev` — Start development server (tsx)
+
+## Docker
+
+- Exposed port: 6065 (configurable via `PENPOT_MEDIA_PROCESSOR_PORT`)
+- Must be deployed on internal Docker network only (not public-facing)
+- Backend communicates via `PENPOT_MEDIA_PROCESSING_SERVICE_URI`
+
+## Testing Principles
+
+Cross-cutting testing principles and anti-patterns: `mem:testing`.
+
+- Run `pnpm run test` after changes
+- Run `pnpm run types:check` after TypeScript changes
+- Run `pnpm run fmt:check` before commits
diff --git a/.serena/memories/scripts/error-reports.md b/.serena/memories/scripts/error-reports.md
new file mode 100644
index 0000000000..126aae7903
--- /dev/null
+++ b/.serena/memories/scripts/error-reports.md
@@ -0,0 +1,289 @@
+# Error Reports CLI Tool
+
+`scripts/error-reports.mjs` is a Node.js CLI tool for querying Penpot error reports via the RPC API. Provides access to error logs with filtering, pagination, and multiple output formats.
+
+## When to use
+
+- Querying error reports from the database for debugging or analysis
+- Filtering errors by source, kind, tenant, or backend version
+- Exporting error data in JSON, NDJSON, or table format
+- Computing error statistics (top signatures, version, source, audit-log kind, hourly distribution, bursts, heatmap)
+- Investigating specific error reports by ID
+
+## Prerequisites
+
+- Node.js with `commander` and `dotenv` packages installed (in root `package.json`)
+- Running Penpot backend with error-reports RPC endpoints
+- Access token with `error-reports:read` permission
+
+## Configuration
+
+Create a `.env` file in the project root:
+
+```bash
+PENPOT_API_URI=http://localhost:3450
+PENPOT_ACCESS_TOKEN=<your-token>
+```
+
+Grant the required permission to your access token:
+
+```sql
+UPDATE access_token
+SET perms = ARRAY['error-reports:read']::text[],
+    updated_at = now()
+WHERE id = '<token-uuid>';
+```
+
+## Usage
+
+```bash
+./scripts/error-reports.mjs <command> [options]
+```
+
+### Commands
+
+#### `list` - List error reports with pagination and filters
+
+```bash
+./scripts/error-reports.mjs list [options]
+```
+
+**Options:**
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `-l, --limit <n>` | Max items per page (max: 200) | `50` |
+| `--from <date>` | ISO timestamp — oldest boundary (items after this) | — |
+| `--to <date>` | ISO timestamp — newest boundary (items before this) | — |
+| `--since <date>` | ISO timestamp — explicit cursor for manual pagination | — |
+| `--since-id <uuid>` | Fetch errors after this ID (cursor pagination) | — |
+| `-s, --source <name>` | Filter by source (see source names below) | — |
+| `-p, --profile-id <uuid>` | Filter by profile ID | — |
+| `-k, --kind <kind>` | Filter by kind (string) | — |
+| `-t, --tenant <tenant>` | Filter by tenant (string) | — |
+| `--version <version>` | Filter by version | — |
+| `--hint <text>` | Filter by hint (ILIKE match) | — |
+| `-a, --all` | Fetch all pages automatically (streams output) | `false` |
+| `-f, --format <type>` | Output format: `json`, `table`, or `ndjson` | `table` |
+| `--normalize-hints` | Normalize hints by stripping dynamic values | `false` |
+| `-o, --output <file>` | Write output to file instead of stdout | — |
+| `--env <path>` | Custom .env file path | `.env` |
+| `-h, --help` | Show help message | — |
+
+**Streaming behavior:** With `--all`, output must be `ndjson` or `table`; `--all --format json` is rejected because `--all` streams output. `--all --format table` prints rows immediately. `--format ndjson` always streams one JSON object per line.
+
+#### `get` - Get a single error report by ID
+
+```bash
+./scripts/error-reports.mjs get [options]
+```
+
+**Options:**
+
+| Flag | Description | Required |
+|------|-------------|----------|
+| `--id <uuid>` | Error report ID | Yes (or --error-id) |
+| `--error-id <id>` | Error report error-id | Yes (or --id) |
+| `-f, --format <type>` | Output format: `json` or `table` | No (default: `table`) |
+| `--env <path>` | Custom .env file path | No (default: `.env`) |
+| `-h, --help` | Show help message | No |
+
+#### `stats` - Compute error report statistics
+
+```bash
+./scripts/error-reports.mjs stats [options]
+```
+
+Reads from `--input <file>`, stdin (piped), or fetches from API. Computes aggregations by signature, version, source, audit-log kind, hour, optional 5-minute bursts, and optional day-of-week × hour heatmap.
+
+**Options:**
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--from <date>` | Start of interval (ISO timestamp) | — |
+| `--to <date>` | End of interval (ISO timestamp) | — |
+| `--limit <n>` | Items per page when fetching from API | `200` |
+| `--input <file>` | Read from local JSON/NDJSON file instead of API | — |
+| `--burst` | Detect 5-minute windows above 3× the average rate | `false` |
+| `--heatmap` | Show day-of-week × hour-of-day heatmap | `false` |
+| `-f, --format <type>` | Output format: `json` or `table` | `table` |
+| `--env <path>` | Custom .env file path | `.env` |
+
+## Source Names
+
+The `--source` filter accepts these values:
+
+- `logging`
+- `audit-log`
+- `rlimit`
+
+## Hint Normalization
+
+With `--normalize-hints` (or always in `stats`), hints are normalized by stripping dynamic values:
+
+1. File IDs in file-id context → `<file-id>`
+2. UUIDs (8-4-4-4-12 hex) → `<uuid>`
+3. Numeric IDs in parentheses `(12345)` → `(<id>)`
+4. Elapsed times (`7.5s`, `2m3.027s`) → `<elapsed>`
+5. URIs (`https://...`) → `<uri>`
+6. Unicode quotes and whitespace normalized
+
+## Examples
+
+### List recent errors
+```bash
+./scripts/error-reports.mjs list --limit 10
+```
+
+### Time-range query (today)
+```bash
+./scripts/error-reports.mjs list --from 2026-07-23T00:00:00Z --to 2026-07-23T23:59:59Z --all
+```
+
+### Stream all errors as NDJSON
+```bash
+./scripts/error-reports.mjs list --all --format ndjson > errors.ndjson
+```
+
+### Save to file with --output
+```bash
+./scripts/error-reports.mjs list --all --format ndjson -o errors.ndjson
+./scripts/error-reports.mjs list --format json -o errors.json
+```
+
+### Filter by source
+```bash
+./scripts/error-reports.mjs list --source audit-log --limit 20
+```
+
+### Filter by kind
+```bash
+./scripts/error-reports.mjs list --kind exception-page
+```
+
+### Filter by tenant
+```bash
+./scripts/error-reports.mjs list --tenant production
+```
+
+### Filter by version
+```bash
+./scripts/error-reports.mjs list --version 2.1.0
+```
+
+### Search by hint (partial match)
+```bash
+./scripts/error-reports.mjs list --hint "NullPointerException"
+```
+
+### Fetch all errors with pagination
+```bash
+./scripts/error-reports.mjs list --all
+```
+
+### Get specific error by ID
+```bash
+./scripts/error-reports.mjs get --id 550e8400-e29b-41d4-a716-446655440000
+```
+
+### Output as JSON
+```bash
+./scripts/error-reports.mjs list --limit 5 --format json
+```
+
+### Combine filters
+```bash
+./scripts/error-reports.mjs list --source audit-log --kind exception-page --tenant production --limit 50
+```
+
+### Stats with burst and heatmap analysis
+```bash
+./scripts/error-reports.mjs stats --from 2026-07-23T00:00:00Z --to 2026-07-23T23:59:59Z --burst --heatmap
+```
+
+### Stats from file
+```bash
+./scripts/error-reports.mjs stats --input errors.json
+```
+
+### Stats from pipe
+```bash
+./scripts/error-reports.mjs list --all --format json | ./scripts/error-reports.mjs stats
+```
+
+## Output Formats
+
+### Table (default)
+Human-readable table format for terminal display. With `--all`, rows stream as they arrive.
+
+### JSON
+Single page: `{items: [...], nextSince, nextId}`. `--all` cannot be combined with `--format json`; use `--format ndjson` for streaming.
+
+### NDJSON
+One JSON object per line, always streaming. Pipe-friendly: `| jq -c '.hint'`, `| wc -l`.
+
+## Pagination
+
+The server returns items in **ascending** order (oldest first). Cursor pagination uses `--since` / `--since-id` to fetch the next page of newer items.
+
+### Manual pagination
+Use `--since` and `--since-id` with values from `nextSince` and `nextId` in the response:
+
+```bash
+./scripts/error-reports.mjs list --limit 50
+# Use nextSince and nextId from response
+./scripts/error-reports.mjs list --limit 50 --since "2026-01-20T10:29:00Z" --since-id "next-uuid"
+```
+
+### Automatic pagination
+Use `--all` to fetch all pages automatically (streams output):
+
+```bash
+./scripts/error-reports.mjs list --all
+```
+
+### Time-range queries
+Use `--from` and `--to` to bound the query. These map to the server's `--since` and `--until` parameters:
+
+```bash
+./scripts/error-reports.mjs list --from 2026-07-20T00:00:00Z --to 2026-07-23T23:59:59Z --all
+```
+
+## Key principles
+
+- **Authentication required** - Uses access token with `error-reports:read` permission
+- **API endpoint configurable** - Set via `PENPOT_API_URI` in `.env` file
+- **Table is default format** - Use `--format json` for structured JSON, `--format ndjson` for streaming
+- **Streaming with --all** - Items print as they arrive, no buffering. Use `--format ndjson` or `--format table`; `--all --format json` is rejected.
+- **Filters are combinable** - All filter options can be used together
+- **Both flag formats supported** - `--option=value` and `--option value` both work
+- **Ascending order** - Server returns oldest items first (changed from DESC)
+
+## Error handling
+
+The tool provides helpful error messages for common issues:
+
+- **Missing configuration**: Shows setup instructions for `.env` file
+- **Authentication errors (401)**: Indicates invalid or expired token
+- **Authorization errors (403)**: Indicates missing `error-reports:read` permission
+- **RPC errors**: Displays error code and message from the API
+
+## Integration with other scripts
+
+- **jq**: Pipe NDJSON output to `jq` for further processing
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | jq -c '{id, hint}'
+  ```
+- **stats from pipe**: Fetch data once, compute stats
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | ./scripts/error-reports.mjs stats
+  ```
+- **stats from NDJSON pipe**: Works with NDJSON format too
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | ./scripts/error-reports.mjs stats
+  ```
+- **grep/search**: Filter output by specific patterns
+- **--output**: Save to file without shell redirection
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson -o errors.ndjson
+  ```
diff --git a/.serena/memories/scripts/paren-repair.md b/.serena/memories/scripts/paren-repair.md
index 162e6d28d8..234a4c8688 100644
--- a/.serena/memories/scripts/paren-repair.md
+++ b/.serena/memories/scripts/paren-repair.md
@@ -29,7 +29,7 @@ bb scripts/paren-repair --help
 
 ## Native Tool Available (opencode)
 
-A native opencode tool `paren-repair` is available at `.opencode/tools/paren-repair.ts`.
+A native opencode tool `paren-repair` is available at `.opencode/scripts/paren-repair.ts`.
 The LLM can call it directly with:
 - `files`: Array of file paths to fix
 - `code`: Code string to fix via stdin
diff --git a/.serena/memories/testing.md b/.serena/memories/testing.md
index ce4990ba12..295da86212 100644
--- a/.serena/memories/testing.md
+++ b/.serena/memories/testing.md
@@ -137,17 +137,32 @@ E2E tests should not be added unless explicitly requested.
 
 ## Execution discipline
 
-When running CLJS/JS tests (frontend, common):
+**CRITICAL: Test output handling rules**
 
+When running ANY test command (CLJS/JS or JVM):
+
+1. **NEVER pipe test output directly to `| head`, `| tail`, `| grep`, or similar filters** — this can hide failures and cause you to miss critical errors.
+2. **ALWAYS pipe to a file first, then read the file:**
+   ```bash
+   # CORRECT:
+   pnpm run test 2>&1 > /tmp/test-output.txt
+   grep -A 5 "failures" /tmp/test-output.txt
+   
+   # WRONG:
+   pnpm run test 2>&1 | tail -20
+   pnpm run test 2>&1 | grep "failures"
+   ```
+3. **Use `--focus` to narrow test scope** instead of filtering output.
+4. **Read the full output file** to understand test results completely.
+
+When running CLJS/JS tests (frontend, common):
 - **Always use `pnpm run test:quiet`** — it silently builds the test bundle then runs the test runner, giving you clean test output.
-- **Never pipe test output through `tail`, `head`, or similar filters** — doing so can silently hide test failures. Use `--focus` to narrow scope instead.
-- **If you need to filter output, tee to a temp file first:** `pnpm run test:quiet 2>&1 | tee /tmp/penpot-test-output.txt`. The full output is preserved on disk so you can `grep`/`tail`/`head` the file without re-running.
 - Use `pnpm run test` when you want to see build output alongside test results (always builds, then runs).
 - After `build:test` has been run once, you can invoke the runner directly: `node target/tests/test.js [--focus ...] [--log-level ...]`.
 
 When running JVM tests (backend, common):
 - Use `clojure -M:dev:test` directly (no pnpm wrapper).
-- The same no-piping rule applies: use `--focus` to narrow scope.
+- Same file-piping rule applies.
 
 ## Verification Checklist
 
diff --git a/.serena/memories/workflow/creating-commits.md b/.serena/memories/workflow/creating-commits.md
index d37d4672a5..2fc766d4ad 100644
--- a/.serena/memories/workflow/creating-commits.md
+++ b/.serena/memories/workflow/creating-commits.md
@@ -14,6 +14,8 @@ automatically pull the identity from the local git config `user.name` and `user.
 :emoji: Subject line (imperative, capitalized, no period, <=70 chars)
 
 Body explaining what changed and why.
+Wrap lines at 72 characters — git log and tooling
+render long lines poorly. Keep each line concise.
 
 AI-assisted-by: model-name
 ```
@@ -25,3 +27,7 @@ AI-assisted-by: model-name
 ## Commit Type Emojis
 
 `:bug:` bug fix · `:sparkles:` enhancement · `:tada:` new feature · `:recycle:` refactor · `:lipstick:` cosmetic · `:ambulance:` critical fix · `:books:` docs · `:construction:` WIP · `:boom:` breaking · `:wrench:` config · `:zap:` perf · `:whale:` docker · `:paperclip:` other · `:arrow_up:` dep upgrade · `:arrow_down:` dep downgrade · `:fire:` removal · `:globe_with_meridians:` translations · `:rocket:` epic/highlight
+
+## Referencing Issues
+
+Use `Closes #NNNN` (not `Fixes #NNNN`) to link a commit to a GitHub issue.
diff --git a/.serena/memories/workflow/creating-prs.md b/.serena/memories/workflow/creating-prs.md
index 00252a7661..a92c199e22 100644
--- a/.serena/memories/workflow/creating-prs.md
+++ b/.serena/memories/workflow/creating-prs.md
@@ -30,7 +30,7 @@ See `mem:workflow/creating-commits` for emoji codes. Squash merge uses the PR ti
 
 Include concise sections covering:
 - what changed and why;
-- related GitHub issues or Taiga stories (`Fixes #NNNN`, `Relates to #NNNN`, `Taiga #NNNN`);
+- related GitHub issues or Taiga stories (`Closes #NNNN`, `Relates to #NNNN`, `Taiga #NNNN`);
 - screenshots or recordings for UI-visible changes;
 - testing performed and residual risk;
 - breaking changes or migration notes, if any.
@@ -42,15 +42,15 @@ PR descriptions follow this structure:
 
 ## What
 
-<one paragraph: the problem or feature, user-facing impact>
+<the problem or feature and its user-facing impact — short bullet items where there is more than one point>
 
 ## Why
 
-<root cause or motivation, why this change was necessary>
+<root cause or motivation — a short paragraph or bullets>
 
 ## How
 
-<high-level approach, key technical decisions>
+<high-level approach and key decisions — bullet items, grouped by area (bold lead-ins) for larger PRs>
 ```
 
 The "Note:" line is required at the top. Adjust if this is a manual (non-AI) PR.
@@ -59,6 +59,8 @@ The "Note:" line is required at the top. Adjust if this is a manual (non-AI) PR.
 
 - **Write for humans.** The diff shows what changed. The description explains why.
 - **Be concise.** Focus on reasoning: What was the problem? Why did it happen? How did you solve it?
+- **Prefer bullets over paragraphs.** Short bullet items, grouped by area with bold lead-ins where helpful, are far easier to digest than prose; keep any remaining paragraph to a few sentences.
+- **No manual line wraps.** Markdown renders adapting to the viewport; hard-wrapped lines degrade rendering. One line per paragraph or bullet, however long.
 - **Skip the obvious.** Don't explain what `git diff` already shows.
 
 ### What NOT to Include
diff --git a/AGENTS.md b/AGENTS.md
index b6aae1f32d..ac4da5c663 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,6 +8,9 @@
   wait for the user to push. Do not change the remote URL, do not switch SSH↔HTTPS.
 - **Never amend a commit that has been pushed** unless the user explicitly asks.
   If the user pushes, treat that commit as final from the agent's side.
+- **Never pipe test output directly to filters** (`| head`, `| tail`, `| grep`, etc.).
+  Always redirect to a file first: `command > /tmp/output.txt 2>&1`, then read/grep the file.
+  This prevents hiding test failures. See `mem:testing` for details.
 - **Read the workflow memory BEFORE the corresponding action**:
   - Before `git commit` → `mem:workflow/creating-commits` (commit format, AI-assisted-by trailer)
   - Before `gh issue create` → `mem:workflow/creating-issues` (title derivation, body template, Issue Type)
@@ -109,4 +112,5 @@ precision while maintaining a strong focus on maintainability and performance.
 - `scripts/nrepl-eval.mjs` — Evaluate Clojure code via nREPL (backend + frontend).
 - `scripts/check-commit` — Validate commit messages against Penpot's commit guidelines.
 - `scripts/check-fmt-clj` — Check Clojure formatting without modifying files.
+- `scripts/ci` — CI orchestration script for running lint, tests, and format checks across modules. See `scripts/ci --help`.
 
diff --git a/CHANGES.md b/CHANGES.md
index a9df8cff57..bcfd77b8bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,18 @@
 - Refactor wasm rulers and UI state [#10116](https://github.com/penpot/penpot/issues/10116) (PR: [#10461](https://github.com/penpot/penpot/pull/10461))
 - Improve team invitations modal in the dashboard [#10484](https://github.com/penpot/penpot/issues/10484) (PR: [#10459](https://github.com/penpot/penpot/pull/10459))
 
+
+## 2.17.1 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Fix malformed get-font-variants request when team-id is missing from dashboard URL [#10644](https://github.com/penpot/penpot/issues/10644) (PR: [#10645](https://github.com/penpot/penpot/pull/10645))
+- Fix malformed get-profiles-for-file-comments request when file-id is missing from workspace URL [#10652](https://github.com/penpot/penpot/issues/10652) (PR: [#10655](https://github.com/penpot/penpot/pull/10655))
+- Fix workspace crash when holding an arrow key on a selection due to excessive re-renders [#10726](https://github.com/penpot/penpot/issues/10726) (PR: [#10736](https://github.com/penpot/penpot/pull/10736))
+- Fix asset download failing with S3 auth conflict when using access token [#10776](https://github.com/penpot/penpot/issues/10776) (PR: [#10777](https://github.com/penpot/penpot/pull/10777))
+- Fix internal error when dragging inner layout with Boolean operations [#10647](https://github.com/penpot/penpot/issues/10647) (PR: [#10778](https://github.com/penpot/penpot/pull/10778))
+- Fix viewer crash with WASM panic when opening URL with page-id [#10800](https://github.com/penpot/penpot/issues/10800) (PR: [#10805](https://github.com/penpot/penpot/pull/10805))
+
 ## 2.17.0
 
 ### :rocket: Epics and highlights
@@ -59,49 +71,28 @@
 - Render guides in WebGL [#10068](https://github.com/penpot/penpot/issues/10068) (PR: [#10014](https://github.com/penpot/penpot/pull/10014))
 - Add configurable resource limits to ImageMagick image processing [#10223](https://github.com/penpot/penpot/issues/10223) (PR: [#10240](https://github.com/penpot/penpot/pull/10240))
 - Add resource limits to font processing child processes [#10234](https://github.com/penpot/penpot/issues/10234) (PR: [#10274](https://github.com/penpot/penpot/pull/10274))
-- Add color variants and positioning to selection size badge (by @bittoby) [#10258](https://github.com/penpot/penpot/issues/10258) (PR: [#9210](https://github.com/penpot/penpot/pull/9210))
+- Add color variants and positioning to selection size badge [#10258](https://github.com/penpot/penpot/issues/10258) (PR: [#9210](https://github.com/penpot/penpot/pull/9210))
 - Use hard reload for render engine switching in the workspace menu [#10441](https://github.com/penpot/penpot/issues/10441) (PR: [#10444](https://github.com/penpot/penpot/pull/10444))
 - Rotate size badge when shape is rotated [#10386](https://github.com/penpot/penpot/issues/10386) (PR: [#10393](https://github.com/penpot/penpot/pull/10393))
 - Add separate internal URI for exporter to handle Docker deployments where internal and public URIs differ [#10627](https://github.com/penpot/penpot/issues/10627) (PR: [#10630](https://github.com/penpot/penpot/pull/10630))
 
 ### :bug: Bugs fixed
 
-- Fix LDAP provider params schema typo (`bind-passwor` → `bind-password`) introduced during the `clojure.spec` → `malli` migration; the schema slot now matches the runtime key actually read by `prepare-params` (`:password (:bind-password cfg)`) and `try-connectivity` (`(:bind-password cfg)`), so a wrong type for the password no longer slips through unvalidated
-- Fix `login-with-ldap` silently dropping its error message on the `ldap-not-initialized` restriction (typo `:hide` → `:hint`); the message `"ldap auth provider is not initialized"` now actually surfaces in logs and error responses instead of being discarded into an unread key
-- Fix `get-view-only-bundle` crashing when a share-link viewer encounters a team member whose email lacks `@` (NullPointerException in `obfuscate-email`) or whose domain has no `.` (previously produced a dangling-dot `****@****.`); now the viewer-side obfuscation is nil-safe and omits the trailing dot when the domain has no TLD
-- Fix Copy as SVG: emit a single valid SVG document when multiple shapes are selected, and publish `image/svg+xml` to the clipboard so the paste target works in Inkscape and other SVG-native tools [Github #838](https://github.com/penpot/penpot/issues/838)
-- Add export panel to inspect styles tab [Taiga #13582](https://tree.taiga.io/project/penpot/issue/13582)
-- Fix styles between grid layout inputs [Taiga #13526](https://tree.taiga.io/project/penpot/issue/13526)
-- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
-- Update copy on penpot update message [Taiga #12924](https://tree.taiga.io/project/penpot/issue/12924)
-- Fix scroll on library modal [Taiga #13639](https://tree.taiga.io/project/penpot/issue/13639)
-- Fix dates to avoid show them in english when browser is in auto [Taiga #13786](https://tree.taiga.io/project/penpot/issue/13786)
-- Fix focus radio button [Taiga #13841](https://tree.taiga.io/project/penpot/issue/13841)
-- Token tree should be expanded by default [Taiga #13631](https://tree.taiga.io/project/penpot/issue/13631)
-- Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
-- Update onboarding image [Taiga #13864](https://tree.taiga.io/project/penpot/issue/13864)
-- Fix plugin modal drag interactions over iframe and close-button behavior (by @marekhrabe) [Github #8871](https://github.com/penpot/penpot/pull/8871)
-- Fix hot update on color-row on texts [Taiga #13923](https://tree.taiga.io/project/penpot/issue/13923)
-- Fix selected color tokens [Taiga #13930](https://tree.taiga.io/project/penpot/issue/13930)
-- Display resolved values of inactive tokens [Taiga #13628](https://tree.taiga.io/project/penpot/issue/13628)
-- Fix app crash when selecting shapes with one hidden [Taiga #13959](https://tree.taiga.io/project/penpot/issue/13959)
-- Fix opacity mixed value [Taiga #13960](https://tree.taiga.io/project/penpot/issue/13960)
-- Fix gap input throwing an error [Github #8984](https://github.com/penpot/penpot/pull/8984)
-- Fix copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
-- Fix colorpicker layout so the eyedropper button is visible again [Taiga #14057](https://tree.taiga.io/project/penpot/issue/14057)
+- Fix Plugin API variant creation failing due to undocumented multi-step workflow [#10075](https://github.com/penpot/penpot/issues/10075) (PR: [#10149](https://github.com/penpot/penpot/pull/10149))
+- Fix workspace crash when editing text shapes with degenerate selrect [#10617](https://github.com/penpot/penpot/issues/10617) (PR: [#10618](https://github.com/penpot/penpot/pull/10618))
 - Fix SVG stroke line join not applied when pasting strokes [#4836](https://github.com/penpot/penpot/issues/4836) (PR: [#9982](https://github.com/penpot/penpot/pull/9982), [#10019](https://github.com/penpot/penpot/pull/10019))
-- Fix blend-mode hover preview on canvas not reverted when dismissing dropdown (by @jack-stormentswe) [#9235](https://github.com/penpot/penpot/issues/9235) (PR: [#9237](https://github.com/penpot/penpot/pull/9237))
+- Fix blend-mode hover preview on canvas not reverted when dismissing dropdown (by @davidv399) [#9235](https://github.com/penpot/penpot/issues/9235) (PR: [#9237](https://github.com/penpot/penpot/pull/9237))
 - Fix View Mode mouse-leave and click in combination not working [#4855](https://github.com/penpot/penpot/issues/4855) (PR: [#9991](https://github.com/penpot/penpot/pull/9991))
 - Fix Storybook UI missing scrollbar (by @MilosM348) [#6049](https://github.com/penpot/penpot/issues/6049) (PR: [#9319](https://github.com/penpot/penpot/pull/9319))
 - Fix font selector missing intermediate font weights for Source Sans Pro and similar fonts (by @dhgoal) [#7378](https://github.com/penpot/penpot/issues/7378) (PR: [#9247](https://github.com/penpot/penpot/pull/9247))
-- Fix plugin API `typography.remove()` passing wrong parameter format (by @leonaIee) [#8223](https://github.com/penpot/penpot/issues/8223) (PR: [#9279](https://github.com/penpot/penpot/pull/9279))
+- Fix plugin API `typography.remove()` passing wrong parameter format (by @peter-rango) [#8223](https://github.com/penpot/penpot/issues/8223) (PR: [#9279](https://github.com/penpot/penpot/pull/9279))
 - Fix plugin API fills and strokes array elements being read-only (by @RenzoMXD) [#8357](https://github.com/penpot/penpot/issues/8357) (PR: [#9161](https://github.com/penpot/penpot/pull/9161))
 - Fix "Show Guides" shortcut not working on German keyboards (by @RenzoMXD) [#8423](https://github.com/penpot/penpot/issues/8423) (PR: [#9209](https://github.com/penpot/penpot/pull/9209))
 - Fix token validation failing when a malformed token exists in the Component category [#9010](https://github.com/penpot/penpot/issues/9010) (PR: [#9025](https://github.com/penpot/penpot/pull/9025), [#9825](https://github.com/penpot/penpot/pull/9825))
 - Fix Docker frontend image missing CSS reference (by @NativeTeachingAidsB) [#9135](https://github.com/penpot/penpot/issues/9135) (PR: [#9840](https://github.com/penpot/penpot/pull/9840))
 - Fix MCP media upload error and SVG data URI image parsing (by @claytonlin1110) [#9164](https://github.com/penpot/penpot/issues/9164) (PR: [#9201](https://github.com/penpot/penpot/pull/9201))
-- Fix lost-update race on team features during concurrent file creation (by @JPette1783) [#9197](https://github.com/penpot/penpot/issues/9197) (PR: [#9198](https://github.com/penpot/penpot/pull/9198))
-- Fix get-profile RPC method silently masking DB errors as "Anonymous User" (by @jack-stormentswe) [#9253](https://github.com/penpot/penpot/issues/9253) (PR: [#9254](https://github.com/penpot/penpot/pull/9254))
+- Fix lost-update race on team features during concurrent file creation (by @Lobster-0429) [#9197](https://github.com/penpot/penpot/issues/9197) (PR: [#9198](https://github.com/penpot/penpot/pull/9198))
+- Fix get-profile RPC method silently masking DB errors as "Anonymous User" (by @davidv399) [#9253](https://github.com/penpot/penpot/issues/9253) (PR: [#9254](https://github.com/penpot/penpot/pull/9254))
 - Fix crash when creating or editing tokens named "white" or "black" [#9256](https://github.com/penpot/penpot/issues/9256) (PR: [#9034](https://github.com/penpot/penpot/pull/9034))
 - Fix conditional use-ctx hook violation in shape-wrapper (by @Dexterity104) [#9280](https://github.com/penpot/penpot/issues/9280) (PR: [#9281](https://github.com/penpot/penpot/pull/9281))
 - Make ShapeImageIds byte conversion fallible to prevent panics (by @Dexterity104) [#9282](https://github.com/penpot/penpot/issues/9282) (PR: [#9283](https://github.com/penpot/penpot/pull/9283))
diff --git a/backend/deps.edn b/backend/deps.edn
index c60adf10ca..1450f4de58 100644
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -6,7 +6,7 @@
   org.clojure/clojure {:mvn/version "1.12.5"}
   org.clojure/tools.namespace {:mvn/version "1.5.1"}
 
-  com.github.luben/zstd-jni {:mvn/version "1.5.7-11"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.7-12"}
 
   io.prometheus/simpleclient {:mvn/version "0.16.0"}
   io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
@@ -34,27 +34,28 @@
    :exclusions [org.slf4j/slf4j-api]}
 
   com.github.seancorfield/next.jdbc
-  {:mvn/version "1.3.1108"}
+  {:mvn/version "1.3.1118"}
 
   metosin/reitit-core {:mvn/version "0.10.1"}
   nrepl/nrepl {:mvn/version "1.7.0"}
 
-  org.postgresql/postgresql {:mvn/version "42.7.12"}
-  org.xerial/sqlite-jdbc {:mvn/version "3.53.2.0"}
+  org.postgresql/postgresql {:mvn/version "42.7.13"}
+  org.xerial/sqlite-jdbc {:mvn/version "3.53.2.1"}
 
-  com.zaxxer/HikariCP {:mvn/version "7.0.2"}
+  com.zaxxer/HikariCP {:mvn/version "7.1.0"}
 
   io.whitfin/siphash {:mvn/version "2.0.0"}
 
   buddy/buddy-hashers {:mvn/version "2.0.167"}
   buddy/buddy-sign {:mvn/version "3.6.1-359"}
+  org.passay/passay {:mvn/version "1.6.6"}
 
   com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.4"}
 
-  org.jsoup/jsoup {:mvn/version "1.22.2"}
+  org.jsoup/jsoup {:mvn/version "1.23.1"}
 
   at.yawk.lz4/lz4-java
-  {:mvn/version "1.11.0"}
+  {:mvn/version "1.11.1"}
 
   org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
 
@@ -63,8 +64,8 @@
 
   ;; Pretty Print specs
   pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.46.18"}
-  software.amazon.awssdk/sts {:mvn/version "2.46.18"}}
+  software.amazon.awssdk/s3 {:mvn/version "2.50.1"}
+  software.amazon.awssdk/sts {:mvn/version "2.50.1"}}
 
  :paths ["src" "resources" "target/classes"]
  :aliases
diff --git a/backend/dev/user.clj b/backend/dev/user.clj
index 406d0c53fd..16908f4cab 100644
--- a/backend/dev/user.clj
+++ b/backend/dev/user.clj
@@ -104,24 +104,20 @@
   []
   (try
     (main/start)
-    :started
     (catch Throwable cause
       (ex/print-throwable cause))))
 
 (defn- stop
   []
-  (main/stop)
-  :stopped)
+  (main/stop))
 
 (defn restart
   []
-  (stop)
-  (repl/refresh :after 'user/start))
+  (main/restart))
 
 (defn restart-all
   []
-  (stop)
-  (repl/refresh-all :after 'user/start))
+  (main/restart-all))
 
 ;; (defn compression-bench
 ;;   [data]
diff --git a/backend/package.json b/backend/package.json
index 96bd4cbada..c6baf43f73 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -4,23 +4,25 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "dependencies": {
-    "luxon": "^3.4.4",
-    "sax": "^1.6.0"
+    "eventsource-parser": "^3.0.6",
+    "luxon": "^3.7.2",
+    "sax": "^1.6.1"
   },
   "devDependencies": {
     "nodemon": "^3.1.14",
     "source-map-support": "^0.5.21",
-    "ws": "^8.21.0"
+    "ws": "^8.21.1"
   },
   "scripts": {
-    "lint": "clj-kondo --parallel --lint ../common/src src/",
-    "check-fmt": "cljfmt check --parallel=true src/ test/",
-    "fmt": "cljfmt fix --parallel=true src/ test/"
+    "lint:clj": "clj-kondo --config-dir ../.clj-kondo --lint ../common/src src/",
+    "check-fmt:clj": "cljfmt check --parallel=true src/ test/",
+    "fmt:clj": "cljfmt fix --parallel=true src/ test/",
+    "test:e2e": "node --test --test-concurrency=1 test/e2e/*.test.mjs"
   }
 }
diff --git a/backend/pnpm-lock.yaml b/backend/pnpm-lock.yaml
index d789e2c2f8..a0b16465e9 100644
--- a/backend/pnpm-lock.yaml
+++ b/backend/pnpm-lock.yaml
@@ -8,12 +8,15 @@ importers:
 
   .:
     dependencies:
+      eventsource-parser:
+        specifier: ^3.0.6
+        version: 3.1.0
       luxon:
-        specifier: ^3.4.4
+        specifier: ^3.7.2
         version: 3.7.2
       sax:
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: ^1.6.1
+        version: 1.6.1
     devDependencies:
       nodemon:
         specifier: ^3.1.14
@@ -22,8 +25,8 @@ importers:
         specifier: ^0.5.21
         version: 0.5.21
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.1
+        version: 8.21.1
 
 packages:
 
@@ -39,9 +42,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  brace-expansion@5.0.7:
-    resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -63,6 +66,10 @@ packages:
       supports-color:
         optional: true
 
+  eventsource-parser@3.1.0:
+    resolution: {integrity: sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==}
+    engines: {node: '>=18.0.0'}
+
   fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
@@ -130,8 +137,8 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
-  sax@1.6.0:
-    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
+  sax@1.6.1:
+    resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==}
     engines: {node: '>=11.0.0'}
 
   semver@7.8.5:
@@ -165,8 +172,8 @@ packages:
   undefsafe@2.0.5:
     resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -188,7 +195,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  brace-expansion@5.0.7:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -216,6 +223,8 @@ snapshots:
     optionalDependencies:
       supports-color: 5.5.0
 
+  eventsource-parser@3.1.0: {}
+
   fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
@@ -247,7 +256,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.7
+      brace-expansion: 5.0.9
 
   ms@2.1.3: {}
 
@@ -274,7 +283,7 @@ snapshots:
     dependencies:
       picomatch: 2.3.2
 
-  sax@1.6.0: {}
+  sax@1.6.1: {}
 
   semver@7.8.5: {}
 
@@ -301,4 +310,4 @@ snapshots:
 
   undefsafe@2.0.5: {}
 
-  ws@8.21.0: {}
+  ws@8.21.1: {}
diff --git a/backend/pnpm-workspace.yaml b/backend/pnpm-workspace.yaml
index e69de29bb2..b3fbd9192b 100644
--- a/backend/pnpm-workspace.yaml
+++ b/backend/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+minimumReleaseAgeExclude:
+  - brace-expansion@5.0.8 || 5.0.9
diff --git a/backend/resources/app/email/invite-to-org/en.html b/backend/resources/app/email/invite-to-organization/en.html
similarity index 95%
rename from backend/resources/app/email/invite-to-org/en.html
rename to backend/resources/app/email/invite-to-organization/en.html
index fd5ee679b0..2a23407f4b 100644
--- a/backend/resources/app/email/invite-to-org/en.html
+++ b/backend/resources/app/email/invite-to-organization/en.html
@@ -219,9 +219,15 @@
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
                         "{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its
-                        teams and files goes
-                        through your organization's identity provider. If you can't get in, your account probably isn't
-                        in the directory yet.
+                        teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet.
                         To get access, contact the organization owner.
                       </div>
                     </td>
diff --git a/backend/resources/app/email/invite-to-org/en.subj b/backend/resources/app/email/invite-to-organization/en.subj
similarity index 100%
rename from backend/resources/app/email/invite-to-org/en.subj
rename to backend/resources/app/email/invite-to-organization/en.subj
diff --git a/backend/resources/app/email/invite-to-org/en.txt b/backend/resources/app/email/invite-to-organization/en.txt
similarity index 60%
rename from backend/resources/app/email/invite-to-org/en.txt
rename to backend/resources/app/email/invite-to-organization/en.txt
index 4b94fe6331..72c97eead7 100644
--- a/backend/resources/app/email/invite-to-org/en.txt
+++ b/backend/resources/app/email/invite-to-organization/en.txt
@@ -3,8 +3,10 @@ Hello!
 {{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization.name|abbreviate:50 }}”.
 
 {% if organization.sso-active %}
-"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files goes
-through your organization's identity provider. If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
+
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
 {% endif %}
 
 Accept invitation using this link:
diff --git a/backend/resources/app/email/invite-to-team/en.html b/backend/resources/app/email/invite-to-team/en.html
index 9035d01a70..02e148a2ec 100644
--- a/backend/resources/app/email/invite-to-team/en.html
+++ b/backend/resources/app/email/invite-to-team/en.html
@@ -197,10 +197,15 @@
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
                         "{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to
-                        its
-                        teams and files goes
-                        through your organization's identity provider. If you can't get in, your account probably isn't
-                        in the directory yet.
+                        its teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet.
                         To get access, contact the organization owner.
                       </div>
                     </td>
@@ -257,4 +262,4 @@
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/backend/resources/app/email/invite-to-team/en.txt b/backend/resources/app/email/invite-to-team/en.txt
index 8cdced742a..ecbd5d0be1 100644
--- a/backend/resources/app/email/invite-to-team/en.txt
+++ b/backend/resources/app/email/invite-to-team/en.txt
@@ -3,8 +3,10 @@ Hello!
 {{invited-by|abbreviate:25}} has invited you to join the team "{{ team|abbreviate:50 }}"{% if organization %}, part of the organization "{{ organization.name|abbreviate:50 }}"{% endif %}.
 
 {% if organization.sso-active %}
-"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files goes
-through your organization's identity provider. If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
+
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
 {% endif %}
 
 Accept invitation using this link:
diff --git a/backend/resources/app/email/organization-setup-sso/en.html b/backend/resources/app/email/organization-setup-sso/en.html
index cfc72548ad..4d1f3395c6 100644
--- a/backend/resources/app/email/organization-setup-sso/en.html
+++ b/backend/resources/app/email/organization-setup-sso/en.html
@@ -179,7 +179,7 @@
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        Hi{% if user-name %} {{ user-name|abbreviate:25 }}{% endif %},
+                        Hi,
                       </div>
                     </td>
                   </tr>
@@ -188,8 +188,16 @@
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
                         "{{ organization-name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its
-                        teams and files goes through your organization's identity provider. If you can't get in, your
-                        account probably isn't in the directory yet. To get access, contact the organization owner.
+                        teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet. To get access, contact the
+                        organization owner.
                       </div>
                     </td>
                   </tr>
diff --git a/backend/resources/app/email/organization-setup-sso/en.subj b/backend/resources/app/email/organization-setup-sso/en.subj
index e8e3e42f39..1a34f020f6 100644
--- a/backend/resources/app/email/organization-setup-sso/en.subj
+++ b/backend/resources/app/email/organization-setup-sso/en.subj
@@ -1 +1 @@
-“{{ organization-name|abbreviate:25 }}” has set up single sign-on (SSO) in Penpot
+“{{ organization-name|abbreviate:25 }}” uses single sign-on
diff --git a/backend/resources/app/email/organization-setup-sso/en.txt b/backend/resources/app/email/organization-setup-sso/en.txt
index 4521da3160..976809e451 100644
--- a/backend/resources/app/email/organization-setup-sso/en.txt
+++ b/backend/resources/app/email/organization-setup-sso/en.txt
@@ -1,7 +1,8 @@
-Hello!
+Hi,
 
-"{{ organization-name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files goes
-through your organization's identity provider. If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+"{{ organization-name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
 
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
 
 The Penpot team.
diff --git a/backend/resources/app/templates/error-list.tmpl b/backend/resources/app/templates/error-list.tmpl
index 043a29034e..2f6f9da735 100644
--- a/backend/resources/app/templates/error-list.tmpl
+++ b/backend/resources/app/templates/error-list.tmpl
@@ -10,9 +10,10 @@ penpot - error list
       <a href="/dbg"> [BACK]</a>
       <h1>Error reports (last 300)</h1>
 
-      <a class="{% if version = 3 %}strong{% endif %}" href="?version=3">[BACKEND ERRORS]</a>
-      <a class="{% if version = 4 %}strong{% endif %}" href="?version=4">[FRONTEND ERRORS]</a>
-      <a class="{% if version = 5 %}strong{% endif %}" href="?version=5">[RLIMIT REPORTS]</a>
+      <a class="{% if source = 0 %}strong{% endif %}" href="?source=0">[ALL ERRORS]</a>
+      <a class="{% if source = 3 %}strong{% endif %}" href="?source=3">[BACKEND ERRORS]</a>
+      <a class="{% if source = 4 %}strong{% endif %}" href="?source=4">[FRONTEND ERRORS]</a>
+      <a class="{% if source = 5 %}strong{% endif %}" href="?source=5">[RLIMIT REPORTS]</a>
     </div>
   </nav>
   <main class="horizontal-list">
diff --git a/backend/resources/app/templates/error-report.v3.tmpl b/backend/resources/app/templates/error-report.v3.tmpl
index a3eddfaa86..63efeba506 100644
--- a/backend/resources/app/templates/error-report.v3.tmpl
+++ b/backend/resources/app/templates/error-report.v3.tmpl
@@ -6,7 +6,7 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v3)
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#props">props</a>]</div>
   <div>[<a href="#context">context</a>]</div>
diff --git a/backend/resources/app/templates/error-report.v4.tmpl b/backend/resources/app/templates/error-report.v4.tmpl
index 37a066a623..6e466bc6e4 100644
--- a/backend/resources/app/templates/error-report.v4.tmpl
+++ b/backend/resources/app/templates/error-report.v4.tmpl
@@ -6,11 +6,11 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#context">context</a>]</div>
-  {% if report %}
-  <div>[<a href="#report">report</a>]</div>
+  {% if trace %}
+  <div>[<a href="#trace">trace</a>]</div>
   {% endif %}
 </nav>
 <main>
@@ -20,7 +20,7 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
       <div class="table-val">
         <h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
         <h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
-        <h2><span class="not-important">Origin:</span> <br/> {{origin}}</h2>
+        <h2><span class="not-important">Kind:</span> <br/> {{kind}}</h2>
         <h2><span class="not-important">HREF:</span> <br/> {{href}}</h2>
       </div>
     </div>
@@ -33,11 +33,11 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
       </div>
     </div>
 
-    {% if report %}
+    {% if trace %}
     <div class="table-row multiline">
-      <div id="report" class="table-key">REPORT:</div>
+      <div id="trace" class="table-key">TRACE:</div>
       <div class="table-val">
-        <pre>{{report}}</pre>
+        <pre>{{trace}}</pre>
       </div>
     </div>
     {% endif %}
diff --git a/backend/resources/app/templates/error-report.v5.tmpl b/backend/resources/app/templates/error-report.v5.tmpl
index 0fe8865dd8..d025287cf7 100644
--- a/backend/resources/app/templates/error-report.v5.tmpl
+++ b/backend/resources/app/templates/error-report.v5.tmpl
@@ -6,10 +6,10 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Rate Limit Report
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#context">context</a>]</div>
-  <div>[<a href="#result">result</a>]</div>
+  <div>[<a href="#value">value</a>]</div>
 </nav>
 <main>
   <div class="table">
@@ -30,9 +30,9 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Rate Limit Report
     </div>
 
     <div class="table-row multiline">
-      <div id="result" class="table-key">RESULT: </div>
+      <div id="value" class="table-key">VALUE: </div>
       <div class="table-val">
-        <pre>{{result}}</pre>
+        <pre>{{value}}</pre>
       </div>
     </div>
   </div>
diff --git a/backend/resources/climit.edn b/backend/resources/climit.edn
index 7d8234499b..66ac82b174 100644
--- a/backend/resources/climit.edn
+++ b/backend/resources/climit.edn
@@ -39,4 +39,10 @@
  {:permits 3}
 
  :create-file-snapshot/by-profile
- {:permits 1 :queue 2 :timeout 60000}}
+ {:permits 1 :queue 2 :timeout 60000}
+
+ :send-user-feedback/global
+ {:permits 4}
+
+ :send-user-feedback/by-profile
+ {:permits 1 :queue 3}}
diff --git a/backend/scripts/_env b/backend/scripts/_env
index 58ea02ede0..724b55f05b 100644
--- a/backend/scripts/_env
+++ b/backend/scripts/_env
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-export PENPOT_NITRATE_SHARED_KEY=super-secret-nitrate-api-key
+export PENPOT_ADMIN_CONSOLE_SHARED_KEY=super-secret-nitrate-api-key
 export PENPOT_EXPORTER_SHARED_KEY=super-secret-exporter-api-key
 export PENPOT_NEXUS_SHARED_KEY=super-secret-nexus-api-key
 export PENPOT_SECRET_KEY=super-secret-devenv-key
+export PENPOT_MEDIA_PROCESSOR_SHARED_KEY=super-secret-media-processor-key
 
 # DEPRECATED: only used for subscriptions
 export PENPOT_MANAGEMENT_API_KEY=super-secret-management-api-key
@@ -12,6 +13,10 @@ export PENPOT_MANAGEMENT_API_KEY=super-secret-management-api-key
 # PENPOT_DATABASE_*, PENPOT_REDIS_URI, PENPOT_OBJECTS_STORAGE_*, AWS_*) is owned by
 # docker/devenv/defaults.env and injected via the main service's env block.
 
+if [ -f /home/selfsigned.crt ]; then
+    export NODE_EXTRA_CA_CERTS=/home/selfsigned.crt;
+fi
+
 # Background worker flag is per-instance. Defaults to enabled (ws0); ws1+
 # overlays set PENPOT_BACKEND_WORKER=false so scheduled and async tasks only
 # run on ws0, keeping notification Pub/Sub bound to a single Valkey. See
@@ -21,6 +26,8 @@ if [[ "${PENPOT_BACKEND_WORKER:-true}" == "true" ]]; then
     __worker_flag="enable-backend-worker"
 fi
 
+export PENPOT_MEDIA_PROCESSING_SERVICE_URI=http://localhost:6065
+
 export PENPOT_FLAGS="\
        $PENPOT_FLAGS \
        enable-login-with-password \
@@ -36,12 +43,14 @@ export PENPOT_FLAGS="\
        enable-feature-fdata-objects-map \
        enable-audit-log \
        enable-transit-readable-response \
+       disable-remote-media-processing \
        enable-demo-users \
        enable-user-feedback \
        disable-secure-session-cookies \
        enable-smtp \
        enable-prepl-server \
        enable-urepl-server \
+       enable-nrepl-server \
        enable-rpc-climit \
        enable-rpc-rlimit \
        enable-quotes \
@@ -70,7 +79,7 @@ export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
 
 export PENPOT_USER_FEEDBACK_DESTINATION="support@example.com"
 
-export PENPOT_NITRATE_BACKEND_URI=http://localhost:3000/admin-console
+export PENPOT_ADMIN_CONSOLE_URI=http://localhost:3000/admin-console
 
 export JAVA_OPTS="\
        -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
@@ -96,5 +105,3 @@ function setup_minio() {
     mc alias set penpot-s3/ "${PENPOT_OBJECTS_STORAGE_S3_ENDPOINT}" minioadmin minioadmin -q
     mc mb "penpot-s3/${PENPOT_OBJECTS_STORAGE_S3_BUCKET}" -p -q
 }
-
-
diff --git a/backend/src/app/auth/oidc.clj b/backend/src/app/auth/oidc.clj
index 37f7280b69..ecf8b658a5 100644
--- a/backend/src/app/auth/oidc.clj
+++ b/backend/src/app/auth/oidc.clj
@@ -459,9 +459,10 @@
     (let [{:keys [status body]} (http/req cfg req {:skip-ssrf-check? (:skip-ssrf-check? provider)})]
       (if (= status 200)
         (let [data (json/decode body)
-              data {:token/access (get data :access_token)
-                    :token/id     (get data :id_token)
-                    :token/type   (get data :token_type)}]
+              data {:token/access     (get data :access_token)
+                    :token/id         (get data :id_token)
+                    :token/type       (get data :token_type)
+                    :token/expires-in (get data :expires_in)}]
           (l/trc :hint "access token fetched"
                  :token-id (:token/id data)
                  :token-type (:token/type data)
@@ -619,6 +620,9 @@
       (some? (:external-session-id state))
       (assoc :external-session-id (:external-session-id state))
 
+      (some? (:token/expires-in tdata))
+      (assoc :sso-token-exp (ct/in-future {:seconds (:token/expires-in tdata)}))
+
       ;; If state token comes with props, merge them. The state token
       ;; props can contain pm_ and utm_ prefixed query params.
       (map? (:props state))
@@ -765,40 +769,36 @@
   [value]
   (when-not (str/blank? value) value))
 
-(defn org-sso-discovery-uri
-  "Return the OIDC discovery URI from an org SSO config, preferring :issuer."
+(defn organization-sso-discovery-uri
+  "Return the OIDC discovery URI from an organization SSO config."
   [sso]
-  (or (non-blank-uri (:issuer sso))
-      (non-blank-uri (:base-url sso))))
+  (non-blank-uri (:issuer sso)))
 
-(defn prepare-org-sso-provider
-  "Build an OIDC provider map dynamically from the Nitrate org SSO config.
-  Uses OIDC discovery via :base-url (or :issuer as fallback) when
-  token/auth/user URIs are absent."
-  [cfg {:keys [client-id client-secret base-url issuer scopes]}]
+(defn prepare-organization-sso-provider
+  "Build an OIDC provider map dynamically from the Nitrate organization SSO config.
+   Uses OIDC discovery via :issuer when token/auth/user URIs are absent."
+  [cfg {:keys [client-id client-secret issuer]}]
   (prepare-oidc-provider cfg
                          {:type             "oidc"
                           :client-id        client-id
                           :client-secret    client-secret
-                          :base-uri         (some-> (or (non-blank-uri base-url)
-                                                        (non-blank-uri issuer))
+                          :base-uri         (some-> (non-blank-uri issuer)
                                                     (str/rtrim "/")
                                                     (str "/"))
-                          :scopes           (into default-oidc-scopes (or scopes #{}))
-                          :skip-ssrf-check? true}))
+                          :scopes           default-oidc-scopes}))
 
-(defn build-org-sso-auth-redirect-uri
+(defn build-organization-sso-auth-redirect-uri
   "Build the OIDC authorization redirect URI for an organization SSO config.
   Raises if the config is incomplete or OIDC discovery fails."
   [cfg sso & {:keys [dest-url organization-id provider]}]
   (let [organization-id (or organization-id (:organization-id sso))
-        issuer          (org-sso-discovery-uri sso)
+        issuer          (organization-sso-discovery-uri sso)
         dest-url        (or dest-url (str (cf/get :public-uri)))]
     (when-not issuer
       (ex/raise :type :validation
                 :code :invalid-sso-config
-                :hint "missing issuer or base-url"))
-    (let [oidc-provider (or provider (prepare-org-sso-provider cfg sso))
+                :hint "missing issuer"))
+    (let [oidc-provider (or provider (prepare-organization-sso-provider cfg sso))
           state-token   (tokens/generate cfg {:iss             "oidc"
                                               :dest-url        dest-url
                                               :organization-id organization-id
@@ -838,7 +838,7 @@
         (and (= error "access_denied")
              (str/includes? description "unauthorized")))))
 
-(defn- probe-org-sso-client-credentials
+(defn- probe-organization-sso-client-credentials
   "Probe the token endpoint with a dummy authorization code.
   Valid client credentials are expected to answer with `invalid_grant`."
   [cfg provider]
@@ -863,10 +863,10 @@
   and the client credentials are accepted by the token endpoint."
   [cfg sso]
   (try
-    (if (org-sso-discovery-uri sso)
-      (let [provider (prepare-org-sso-provider cfg sso)]
-        (and (build-org-sso-auth-redirect-uri cfg sso :provider provider)
-             (probe-org-sso-client-credentials cfg provider)))
+    (if (organization-sso-discovery-uri sso)
+      (let [provider (prepare-organization-sso-provider cfg sso)]
+        (and (build-organization-sso-auth-redirect-uri cfg sso :provider provider)
+             (probe-organization-sso-client-credentials cfg provider)))
       false)
     (catch Throwable _ false)))
 
@@ -896,16 +896,15 @@
             state    (get params :state)
             state    (tokens/verify cfg {:token state :iss "oidc"})]
 
-        ;; Org SSO flow: state carries :dest-url — exchange the authorization
+        ;; Organization SSO flow: state carries :dest-url — exchange the authorization
         ;; code with the OIDC provider to verify authentication actually occurred.
         (if-let [dest-url (:dest-url state)]
           (let [organization-id (:organization-id state)
-                sso             (nitrate/call cfg :get-org-sso {:organization-id organization-id})
-                provider        (prepare-org-sso-provider cfg sso)
-                ;; verify token or throw error
-                _info           (get-info cfg provider state code)
+                sso             (nitrate/call cfg :get-organization-sso {:organization-id organization-id})
+                provider        (prepare-organization-sso-provider cfg sso)
+                info            (get-info cfg provider state code)
                 session         (session/get-session request)
-                exp             (ct/in-future {:hours 48})]
+                exp             (or (:sso-token-exp info) (ct/in-future {:hours 48}))]
             (when (and session organization-id)
               (let [props (-> (or (:props session) {})
                               (update :sso assoc organization-id exp))]
diff --git a/backend/src/app/auth/passwords.clj b/backend/src/app/auth/passwords.clj
new file mode 100644
index 0000000000..cc75b202b7
--- /dev/null
+++ b/backend/src/app/auth/passwords.clj
@@ -0,0 +1,53 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.auth.passwords
+  "Password strength validation using Passay library."
+  (:require
+   [app.common.exceptions :as ex])
+  (:import
+   [org.passay CharacterCharacteristicsRule CharacterRule EnglishCharacterData PasswordData]))
+
+(defonce ^:private passay-code->translation-key
+  {"INSUFFICIENT_LOWERCASE"   "errors.weak-password.insufficient-lowercase"
+   "INSUFFICIENT_UPPERCASE"   "errors.weak-password.insufficient-uppercase"
+   "INSUFFICIENT_DIGIT"       "errors.weak-password.insufficient-digits"
+   "INSUFFICIENT_SPECIAL"     "errors.weak-password.insufficient-special"})
+
+(defonce ^:private character-characteristics-rule
+  (doto (CharacterCharacteristicsRule.)
+    (.setRules [(CharacterRule. EnglishCharacterData/LowerCase 1)
+                (CharacterRule. EnglishCharacterData/UpperCase 1)
+                (CharacterRule. EnglishCharacterData/Digit 1)
+                (CharacterRule. EnglishCharacterData/Special 1)])
+    (.setNumberOfCharacteristics 4)))
+
+(defn validate-password
+  "Validates password strength.
+   Returns nil if valid, or raises exception if invalid.
+   Checks:
+   - Minimum length of 8 characters
+   - At least 1 lowercase letter
+   - At least 1 uppercase letter
+   - At least 1 digit
+   - At least 1 special character"
+  [password]
+  (when (< (count password) 8)
+    (ex/raise :type :validation
+              :code :weak-password
+              :hint "password must be at least 8 characters"
+              :details ["errors.weak-password.too-short"]))
+
+  (let [password-data (PasswordData. password)
+        char-result   (.validate character-characteristics-rule password-data)]
+    (when-not (.isValid char-result)
+      (ex/raise :type :validation
+                :code :weak-password
+                :hint "password must contain at least 1 lowercase letter, 1 uppercase letter, 1 digit, and 1 special character"
+                :details (->> (.getDetails char-result)
+                              (mapv #(.getErrorCode %))
+                              (mapv passay-code->translation-key)
+                              (filterv some?))))))
diff --git a/backend/src/app/binfile/common.clj b/backend/src/app/binfile/common.clj
index a5b73564ea..f984a98550 100644
--- a/backend/src/app/binfile/common.clj
+++ b/backend/src/app/binfile/common.clj
@@ -748,9 +748,17 @@
     (fmigr/upsert-migrations! conn file))
 
   (let [file (encode-file cfg file)]
-    (db/insert! conn :file
-                (file->params file)
-                (assoc opts ::db/return-keys false))
+    (try
+      (db/insert! conn :file
+                  (file->params file)
+                  (assoc opts ::db/return-keys false))
+      (catch org.postgresql.util.PSQLException cause
+        (if (db/duplicate-key-error? cause)
+          (ex/raise :type :not-found
+                    :code :object-not-found
+                    :hint "file already exists"
+                    :cause cause)
+          (throw cause))))
 
     (->> (file->file-data-params file)
          (fdata/upsert! cfg))
diff --git a/backend/src/app/binfile/v1.clj b/backend/src/app/binfile/v1.clj
index 8dc4120159..5f1834cb74 100644
--- a/backend/src/app/binfile/v1.clj
+++ b/backend/src/app/binfile/v1.clj
@@ -174,6 +174,10 @@
     (assert-mark m :obj)
     (let [size (read-long! input)]
       (assert (pos? size) "incorrect header size found on reading header")
+      (when (> size bfc/max-object-size)
+        (ex/raise :type :validation
+                  :code :max-file-size-reached
+                  :hint (dm/str "unable to import object with size " size " bytes")))
       (let [buff (byte-array size)]
         (read-bytes! input buff)
         (fres/decode buff)))))
diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj
index 3fcdfd6443..bebd5db826 100644
--- a/backend/src/app/config.clj
+++ b/backend/src/app/config.clj
@@ -119,8 +119,9 @@
     [:allowed-origins {:optional true} [::sm/set :string]]
 
     [:exporter-shared-key {:optional true} :string]
-    [:nitrate-shared-key {:optional true} :string]
+    [:admin-console-shared-key {:optional true} :string]
     [:nexus-shared-key {:optional true} :string]
+    [:media-processor-shared-key {:optional true} :string]
     [:management-api-key {:optional true} :string]
 
     [:telemetry-uri {:optional true} :string]
@@ -147,6 +148,9 @@
     [:imagemagick-width-limit {:optional true} :string]
     [:imagemagick-height-limit {:optional true} :string]
 
+    [:media-processing-service-uri {:optional true} ::sm/uri]
+    [:media-processing-service-timeout {:optional true} ::sm/int]
+
     [:deletion-delay {:optional true} ::ct/duration]
     [:file-clean-delay {:optional true} ::ct/duration]
     [:telemetry-enabled {:optional true} ::sm/boolean]
@@ -253,6 +257,8 @@
     [:urepl-port {:optional true} ::sm/int]
     [:prepl-host {:optional true} :string]
     [:prepl-port {:optional true} ::sm/int]
+    [:nrepl-host {:optional true} :string]
+    [:nrepl-port {:optional true} ::sm/int]
 
     [:file-data-backend {:optional true} [:enum "db" "legacy-db" "storage"]]
 
@@ -262,7 +268,7 @@
 
     [:netty-io-threads {:optional true} ::sm/int]
 
-    [:nitrate-backend-uri {:optional true} ::sm/uri]
+    [:admin-console-uri {:optional true} ::sm/uri]
 
     ;; DEPRECATED
     [:assets-storage-backend {:optional true} :keyword]
diff --git a/backend/src/app/email.clj b/backend/src/app/email.clj
index fbc768e1f6..e069b2908b 100644
--- a/backend/src/app/email.clj
+++ b/backend/src/app/email.clj
@@ -440,22 +440,21 @@
    :id ::invite-to-team
    :schema schema:invite-to-team))
 
-(def ^:private schema:invite-to-org
+(def ^:private schema:invite-to-organization
   [:map
    [:invited-by ::sm/text]
    [:user-name [:maybe ::sm/text]]
    [:token ::sm/text]
    [:organization schema:organization-data]])
 
-(def invite-to-org
-  "Org member invitation email."
+(def invite-to-organization
+  "Organization member invitation email."
   (template-factory
-   :id ::invite-to-org
-   :schema schema:invite-to-org))
+   :id ::invite-to-organization
+   :schema schema:invite-to-organization))
 
 (def ^:private schema:organization-setup-sso
   [:map
-   [:user-name {:optional true} [:maybe ::sm/text]]
    [:organization-name ::sm/text]])
 
 (def organization-setup-sso
diff --git a/backend/src/app/http/access_token.clj b/backend/src/app/http/access_token.clj
index 8576783b86..02d877b1df 100644
--- a/backend/src/app/http/access_token.clj
+++ b/backend/src/app/http/access_token.clj
@@ -24,7 +24,7 @@
              :cause cause))))
 
 (def sql:get-token-data
-  "SELECT perms, profile_id, expires_at
+  "SELECT perms, profile_id, expires_at, type
      FROM access_token
     WHERE id = ?
       AND (expires_at IS NULL
@@ -42,15 +42,19 @@
   (fn [request]
     (let [{:keys [type claims]} (get request ::http/auth-data)]
       (if (= :token type)
-        (let [{:keys [perms profile-id expires-at]} (some->> claims (get-token-data pool))]
-          ;; FIXME: revisit this, this data looks unused
+        (let [{:keys [perms profile-id expires-at type]} (some->> claims (get-token-data pool))
+              token-id (get claims :tid)]
           (handler (cond-> request
                      (some? perms)
                      (assoc ::perms perms)
                      (some? profile-id)
                      (assoc ::profile-id profile-id)
                      (some? expires-at)
-                     (assoc ::expires-at expires-at))))
+                     (assoc ::expires-at expires-at)
+                     (some? token-id)
+                     (assoc ::id token-id)
+                     (some? type)
+                     (assoc ::type type))))
 
         (handler request)))))
 
diff --git a/backend/src/app/http/assets.clj b/backend/src/app/http/assets.clj
index aa0d750203..04dd7842ca 100644
--- a/backend/src/app/http/assets.clj
+++ b/backend/src/app/http/assets.clj
@@ -7,6 +7,7 @@
 (ns app.http.assets
   "Assets related handlers."
   (:require
+   [app.binfile.common :as bfc]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.time :as ct]
@@ -31,7 +32,8 @@
   #{"file-media-object"
     "file-object-thumbnail"
     "team-font-variant"
-    "file-data-fragment"})
+    "file-data-fragment"
+    "organization"})
 
 (defn get-id
   [{:keys [path-params]}]
@@ -41,7 +43,7 @@
 
 (defn- get-file-media-object
   [pool id]
-  (db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
+  (db/get* pool :file-media-object {:id id} {::db/remove-deleted false}))
 
 (defn- serve-object-from-s3
   [{:keys [::sto/storage ::signature-max-age ::cache-max-age] :as cfg} obj]
@@ -108,13 +110,21 @@
 (defn- generic-handler
   "A generic handler helper/common code for file-media based handlers."
   [{:keys [::sto/storage] :as cfg} request kf]
-  (let [pool (::db/pool storage)
-        id   (get-id request)
-        mobj (get-file-media-object pool id)
-        sobj (sto/get-object storage (kf mobj))]
-    (if sobj
-      (serve-object cfg sobj)
-      {::yres/status 404})))
+  (let [pool       (::db/pool storage)
+        id         (get-id request)
+        mobj       (get-file-media-object pool id)]
+    (if (nil? mobj)
+      {::yres/status 404}
+      (let [file-id    (:file-id mobj)
+            profile-id (or (::session/profile-id request)
+                           (::actoken/profile-id request))
+            perms      (bfc/get-file-permissions pool profile-id file-id)]
+        (if-not (:can-read perms)
+          {::yres/status 404}
+          (let [sobj (sto/get-object storage (kf mobj))]
+            (if sobj
+              (serve-object cfg sobj)
+              {::yres/status 404})))))))
 
 (defn file-objects-handler
   "Handler that serves storage objects by file media id."
diff --git a/backend/src/app/http/debug.clj b/backend/src/app/http/debug.clj
index 979c9951f8..26cac774f6 100644
--- a/backend/src/app/http/debug.clj
+++ b/backend/src/app/http/debug.clj
@@ -230,25 +230,28 @@
             (-> (io/resource "app/templates/error-report.v3.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 3)
+                                 (assoc :source 3)
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))
 
           (render-template-v4 [{:keys [content id created-at]}]
             (-> (io/resource "app/templates/error-report.v4.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 4)
+                                 (assoc :source 4)
+                                 (assoc :kind (or (:kind content) (:origin content)))
+                                 (assoc :trace (or (:trace content) (:report content)))
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))
 
           (render-template-v5 [{:keys [content id created-at]}]
             (-> (io/resource "app/templates/error-report.v5.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 5)
+                                 (assoc :source 5)
+                                 (assoc :value (or (:value content) (:result content)))
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))]
 
     (if-let [report (get-report request)]
-      (let [result (case (:version report)
+      (let [result (case (:source report)
                      1 (render-template-v1 report)
                      2 (render-template-v2 report)
                      3 (render-template-v3 report)
@@ -265,18 +268,19 @@
   "SELECT id, created_at,
           content->>'~:hint' AS hint
      FROM server_error_report
-    WHERE version = ?
-    ORDER BY created_at DESC
-    LIMIT 300")
+     WHERE (version = ? OR source = ? OR ? = 0)
+     ORDER BY created_at DESC
+     LIMIT 300")
 
 (defn- error-list-handler
   [{:keys [::db/pool]} {:keys [params]}]
-  (let [version (or (some-> (get params :version) parse-long) 3)
-        items   (->> (db/exec! pool [sql:error-reports version])
-                     (map #(update % :created-at ct/format-inst :rfc1123)))]
+  (let [source (or (some-> (get params :source) parse-long) 3)
+        items  (->> (db/exec! pool [sql:error-reports source source source])
+                    (map #(update % :created-at ct/format-inst :rfc1123)))]
+
     {::yres/status 200
      ::yres/body (-> (io/resource "app/templates/error-list.tmpl")
-                     (tmpl/render {:items items :version version}))
+                     (tmpl/render {:items items :source source}))
      ::yres/headers {"content-type" "text/html; charset=utf-8"
                      "x-robots-tag" "noindex"}}))
 
diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj
index 8913d8f22f..f1eaea621c 100644
--- a/backend/src/app/http/errors.clj
+++ b/backend/src/app/http/errors.clj
@@ -31,7 +31,7 @@
         (assoc :request/user-agent (yreq/get-header request "user-agent"))
         (assoc :request/ip-addr (inet/parse-request request))
         (assoc :request/profile-id (get claims :uid))
-        (assoc :request/auth-data auth)
+        (assoc :request/auth-data (dissoc auth :token))
         (assoc :frontend/version (or (yreq/get-header request "x-frontend-version") "unknown")))))
 
 (defmulti handle-error
diff --git a/backend/src/app/http/middleware.clj b/backend/src/app/http/middleware.clj
index 81b1ef13ec..fa2faa8a55 100644
--- a/backend/src/app/http/middleware.clj
+++ b/backend/src/app/http/middleware.clj
@@ -65,12 +65,25 @@
                 :else
                 request)))
 
+          ;; The specific-exception branches below (IAE,
+          ;; RequestTooBigException, EOFException) raise with
+          ;; `ex/raise` rather than calling `errors/handle` directly.
+          ;; This is intentional: the throw is caught by the
+          ;; top-level error handler in `app.http/router-handler`
+          ;; (`backend/src/app/http.clj`), which routes every
+          ;; uncaught exception through `errors/handle`. The
+          ;; per-route `wrap-errors` middleware in the route list
+          ;; is a defensive layer; correctness does not depend on
+          ;; it. Raising here keeps the cond uniform with the
+          ;; existing RequestTooBigException / EOFException
+          ;; branches.
           (handle-error [cause request]
             (cond
-              (instance? RuntimeException cause)
-              (if-let [cause (ex-cause cause)]
-                (handle-error cause request)
-                (errors/handle cause request))
+              (instance? IllegalArgumentException cause)
+              (ex/raise :type :validation
+                        :code :malformed-json
+                        :hint (ex-message cause)
+                        :cause cause)
 
               (instance? RequestTooBigException cause)
               (ex/raise :type :validation
@@ -83,6 +96,11 @@
                         :hint (ex-message cause)
                         :cause cause)
 
+              (instance? RuntimeException cause)
+              (if-let [cause (ex-cause cause)]
+                (handle-error cause request)
+                (errors/handle cause request))
+
               :else
               (errors/handle cause request)))]
 
diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj
index e9f4b5679a..614942c072 100644
--- a/backend/src/app/http/session.clj
+++ b/backend/src/app/http/session.clj
@@ -226,19 +226,19 @@
     (-> (db/exec-one! cfg [sql (:profile-id session) (:id session)])
         (db/get-update-count))))
 
-(def ^:private sql:clear-org-sso-sessions
+(def ^:private sql:clear-organization-sso-sessions
   (str "UPDATE http_session_v2 "
        "SET props = props #- ARRAY['~:sso', ?]::text[] "
        "WHERE props IS NOT NULL "
        "AND jsonb_exists(props -> '~:sso', ?)"))
 
-(defn clear-org-sso-sessions!
+(defn clear-organization-sso-sessions!
   "Remove the SSO entry for organization-id from the props of every
   session that currently holds it. The key is transit-encoded as the
   string '~u<uuid>' under the '~:sso' path."
   [pool organization-id]
-  (let [org-key (str "~u" organization-id)]
-    (db/exec! pool [sql:clear-org-sso-sessions org-key org-key])))
+  (let [organization-key (str "~u" organization-id)]
+    (db/exec! pool [sql:clear-organization-sso-sessions organization-key organization-key])))
 
 (defn- renew-session?
   [{:keys [id modified-at] :as session}]
diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj
index c1b63c9aff..f68209255b 100644
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -154,7 +154,7 @@
 ;; COLLECTOR API
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(declare ^:private prepare-context-from-request)
+(declare prepare-context-from-request)
 
 ;; Defines a service that collects the audit/activity log using
 ;; internal database. Later this audit log can be transferred to
@@ -183,7 +183,7 @@
 (def valid-event?
   (sm/validator schema:event))
 
-(defn- prepare-context-from-request
+(defn prepare-context-from-request
   "Prepare backend event context from request"
   [request]
   (let [client-event-origin (get-client-event-origin request)
@@ -337,7 +337,9 @@
   (let [resultm      (meta result)
         request      (-> params meta ::http/request)
         profile-id   (or (::profile-id resultm)
-                         (:profile-id result)
+                         (some-> (:profile-id result)
+                                 (cond-> (string? (:profile-id result))
+                                   uuid/parse*))
                          (::rpc/profile-id params)
                          uuid/zero)
 
@@ -412,7 +414,7 @@
                   (update :ip-addr d/nilv "0.0.0.0")
                   (update :props d/nilv {})
                   (update :context d/nilv {})
-                  (assoc :source "backend")
+                  (update :source d/nilv "backend")
                   (d/without-nils))]
     (submit* cfg event)))
 
@@ -429,7 +431,7 @@
                     (update :profile-id d/nilv uuid/zero)
                     (update :props d/nilv {})
                     (update :context d/nilv {})
-                    (assoc :source "backend")
+                    (update :source d/nilv "backend")
                     (select-keys event-keys)
                     (check-event))]
       (db/run! cfg append-audit-entry event))))
diff --git a/backend/src/app/loggers/database.clj b/backend/src/app/loggers/database.clj
index 59a4b5d74e..9f9c1bebaa 100644
--- a/backend/src/app/loggers/database.clj
+++ b/backend/src/app/loggers/database.clj
@@ -12,6 +12,7 @@
    [app.common.logging :as l]
    [app.common.pprint :as pp]
    [app.common.schema :as sm]
+   [app.common.uri :as u]
    [app.config :as cf]
    [app.db :as db]
    [app.loggers.audit :as audit]
@@ -30,11 +31,12 @@
 (defonce enabled (atom true))
 
 (defn- persist-on-database!
-  [pool id version report]
+  [pool id source report]
   (when-not (db/read-only? pool)
     (db/insert! pool :server-error-report
                 {:id id
-                 :version version
+                 :source source
+                 :version source ;; backward compatibility with old code that reads version column
                  :content (db/tjson report)})))
 
 (defn- concurrent-exception?
@@ -56,19 +58,27 @@
                  (assoc :backend/version (:full cf/version))
                  (assoc :logger/name logger)
                  (assoc :logger/level level)
-                 (dissoc :request/params :value :params :data))]
+                 (dissoc :request/params :value :params :data))
+
+        href (if-let [path (:request/path context)]
+               (str (u/join (cf/get :public-uri) path))
+               (str (cf/get :public-uri)))]
 
     (merge
-     {:context (-> (into (sorted-map) ctx)
-                   (pp/pprint-str :length 50))
-      :props   (pp/pprint-str props :length 50)
-      :hint    (or (when-let [message (ex-message cause)]
-                     (if-let [props-hint (:hint props)]
-                       (str props-hint ": " message)
-                       message))
-                   @message)
-      :trace   (or (::trace record)
-                   (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
+     {:context          (-> (into (sorted-map) ctx)
+                            (pp/pprint-str :length 50))
+      :props            (pp/pprint-str props :length 50)
+      :hint             (or (when-let [message (ex-message cause)]
+                              (if-let [props-hint (:hint props)]
+                                (str props-hint ": " message)
+                                message))
+                            @message)
+      :trace            (or (::trace record)
+                            (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))
+      :tenant           (cf/get :tenant)
+      :version          (:full cf/version)
+      :profile-id       (some-> (:request/profile-id context) str)
+      :href             href}
 
      (when-let [params (or (:request/params context) (:params context))]
        {:params (pp/pprint-str params :length 20 :level 20)})
@@ -97,7 +107,7 @@
       (l/warn :hint "unexpected exception on database error logger" :cause cause))))
 
 (defn- audit-event->report
-  [{:keys [context props ip-addr] :as record}]
+  [{:keys [context props ip-addr profile-id] :as record}]
   (let [context
         (reduce-kv (fn [context k v]
                      (let [k' (keyword "frontend" (name k))]
@@ -115,12 +125,15 @@
             (assoc :backend/version (:full cf/version))
             (assoc :frontend/ip-addr ip-addr))]
 
-    {:context (-> (into (sorted-map) context)
-                  (pp/pprint-str :length 50))
-     :origin  (:name record)
-     :href    (get props :href)
-     :hint    (get props :hint)
-     :report  (get props :report)}))
+    {:context          (-> (into (sorted-map) context)
+                           (pp/pprint-str :length 50))
+     :kind             (:name record)
+     :profile-id       (some-> profile-id str)
+     :href             (get props :href)
+     :hint             (get props :hint)
+     :trace            (get props :report)
+     :tenant           (cf/get :tenant)
+     :version          (:full cf/version)}))
 
 (defn- handle-audit-event
   "Convert the log record into a report object and persist it on the database"
@@ -153,10 +166,13 @@
                      (-> (into (sorted-map) result)
                          (dissoc ::rlimit/method)))))]
 
-    {:hint    (str "Rate Limit Rejection: " (::rlimit/method event) " for " (::rlimit/uid event))
-     :context (-> (into (sorted-map) context)
-                  (pp/pprint-str :length 50))
-     :result  (pp/pprint-str result :length 50)}))
+    {:hint             (str "Rate Limit Rejection: " (::rlimit/method event) " for " (::rlimit/uid event))
+     :context          (-> (into (sorted-map) context)
+                           (pp/pprint-str :length 50))
+     :value            (pp/pprint-str result :length 50)
+     :tenant           (cf/get :tenant)
+     :version          (:full cf/version)
+     :href             (str (cf/get :public-uri))}))
 
 (defn- handle-rlimit-event
   "Convert the log record into a report object and persist it on the database"
diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj
index a6048a970d..d0ffd1cf58 100644
--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -38,6 +38,7 @@
    [app.storage.gc-deleted :as-alias sto.gc-deleted]
    [app.storage.gc-touched :as-alias sto.gc-touched]
    [app.storage.s3 :as-alias sto.s3]
+   [app.system :as sys]
    [app.util.cron]
    [app.worker :as-alias wrk]
    [app.worker.executor]
@@ -45,7 +46,6 @@
    [clojure.tools.namespace.repl :as repl]
    [cuerdas.core :as str]
    [integrant.core :as ig]
-   [nrepl.server :as nrepl]
    [promesa.exec :as px])
   (:gen-class))
 
@@ -335,6 +335,7 @@
     ::rpc/rlimit         (ig/ref ::rpc/rlimit)
     ::setup/templates    (ig/ref ::setup/templates)
     ::setup/props        (ig/ref ::setup/props)
+    ::setup/shared-keys  (ig/ref ::setup/shared-keys)
 
     ::email/blacklist    (ig/ref ::email/blacklist)
     ::email/whitelist    (ig/ref ::email/whitelist)
@@ -449,13 +450,17 @@
     ::http.client/client (ig/ref ::http.client/client)
     ::setup/props        (ig/ref ::setup/props)}
 
-   [::srepl/urepl ::srepl/server]
-   {::srepl/port (cf/get :urepl-port 6062)
-    ::srepl/host (cf/get :urepl-host "localhost")}
+   ::srepl/urepl
+   {:port (cf/get :urepl-port 6062)
+    :host (cf/get :urepl-host "localhost")}
 
-   [::srepl/prepl ::srepl/server]
-   {::srepl/port (cf/get :prepl-port 6063)
-    ::srepl/host (cf/get :prepl-host "localhost")}
+   ::srepl/prepl
+   {:port (cf/get :prepl-port 6063)
+    :host (cf/get :prepl-host "localhost")}
+
+   ::srepl/nrepl
+   {:port (cf/get :nrepl-port 6064)
+    :host (cf/get :nrepl-host "localhost")}
 
    ::setup/templates {}
 
@@ -468,10 +473,11 @@
     ::migrations (ig/ref :app.migrations/migrations)}
 
    ::setup/shared-keys
-   {::setup/props (ig/ref ::setup/props)
-    :nexus        (cf/get :nexus-shared-key)
-    :nitrate      (cf/get :nitrate-shared-key)
-    :exporter     (cf/get :exporter-shared-key)}
+   {::setup/props    (ig/ref ::setup/props)
+    :nexus           (cf/get :nexus-shared-key)
+    :admin-console   (cf/get :admin-console-shared-key)
+    :exporter        (cf/get :exporter-shared-key)
+    :media-processor (cf/get :media-processor-shared-key)}
 
    ::setup/clock
    {}
@@ -589,42 +595,70 @@
     ::db/pool         (ig/ref ::db/pool)}})
 
 
-(def system nil)
-
 (defn start
   []
   (cf/validate!)
   (ig/load-namespaces (merge system-config worker-config))
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             (-> system-config
-                                 (cond-> (contains? cf/flags :backend-worker)
-                                   (merge worker-config))
-                                 (ig/expand)
-                                 (ig/init))))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    (-> system-config
+                        (cond-> (contains? cf/flags :backend-worker)
+                          (merge worker-config))
+                        (ig/expand)
+                        (ig/init))))
+
   (l/inf :hint "welcome to penpot"
          :flags (str/join "," (map name cf/flags))
          :worker? (contains? cf/flags :backend-worker)
-         :version (:full cf/version)))
+         :version (:full cf/version))
+  :start)
+
+(defn resume
+  []
+  (cf/validate!)
+  (ig/load-namespaces (merge system-config worker-config))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (let [config (-> system-config
+                                     (cond-> (contains? cf/flags :backend-worker)
+                                       (merge worker-config))
+                                     (ig/expand))]
+                      (if-let [sys (not-empty sys)]
+                        (ig/resume config sys)
+                        (ig/init config)))))
+  :resume)
 
 (defn start-custom
   [config]
   (ig/load-namespaces config)
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             (-> config
-                                 (ig/expand)
-                                 (ig/init)))))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    (-> config
+                        (ig/expand)
+                        (ig/init)))))
 
 (defn stop
   []
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             nil)))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    {}))
+  :stop)
+
+(defn suspend
+  []
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/suspend!)
+                    sys))
+  :suspend)
+
 (defn restart
   []
-  (stop)
-  (repl/refresh :after 'app.main/start))
+  (suspend)
+  (repl/refresh :after 'app.main/resume))
 
 (defn restart-all
   []
@@ -651,15 +685,15 @@
            (test/test-vars [(resolve o)]))
        (test/test-ns o)))))
 
-(repl/disable-reload! (find-ns 'integrant.core))
-
 (defn -main
   [& _args]
   (try
-    (let [p (promise)]
-      (l/inf :hint "start nrepl server" :port 6064)
-      (nrepl/start-server :bind "0.0.0.0" :port 6064)
+    (ex/ignoring
+     (repl/disable-reload! (find-ns 'integrant.core))
+     (repl/disable-reload! (find-ns 'app.system))
+     (repl/disable-reload! (find-ns 'app.common.debug)))
 
+    (let [p (promise)]
       (start)
       (deref p))
     (catch Throwable cause
diff --git a/backend/src/app/media.clj b/backend/src/app/media.clj
index 30527857ad..dc23e3483c 100644
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -5,316 +5,37 @@
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
 (ns app.media
-  "Media & Font postprocessing."
+  "Media & Font postprocessing.
+
+  This namespace is the dispatch layer only. Processing implementations
+  live in two separate namespaces, each owning their own defmulti:
+
+    app.media.local  — shell/ImageMagick/FontForge implementations
+    app.media.remote — HTTP delegation to media-processor service
+
+  Validation and schemas live in app.media.validation (leaf namespace,
+  no circular dep). When adding a new :cmd type, add defmethods in
+  BOTH local and remote."
   (:require
    [app.common.data :as d]
-   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.media :as cm]
-   [app.common.schema :as sm]
-   [app.common.schema.openapi :as-alias oapi]
-   [app.common.time :as ct]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.http.client :as http]
+   [app.media.local :as media.local]
+   [app.media.remote :as media.remote]
    [app.media.sanitize :as sanitize]
+   [app.media.validation :as validation]
    [app.storage :as-alias sto]
    [app.storage.tmp :as tmp]
-   [app.util.shell :as shell]
-   [buddy.core.bytes :as bb]
-   [buddy.core.codecs :as bc]
-   [clojure.string]
-   [clojure.xml :as xml]
    [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [datoteka.io :as io])
-  (:import
-   clojure.lang.XMLHandler
-   java.io.InputStream
-   javax.xml.parsers.SAXParserFactory
-   javax.xml.XMLConstants
-   org.apache.commons.io.IOUtils))
-
-(def schema:upload
-  [:map {:title "Upload"}
-   [:filename :string]
-   [:size ::sm/int]
-   [:path ::fs/path]
-   [:mtype {:optional true} :string]
-   [:headers {:optional true}
-    [:map-of :string :string]]])
-
-(def ^:private schema:input
-  [:map {:title "Input"}
-   [:path ::fs/path]
-   [:mtype {:optional true} ::sm/text]])
-
-(def check-input
-  (sm/check-fn schema:input))
-
-(defn validate-media-type!
-  ([upload] (validate-media-type! upload cm/image-types))
-  ([upload allowed]
-   (when-not (contains? allowed (:mtype upload))
-     (ex/raise :type :validation
-               :code :media-type-not-allowed
-               :hint "Seems like you are uploading an invalid media object"))
-
-   upload))
-
-(defn validate-media-size!
-  [upload]
-  (let [max-size (cf/get :media-max-file-size)]
-    (when (> (:size upload) max-size)
-      (ex/raise :type :restriction
-                :code :media-max-file-size-reached
-                :hint (str/ffmt "the uploaded file size % is greater than the maximum %"
-                                (:size upload)
-                                max-size)))
-    upload))
-
-(defn validate-font-size!
-  "Validates that the font file `upload` does not exceed the configured
-  `:font-max-file-size` limit.  Accepts the same map shape as
-  `validate-media-size!` — requires a `:size` key in bytes."
-  [upload]
-  (let [max-size (cf/get :font-max-file-size)]
-    (when (> (:size upload) max-size)
-      (ex/raise :type :restriction
-                :code :font-max-file-size-reached
-                :hint (str/ffmt "the uploaded font size % is greater than the maximum %"
-                                (:size upload)
-                                max-size)))
-    upload))
-
-(defmulti process (fn [_system params] (:cmd params)))
-
-(defmethod process :default
-  [_system {:keys [cmd] :as params}]
-  (ex/raise :type :internal
-            :code :not-implemented
-            :hint (str/fmt "No impl found for process cmd: %s" cmd)))
+   [datoteka.io :as io]))
 
 (defn run
   [system params]
-  (process system params))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SVG PARSING
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- secure-parser-factory
-  [^InputStream input ^XMLHandler handler]
-  (.. (doto (SAXParserFactory/newInstance)
-        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
-        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
-      (newSAXParser)
-      (parse input handler)))
-
-(defn- strip-doctype
-  [data]
-  (cond-> data
-    (str/includes? data "<!DOCTYPE")
-    (str/replace #"<\!DOCTYPE[^>]*>" "")))
-
-(defn- parse-svg
-  [text]
-  (let [text (strip-doctype text)]
-    (dm/with-open [istream (IOUtils/toInputStream ^String text "UTF-8")]
-      (xml/parse istream secure-parser-factory))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; IMAGE THUMBNAILS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private schema:thumbnail-params
-  [:map {:title "ThumbnailParams"}
-   [:input schema:input]
-   [:format [:enum :jpeg :webp :png]]
-   [:quality [:int {:min 1 :max 100}]]
-   [:width :int]
-   [:height :int]])
-
-(def ^:private check-thumbnail-params
-  (sm/check-fn schema:thumbnail-params))
-
-;; Related info on how thumbnails generation
-;;  http://www.imagemagick.org/Usage/thumbnails/
-
-(def ^:private imagemagick-default-env
-  "Default environment variables for ImageMagick resource limits.
-   These are the soft ceiling — policy.xml is the hard ceiling."
-  {"MAGICK_THREAD_LIMIT" "2"
-   "MAGICK_MEMORY_LIMIT" "256MiB"
-   "MAGICK_MAP_LIMIT" "512MiB"
-   "MAGICK_AREA_LIMIT" "128MP"
-   "MAGICK_DISK_LIMIT" "1GiB"
-   "MAGICK_TIME_LIMIT" "30"})
-
-(defn- get-imagemagick-env
-  "Returns environment variables for ImageMagick commands.
-   Reads individual PENPOT_IMAGEMAGICK_* config values, falling back to defaults."
-  []
-  (let [thread (cf/get :imagemagick-thread-limit)
-        memory (cf/get :imagemagick-memory-limit)
-        map-l  (cf/get :imagemagick-map-limit)
-        area   (cf/get :imagemagick-area-limit)
-        disk   (cf/get :imagemagick-disk-limit)
-        time   (cf/get :imagemagick-time-limit)
-        width  (cf/get :imagemagick-width-limit)
-        height (cf/get :imagemagick-height-limit)]
-    (cond-> imagemagick-default-env
-      thread (assoc "MAGICK_THREAD_LIMIT" thread)
-      memory (assoc "MAGICK_MEMORY_LIMIT" memory)
-      map-l  (assoc "MAGICK_MAP_LIMIT" map-l)
-      area   (assoc "MAGICK_AREA_LIMIT" area)
-      disk   (assoc "MAGICK_DISK_LIMIT" disk)
-      time   (assoc "MAGICK_TIME_LIMIT" time)
-      width  (assoc "MAGICK_WIDTH_LIMIT" width)
-      height (assoc "MAGICK_HEIGHT_LIMIT" height))))
-
-(defn- exec-magick!
-  "Execute an ImageMagick command with resource limits.
-   `args` is a vector of string arguments to pass to `magick`."
-  [system args]
-  (let [cmd    (into ["magick"] args)
-        result (shell/exec! system
-                            :cmd cmd
-                            :env (get-imagemagick-env)
-                            :timeout 60)]
-    (when (not= 0 (:exit result))
-      (ex/raise :type :validation
-                :code :invalid-image
-                :hint (str "ImageMagick command failed: " (:err result))
-                :cmd cmd
-                :exit (:exit result)))
-    result))
-
-(defn- generic-process
-  [system {:keys [input format convert-args] :as params}]
-  (let [{:keys [path mtype]} input
-        format (or format (cm/mtype->format mtype))
-        ext    (cm/format->extension format)
-        tmp    (tmp/tempfile :prefix "penpot.media." :suffix ext)
-        args   (into [(str path)] (conj (vec convert-args) (str tmp)))]
-    (exec-magick! system args)
-    (assoc params
-           :format format
-           :mtype  (cm/format->mtype format)
-           :size   (fs/size tmp)
-           :data   tmp)))
-
-(defmethod process :generic-thumbnail
-  [system params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)]
-    (generic-process system
-                     (assoc params
-                            :convert-args ["-auto-orient" "-strip"
-                                           "-thumbnail" (str width "x" height ">")
-                                           "-quality" (str quality)]))))
-
-(defmethod process :profile-thumbnail
-  [system params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)]
-    (generic-process system
-                     (assoc params
-                            :convert-args ["-auto-orient" "-strip"
-                                           "-thumbnail" (str width "x" height "^")
-                                           "-gravity" "center"
-                                           "-extent" (str width "x" height)
-                                           "-quality" (str quality)]))))
-
-(defn get-basic-info-from-svg
-  [{:keys [tag attrs] :as data}]
-  (when (not= tag :svg)
-    (ex/raise :type :validation
-              :code :unable-to-parse-svg
-              :hint "uploaded svg has invalid content"))
-  (reduce (fn [default f]
-            (if-let [res (f attrs)]
-              (reduced res)
-              default))
-          {:width 100 :height 100}
-          [(fn parse-width-and-height
-             [{:keys [width height]}]
-             (when (and (string? width)
-                        (string? height))
-               (let [width  (d/parse-double width)
-                     height (d/parse-double height)]
-                 (when (and width height)
-                   {:width (int width)
-                    :height (int height)}))))
-           (fn parse-viewbox
-             [{:keys [viewBox]}]
-             (let [[x y width height] (->> (str/split viewBox #"\s+" 4)
-                                           (map d/parse-double))]
-               (when (and x y width height)
-                 {:width (int width)
-                  :height (int height)})))]))
-
-(defn- get-dimensions-with-orientation [system ^String path]
-  ;; Image magick doesn't give info about exif rotation so we use the identify command
-  ;; If we are processing an animated gif we use the first frame with -scene 0
-  (let [dim-result    (exec-magick! system ["identify" "-format" "%w %h\n" path])
-        orient-result (exec-magick! system ["identify" "-format" "%[EXIF:Orientation]\n" path])]
-    (when (= 0 (:exit dim-result))
-      (let [[w h] (-> (:out dim-result)
-                      str/trim
-                      (clojure.string/split #"\s+")
-                      (->> (mapv #(Integer/parseInt %))))
-            orientation-exit (:exit orient-result)
-            orientation      (-> orient-result :out str/trim)]
-        (if (= 0 orientation-exit)
-          (case orientation
-            ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
-            {:width w :height h})          ; Normal or unknown orientation
-          {:width w :height h})))))        ; If orientation can't be read, use dimensions as-is
-
-(defmethod process :info
-  [system {:keys [input] :as params}]
-  (let [{:keys [path mtype] :as input} (check-input input)]
-    (if (= mtype "image/svg+xml")
-      (let [info (some-> path slurp parse-svg get-basic-info-from-svg)]
-        (when-not info
-          (ex/raise :type :validation
-                    :code :invalid-svg-file
-                    :hint "uploaded svg does not provides dimensions"))
-        (merge input info {:ts (ct/now) :size (fs/size path)}))
-
-      (let [path-str      (str path)
-            identify-res  (exec-magick! system ["identify" "-format" "image/%[magick]\n" path-str])
-            ;; identify prints one line per frame (animated GIFs, etc.); we take the first one
-            mtype'        (if (zero? (:exit identify-res))
-                            (-> identify-res
-                                :out
-                                str/trim
-                                (str/split #"\s+" 2)
-                                first
-                                str/lower)
-                            (ex/raise :type :validation
-                                      :code :invalid-image
-                                      :hint "invalid image"))
-            {:keys [width height]}
-            (or (get-dimensions-with-orientation system path-str)
-                (do
-                  (l/warn "Failed to read image dimensions with orientation" {:path path})
-                  (ex/raise :type :validation
-                            :code :invalid-image
-                            :hint "invalid image")))]
-        (when (and (string? mtype)
-                   (not= (str/lower mtype) mtype'))
-          (ex/raise :type :validation
-                    :code :media-type-mismatch
-                    :hint (str "Seems like you are uploading a file whose content does not match the extension."
-                               "Expected: " mtype ". Got: " mtype')))
-        (assoc input
-               :width  width
-               :height height
-               :size (fs/size path)
-               :ts (ct/now))))))
+  (if (contains? cf/flags :remote-media-processing)
+    (media.remote/process system params)
+    (media.local/process system params)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; IMAGE HELPERS
@@ -338,8 +59,8 @@
                           :hint "seems like the url points to resource with unknown size"))
 
               (-> {:size size :mtype mtype}
-                  (validate-media-type!)
-                  (validate-media-size!))))]
+                  (validation/validate-media-type!)
+                  (validation/validate-media-size!))))]
 
     (let [{:keys [body] :as response}
           (try
@@ -367,188 +88,24 @@
               (ex/raise :type :validation
                         :code :unable-to-download-image
                         :hint (str/ffmt "unable to download image from '%': I/O error" uri)
-                        :cause cause)))
+                        :cause cause)))]
 
-          {:keys [size mtype]} (parse-and-validate response)
-          path    (tmp/tempfile :prefix "penpot.media.download.")
-          written (io/write* path body :size size)]
+      (if body
+        (with-open [body body]
+          (let [{:keys [size mtype]} (parse-and-validate response)
+                path    (tmp/tempfile :prefix "penpot.media.download.")
+                written (io/write* path body :size size)]
 
-      (when (not= written size)
-        (ex/raise :type :internal
-                  :code :mismatch-write-size
-                  :hint "unexpected state: unable to write to file"))
+            (when (not= written size)
+              (ex/raise :type :internal
+                        :code :mismatch-write-size
+                        :hint "unexpected state: unable to write to file"))
 
-      ;; Sanitize: strip trailing data after image EOF markers
-      (let [new-size (sanitize/truncate-after-eof path mtype)]
-        {:path  path
-         :mtype mtype
-         :size  new-size}))))
+            ;; Sanitize: strip trailing data after image EOF markers
+            (let [new-size (sanitize/truncate-after-eof path mtype)]
+              {:path  path
+               :mtype mtype
+               :size  new-size})))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; FONTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- get-font-prlimit
-  "Returns resource limits for font processing tools, read from config."
-  []
-  {:mem (cf/get :font-process-mem)
-   :cpu (cf/get :font-process-cpu)})
-
-(defn- get-font-timeout
-  "Returns the wall-clock timeout for font processing, read from config."
-  []
-  (cf/get :font-process-timeout))
-
-(defn- exec-font!
-  "Execute a font processing command with resource limits.
-   `args` is a vector of string arguments."
-  [system args]
-  (shell/exec! system
-               :cmd args
-               :prlimit (get-font-prlimit)
-               :timeout (get-font-timeout)))
-
-(defmethod process :generate-fonts
-  [system {:keys [input] :as params}]
-  (letfn [(ttf->otf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".otf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
-                                              (str/fmt "Open('%s'); Generate('%s')"
-                                                       (str finput)
-                                                       (str foutput))])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (otf->ttf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".ttf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
-                                              (str/fmt "Open('%s'); Generate('%s')"
-                                                       (str finput)
-                                                       (str foutput))])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (ttf-or-otf->woff [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".woff"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["sfnt2woff" (str finput)])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (woff->sfnt [data]
-            (let [finput (tmp/tempfile :prefix "penpot" :suffix "")]
-              (try
-                (io/write* finput data)
-                (let [res (shell/exec! system
-                                       :cmd ["woff2sfnt" (str finput)]
-                                       :out-enc :bytes
-                                       :prlimit (get-font-prlimit)
-                                       :timeout (get-font-timeout))]
-                  (when (zero? (:exit res))
-                    (:out res)))
-                (finally
-                  (fs/delete finput)))))
-
-          (woff2->sfnt [data]
-            ;; woff2_decompress outputs to same directory with .ttf extension
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
-                  foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["woff2_decompress" (str finput)])]
-                  (if (zero? (:exit res))
-                    foutput
-                    (do
-                      (when (fs/exists? foutput)
-                        (fs/delete foutput))
-                      nil)))
-                (finally
-                  (fs/delete finput)))))
-
-          ;; Documented here:
-          ;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
-          (get-sfnt-type [data]
-            (let [buff (bb/slice data 0 4)
-                  type (bc/bytes->hex buff)]
-              (case type
-                "4f54544f" :otf
-                "00010000" :ttf
-                (ex/raise :type :internal
-                          :code :unexpected-data
-                          :hint "unexpected font data"))))
-
-          (gen-if-nil [val factory]
-            (if (nil? val)
-              (factory)
-              val))]
-
-    (let [current (into #{} (keys input))]
-      (cond
-        (contains? current "font/ttf")
-        (let [data (get input "font/ttf")]
-          (-> input
-              (update "font/otf" gen-if-nil #(ttf->otf data))
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
-
-        (contains? current "font/otf")
-        (let [data (get input "font/otf")]
-          (-> input
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
-              (assoc "font/ttf" (otf->ttf data))))
-
-        (contains? current "font/woff")
-        (let [data (get input "font/woff")
-              sfnt (woff->sfnt data)]
-          (when-not sfnt
-            (ex/raise :type :validation
-                      :code :invalid-woff-file
-                      :hint "invalid woff file"))
-          (let [stype (get-sfnt-type sfnt)]
-            (cond-> input
-              true
-              (-> (assoc "font/woff" data))
-
-              (= stype :otf)
-              (-> (assoc "font/otf" sfnt)
-                  (assoc "font/ttf" (otf->ttf sfnt)))
-
-              (= stype :ttf)
-              (-> (assoc "font/otf" (ttf->otf sfnt))
-                  (assoc "font/ttf" sfnt)))))
-
-        (contains? current "font/woff2")
-        (let [data    (get input "font/woff2")
-              foutput (woff2->sfnt data)]
-          (when-not foutput
-            (ex/raise :type :validation
-                      :code :invalid-woff2-file
-                      :hint "invalid woff2 file"))
-          (try
-            (let [sfnt  (io/read* foutput)
-                  type (get-sfnt-type sfnt)]
-              (cond-> input
-                (= type :otf)
-                (-> (assoc "font/otf" sfnt)
-                    (assoc "font/ttf" (otf->ttf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
-
-                (= type :ttf)
-                (-> (assoc "font/ttf" sfnt)
-                    (assoc "font/otf" (ttf->otf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
-            (finally
-              (fs/delete foutput))))))))
+        ;; No body - validation will raise appropriate error
+        (parse-and-validate response)))))
diff --git a/backend/src/app/media/local.clj b/backend/src/app/media/local.clj
new file mode 100644
index 0000000000..f86e46c02e
--- /dev/null
+++ b/backend/src/app/media/local.clj
@@ -0,0 +1,366 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.local
+  "Local media processing via ImageMagick and FontForge shell commands."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [app.common.media :as cm]
+   [app.common.schema :as sm]
+   [app.common.time :as ct]
+   [app.config :as cf]
+   [app.media.svg :as svg]
+   [app.media.validation :as validation]
+   [app.storage.tmp :as tmp]
+   [app.util.shell :as shell]
+   [buddy.core.bytes :as bb]
+   [buddy.core.codecs :as bc]
+   [clojure.string]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io]))
+
+(defmulti process (fn [_system params] (:cmd params)))
+
+(defmethod process :default
+  [_system {:keys [cmd] :as params}]
+  (ex/raise :type :internal
+            :code :not-implemented
+            :hint (str/fmt "No impl found for local process cmd: %s" cmd)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; IMAGE THUMBNAILS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private schema:thumbnail-params
+  [:map {:title "ThumbnailParams"}
+   [:input validation/schema:input]
+   [:format [:enum :jpeg :webp :png]]
+   [:quality [:int {:min 1 :max 100}]]
+   [:width :int]
+   [:height :int]])
+
+(def ^:private check-thumbnail-params
+  (sm/check-fn schema:thumbnail-params))
+
+;; Related info on how thumbnails generation
+;;  http://www.imagemagick.org/Usage/thumbnails/
+
+(def ^:private imagemagick-default-env
+  "Default environment variables for ImageMagick resource limits.
+   These are the soft ceiling — policy.xml is the hard ceiling."
+  {"MAGICK_THREAD_LIMIT" "2"
+   "MAGICK_MEMORY_LIMIT" "256MiB"
+   "MAGICK_MAP_LIMIT" "512MiB"
+   "MAGICK_AREA_LIMIT" "128MP"
+   "MAGICK_DISK_LIMIT" "1GiB"
+   "MAGICK_TIME_LIMIT" "30"})
+
+(defn- get-imagemagick-env
+  "Returns environment variables for ImageMagick commands.
+   Reads individual PENPOT_IMAGEMAGICK_* config values, falling back to defaults."
+  []
+  (let [thread (cf/get :imagemagick-thread-limit)
+        memory (cf/get :imagemagick-memory-limit)
+        map-l  (cf/get :imagemagick-map-limit)
+        area   (cf/get :imagemagick-area-limit)
+        disk   (cf/get :imagemagick-disk-limit)
+        time   (cf/get :imagemagick-time-limit)
+        width  (cf/get :imagemagick-width-limit)
+        height (cf/get :imagemagick-height-limit)]
+    (cond-> imagemagick-default-env
+      thread (assoc "MAGICK_THREAD_LIMIT" thread)
+      memory (assoc "MAGICK_MEMORY_LIMIT" memory)
+      map-l  (assoc "MAGICK_MAP_LIMIT" map-l)
+      area   (assoc "MAGICK_AREA_LIMIT" area)
+      disk   (assoc "MAGICK_DISK_LIMIT" disk)
+      time   (assoc "MAGICK_TIME_LIMIT" time)
+      width  (assoc "MAGICK_WIDTH_LIMIT" width)
+      height (assoc "MAGICK_HEIGHT_LIMIT" height))))
+
+(defn- exec-magick!
+  "Execute an ImageMagick command with resource limits.
+   `args` is a vector of string arguments to pass to `magick`."
+  [system args]
+  (let [cmd    (into ["magick"] args)
+        result (shell/exec! system
+                            :cmd cmd
+                            :env (get-imagemagick-env)
+                            :timeout 60)]
+    (when (not= 0 (:exit result))
+      (ex/raise :type :validation
+                :code :invalid-image
+                :hint (str "ImageMagick command failed: " (:err result))
+                :cmd cmd
+                :exit (:exit result)))
+    result))
+
+(defn- generic-process
+  [system {:keys [input format convert-args] :as params}]
+  (let [{:keys [path mtype]} input
+        format (or format (cm/mtype->format mtype))
+        ext    (cm/format->extension format)
+        tmp    (tmp/tempfile :prefix "penpot.media." :suffix ext)
+        args   (into [(str path)] (conj (vec convert-args) (str tmp)))]
+    (exec-magick! system args)
+    (assoc params
+           :format format
+           :mtype  (cm/format->mtype format)
+           :size   (fs/size tmp)
+           :data   tmp)))
+
+(defmethod process :generic-thumbnail
+  [system params]
+  (let [{:keys [quality width height] :as params}
+        (check-thumbnail-params params)]
+    (generic-process system
+                     (assoc params
+                            :convert-args ["-auto-orient" "-strip"
+                                           "-thumbnail" (str width "x" height ">")
+                                           "-quality" (str quality)]))))
+
+(defmethod process :profile-thumbnail
+  [system params]
+  (let [{:keys [quality width height] :as params}
+        (check-thumbnail-params params)]
+    (generic-process system
+                     (assoc params
+                            :convert-args ["-auto-orient" "-strip"
+                                           "-thumbnail" (str width "x" height "^")
+                                           "-gravity" "center"
+                                           "-extent" (str width "x" height)
+                                           "-quality" (str quality)]))))
+
+(defn- get-dimensions-with-orientation [system ^String path]
+  ;; Image magick doesn't give info about exif rotation so we use the identify command
+  ;; If we are processing an animated gif we use the first frame with -scene 0
+  (let [dim-result    (exec-magick! system ["identify" "-format" "%w %h\n" path])
+        orient-result (exec-magick! system ["identify" "-format" "%[EXIF:Orientation]\n" path])]
+    (when (= 0 (:exit dim-result))
+      (let [[w h] (-> (:out dim-result)
+                      str/trim
+                      (clojure.string/split #"\s+")
+                      (->> (mapv #(Integer/parseInt %))))
+            orientation-exit (:exit orient-result)
+            orientation      (-> orient-result :out str/trim)]
+        (if (= 0 orientation-exit)
+          (case orientation
+            ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
+            {:width w :height h})          ; Normal or unknown orientation
+          {:width w :height h})))))        ; If orientation can't be read, use dimensions as-is
+
+(defmethod process :info
+  [system {:keys [input] :as params}]
+  (let [{:keys [path mtype] :as input} (validation/check-input input)]
+    (if (= mtype "image/svg+xml")
+      (let [info (some-> path slurp svg/parse-svg svg/get-basic-info-from-svg)]
+        (when-not info
+          (ex/raise :type :validation
+                    :code :invalid-svg-file
+                    :hint "uploaded svg does not provides dimensions"))
+        (merge input info {:ts (ct/now) :size (fs/size path)}))
+
+      (let [path-str      (str path)
+            identify-res  (exec-magick! system ["identify" "-format" "image/%[magick]\n" path-str])
+            ;; identify prints one line per frame (animated GIFs, etc.); we take the first one
+            mtype'        (if (zero? (:exit identify-res))
+                            (-> identify-res
+                                :out
+                                str/trim
+                                (str/split #"\s+" 2)
+                                first
+                                str/lower)
+                            (ex/raise :type :validation
+                                      :code :invalid-image
+                                      :hint "invalid image"))
+            {:keys [width height]}
+            (or (get-dimensions-with-orientation system path-str)
+                (do
+                  (l/warn "Failed to read image dimensions with orientation" {:path path})
+                  (ex/raise :type :validation
+                            :code :invalid-image
+                            :hint "invalid image")))]
+        (when (and (string? mtype)
+                   (not= (str/lower mtype) mtype'))
+          (ex/raise :type :validation
+                    :code :media-type-mismatch
+                    :hint (str "Seems like you are uploading a file whose content does not match the extension."
+                               "Expected: " mtype ". Got: " mtype')))
+        (assoc input
+               :width  width
+               :height height
+               :size (fs/size path)
+               :ts (ct/now))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; FONTS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn- get-font-prlimit
+  "Returns resource limits for font processing tools, read from config."
+  []
+  {:mem (cf/get :font-process-mem)
+   :cpu (cf/get :font-process-cpu)})
+
+(defn- get-font-timeout
+  "Returns the wall-clock timeout for font processing, read from config."
+  []
+  (cf/get :font-process-timeout))
+
+(defn- exec-font!
+  "Execute a font processing command with resource limits.
+   `args` is a vector of string arguments."
+  [system args]
+  (shell/exec! system
+               :cmd args
+               :prlimit (get-font-prlimit)
+               :timeout (get-font-timeout)))
+
+(defmethod process :generate-fonts
+  [system {:keys [input] :as params}]
+  (letfn [(ttf->otf [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".otf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
+                                              (str/fmt "Open('%s'); Generate('%s')"
+                                                       (str finput)
+                                                       (str foutput))])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (otf->ttf [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".ttf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
+                                              (str/fmt "Open('%s'); Generate('%s')"
+                                                       (str finput)
+                                                       (str foutput))])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (ttf-or-otf->woff [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".woff"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["sfnt2woff" (str finput)])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (woff->sfnt [data]
+            (let [finput (tmp/tempfile :prefix "penpot" :suffix "")]
+              (try
+                (io/write* finput data)
+                (let [res (shell/exec! system
+                                       :cmd ["woff2sfnt" (str finput)]
+                                       :out-enc :bytes
+                                       :prlimit (get-font-prlimit)
+                                       :timeout (get-font-timeout))]
+                  (when (zero? (:exit res))
+                    (:out res)))
+                (finally
+                  (fs/delete finput)))))
+
+          (woff2->sfnt [data]
+            ;; woff2_decompress outputs to same directory with .ttf extension
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
+                  foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["woff2_decompress" (str finput)])]
+                  (if (zero? (:exit res))
+                    foutput
+                    (do
+                      (when (fs/exists? foutput)
+                        (fs/delete foutput))
+                      nil)))
+                (finally
+                  (fs/delete finput)))))
+
+          ;; Documented here:
+          ;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
+          (get-sfnt-type [data]
+            (let [buff (bb/slice data 0 4)
+                  type (bc/bytes->hex buff)]
+              (case type
+                "4f54544f" :otf
+                "00010000" :ttf
+                (ex/raise :type :internal
+                          :code :unexpected-data
+                          :hint "unexpected font data"))))
+
+          (gen-if-nil [val factory]
+            (if (nil? val)
+              (factory)
+              val))]
+
+    (let [current (into #{} (keys input))]
+      (cond
+        (contains? current "font/ttf")
+        (let [data (get input "font/ttf")]
+          (-> input
+              (update "font/otf" gen-if-nil #(ttf->otf data))
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
+
+        (contains? current "font/otf")
+        (let [data (get input "font/otf")]
+          (-> input
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
+              (assoc "font/ttf" (otf->ttf data))))
+
+        (contains? current "font/woff")
+        (let [data (get input "font/woff")
+              sfnt (woff->sfnt data)]
+          (when-not sfnt
+            (ex/raise :type :validation
+                      :code :invalid-woff-file
+                      :hint "invalid woff file"))
+          (let [stype (get-sfnt-type sfnt)]
+            (cond-> input
+              true
+              (-> (assoc "font/woff" data))
+
+              (= stype :otf)
+              (-> (assoc "font/otf" sfnt)
+                  (assoc "font/ttf" (otf->ttf sfnt)))
+
+              (= stype :ttf)
+              (-> (assoc "font/otf" (ttf->otf sfnt))
+                  (assoc "font/ttf" sfnt)))))
+
+        (contains? current "font/woff2")
+        (let [data    (get input "font/woff2")
+              foutput (woff2->sfnt data)]
+          (when-not foutput
+            (ex/raise :type :validation
+                      :code :invalid-woff2-file
+                      :hint "invalid woff2 file"))
+          (try
+            (let [sfnt  (io/read* foutput)
+                  type (get-sfnt-type sfnt)]
+              (cond-> input
+                (= type :otf)
+                (-> (assoc "font/otf" sfnt)
+                    (assoc "font/ttf" (otf->ttf sfnt))
+                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
+
+                (= type :ttf)
+                (-> (assoc "font/ttf" sfnt)
+                    (assoc "font/otf" (ttf->otf sfnt))
+                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
+            (finally
+              (fs/delete foutput))))))))
diff --git a/backend/src/app/media/remote.clj b/backend/src/app/media/remote.clj
new file mode 100644
index 0000000000..0b5a0a4a42
--- /dev/null
+++ b/backend/src/app/media/remote.clj
@@ -0,0 +1,264 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.remote
+  "Remote media processing via the media-processor HTTP service."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.media :as cm]
+   [app.common.time :as ct]
+   [app.common.uri :as uri]
+   [app.config :as cf]
+   [app.http.client :as http]
+   [app.media.svg :as svg]
+   [app.media.validation :as validation]
+   [app.setup :as-alias setup]
+   [app.storage.tmp :as tmp]
+   [app.util.json :as json]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io])
+  (:import
+   java.io.ByteArrayInputStream
+   java.io.InputStream
+   java.io.SequenceInputStream
+   java.net.ConnectException
+   java.net.http.HttpTimeoutException
+   java.util.Collections))
+
+(defn- service-base-url
+  "Returns the base URL of the media-processor service."
+  []
+  (or (cf/get :media-processing-service-uri)
+      (ex/raise :type :internal
+                :code :media-processor-not-configured
+                :hint "PENPOT_MEDIA_PROCESSING_SERVICE_URI is not configured")))
+
+(defn- service-timeout
+  "Returns the HTTP timeout (ms) for media-processor requests."
+  []
+  (or (cf/get :media-processing-service-timeout)
+      120000))
+
+(defn- get-shared-key
+  "Returns the shared key for authenticating with the media-processor."
+  [system]
+  (-> system ::setup/shared-keys :media-processor))
+
+(defn- parse-json-response
+  "Parse a JSON response body."
+  [body]
+  (json/read! body))
+
+(defn- translate-error
+  "Translate a media-processor error response into a Penpot exception."
+  [status body]
+  (let [code (or (:code body) "media-processor-error")
+        hint (or (:hint body) "media-processor request failed")]
+    (case status
+      400 {:type :validation    :code (keyword code) :hint hint}
+      403 {:type :authorization :code :forbidden      :hint hint}
+      413 {:type :restriction   :code (keyword code) :hint hint}
+      504 {:type :internal      :code :media-processor-timeout :hint hint}
+      {:type :internal :code (keyword code) :hint hint})))
+
+(defn service-request
+  "Make an HTTP request to the media-processor service."
+  [system {:keys [method uri body headers timeout]}]
+  (let [client  (::http/client system)
+        timeout (or timeout (service-timeout))]
+    (try
+      (let [resp (http/req client
+                           {:method method
+                            :uri uri
+                            :body body
+                            :headers headers}
+                           {:response-type :input-stream
+                            :skip-ssrf-check? true
+                            :timeout timeout})
+            status (:status resp)]
+        (when (not (<= 200 status 299))
+          (let [body (:body resp)]
+            (try
+              (let [parsed (try (parse-json-response body) (catch Exception _ nil))
+                    err    (translate-error status parsed)]
+                (ex/raise :type (:type err) :code (:code err) :hint (:hint err)))
+              (finally
+                (.close body)))))
+        resp)
+      (catch ConnectException _cause
+        (ex/raise :type :internal
+                  :code :media-processor-unavailable
+                  :hint "Cannot connect to media-processor service"))
+      (catch HttpTimeoutException _cause
+        (ex/raise :type :internal
+                  :code :media-processor-timeout
+                  :hint "media-processor service request timed out")))))
+
+(defn- multipart-boundary
+  []
+  (str "----PenpotBoundary" (System/currentTimeMillis)))
+
+(defn- build-multipart-stream
+  "Build a streaming multipart/form-data body with a single file field.
+   Returns an InputStream that lazily reads from the file on demand."
+  [^String boundary mtype ^InputStream file-stream]
+  (let [header (.getBytes (str "--" boundary "\r\n"
+                               "Content-Disposition: form-data; name=\"file\"; filename=\"file\"\r\n"
+                               "Content-Type: " mtype "\r\n"
+                               "\r\n")
+                          "UTF-8")
+        footer (.getBytes (str "\r\n--" boundary "--\r\n")
+                          "UTF-8")
+        parts  (Collections/enumeration
+                [(ByteArrayInputStream. header)
+                 file-stream
+                 (ByteArrayInputStream. footer)])]
+    (SequenceInputStream. parts)))
+
+(defn- service-multipart-request
+  "Send a multipart request to the media-processor service.
+   Accepts a file from disk via :path. The file stream is closed
+   after the HTTP request completes (success or failure)."
+  [system {:keys [endpoint path mtype query timeout]}]
+  (let [shared-key  (get-shared-key system)
+        boundary    (multipart-boundary)
+        ctype       (or mtype "application/octet-stream")
+        base-url    (service-base-url)
+        request-uri (cond-> (uri/join base-url endpoint)
+                      (seq query)
+                      (str "?" (uri/map->query-string query)))]
+    (with-open [file-stream (io/input-stream path)]
+      (let [body (build-multipart-stream boundary ctype file-stream)]
+        (service-request system
+                         {:method  :post
+                          :uri     request-uri
+                          :body    body
+                          :headers {"Content-Type" (str "multipart/form-data; boundary=" boundary)
+                                    "x-shared-key" shared-key}
+                          :timeout timeout})))))
+
+(def ^:private known-font-types
+  "Priority-ordered list of font mime-types the system knows how to convert.
+   Order matters: when a font upload contains multiple variants, the first
+   match becomes the conversion source (ttf preferred for best coverage)."
+  ["font/ttf" "font/otf" "font/woff" "font/woff2"])
+
+(defn- font-convert
+  "Convert a font to the given target mime-type via the media-processor service.
+   Accepts source font data as a filesystem Path. Returns a tempfile Path."
+  [system source-mtype target-mtype data]
+  (let [resp (service-multipart-request system {:endpoint "api/font/convert"
+                                                :path     data
+                                                :mtype    source-mtype
+                                                :query    {:target-type target-mtype}
+                                                :timeout  180000})
+        ext  (cm/mtype->extension target-mtype)
+        tmp  (tmp/tempfile :prefix "penpot.font." :suffix ext)
+        body (:body resp)]
+    (try
+      (io/write* tmp body)
+      (finally
+        (.close body)))
+    tmp))
+
+(defn- font-missing-variants
+  "Return the set of target mime-types that should be generated for the given
+   source mime-type (excluding font/woff2, which is never generated)."
+  [source-mtype]
+  (case source-mtype
+    "font/ttf"   #{"font/otf" "font/woff"}
+    "font/otf"   #{"font/ttf" "font/woff"}
+    "font/woff"  #{"font/ttf" "font/otf"}
+    "font/woff2" #{"font/ttf" "font/otf" "font/woff"}))
+
+(defmulti process (fn [_system params] (:cmd params)))
+
+(defmethod process :info
+  [system {:keys [input]}]
+  (let [{:keys [path mtype]} (validation/check-input input)]
+    (if (= mtype "image/svg+xml")
+      ;; SVG: parse locally (Sharp doesn't support SVG)
+      (let [info (some-> path slurp svg/parse-svg svg/get-basic-info-from-svg)]
+        (when-not info
+          (ex/raise :type :validation
+                    :code :invalid-svg-file
+                    :hint "uploaded svg does not provide dimensions"))
+        (merge input info {:ts (ct/now) :size (fs/size path)}))
+      ;; Raster: delegate to media-processor
+      (let [resp (service-multipart-request system {:endpoint "api/image/info"
+                                                    :path     path
+                                                    :mtype    mtype})
+            body (:body resp)]
+        (try
+          (let [info (parse-json-response body)
+                detected-mtype (:mtype info)]
+            (when (and (string? mtype)
+                       (string? detected-mtype)
+                       (not= (str/lower mtype) (str/lower detected-mtype)))
+              (ex/raise :type :validation
+                        :code :media-type-mismatch
+                        :hint (str "File content does not match the declared type. "
+                                   "Expected: " mtype ". Got: " detected-mtype)))
+            (assoc input
+                   :width  (:width info)
+                   :height (:height info)
+                   :size   (fs/size path)
+                   :ts     (ct/now)))
+          (finally
+            (.close body)))))))
+
+(defn- thumbnail-request
+  "Shared implementation for generic-thumbnail and profile-thumbnail."
+  [system params mode]
+  (let [{:keys [input format quality width height]} params
+        {:keys [path mtype]} (validation/check-input input)
+        fmt        (name (or format (cm/mtype->format mtype) :jpeg))
+        resp       (service-multipart-request system {:endpoint "api/image/thumbnail"
+                                                      :path     path
+                                                      :mtype    mtype
+                                                      :query    {:width   width
+                                                                 :height  height
+                                                                 :quality quality
+                                                                 :format  fmt
+                                                                 :mode    mode}})
+        out-format (or format (cm/mtype->format mtype) :jpeg)
+        ext        (cm/format->extension out-format)
+        tmp        (tmp/tempfile :prefix "penpot.media." :suffix ext)
+        body       (:body resp)]
+    (try
+      (io/write* tmp body)
+      (finally
+        (.close body)))
+    (assoc params
+           :format out-format
+           :mtype  (cm/format->mtype out-format)
+           :size   (fs/size tmp)
+           :data   tmp)))
+
+(defmethod process :generic-thumbnail
+  [system params]
+  (thumbnail-request system params "fit"))
+
+(defmethod process :profile-thumbnail
+  [system params]
+  (thumbnail-request system params "crop"))
+
+(defmethod process :generate-fonts
+  [system {:keys [input]}]
+  (let [source-mtype (or (some #(when (contains? input %) %) known-font-types)
+                         (ex/raise :type :validation
+                                   :code :invalid-font
+                                   :hint "No recognized font variant in input"))
+        data         (get input source-mtype)
+        present      (set (keys input))
+        targets      (remove present (font-missing-variants source-mtype))]
+    (reduce (fn [acc target-mtype]
+              (assoc acc target-mtype
+                     (font-convert system source-mtype target-mtype data)))
+            input
+            targets)))
+
diff --git a/backend/src/app/media/svg.clj b/backend/src/app/media/svg.clj
new file mode 100644
index 0000000000..1de52d4030
--- /dev/null
+++ b/backend/src/app/media/svg.clj
@@ -0,0 +1,130 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.svg
+  "SVG parsing, sanitization, and info extraction.
+   Centralizes all SVG-related security concerns."
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [clojure.xml :as xml]
+   [cuerdas.core :as str])
+  (:import
+   clojure.lang.XMLHandler
+   java.io.InputStream
+   javax.xml.parsers.SAXParserFactory
+   javax.xml.XMLConstants
+   org.apache.commons.io.IOUtils))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG PARSING
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn- secure-parser-factory
+  [^InputStream input ^XMLHandler handler]
+  (.. (doto (SAXParserFactory/newInstance)
+        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
+        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
+      (newSAXParser)
+      (parse input handler)))
+
+(defn- strip-doctype
+  [data]
+  (cond-> data
+    (str/includes? data "<!DOCTYPE")
+    (str/replace #"<\!DOCTYPE[^>]*>" "")))
+
+(defn parse-svg
+  [text]
+  (let [text (strip-doctype text)]
+    (dm/with-open [istream (IOUtils/toInputStream ^String text "UTF-8")]
+      (xml/parse istream secure-parser-factory))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG SANITIZATION
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private dangerous-attrs-pattern #"(?i)^on\w+$")
+(def ^:private javascript-href-pattern #"(?i)^javascript:")
+
+(defn- sanitize-svg-element
+  "Recursively sanitize an SVG element by removing dangerous tags and attributes."
+  [{:keys [tag attrs content] :as element}]
+  (when (and (map? element) tag)
+    (let [dangerous-tags #{:script :foreignObject :set :animate :animateTransform :animateColor :animateMotion}]
+      (when-not (contains? dangerous-tags tag)
+        (let [clean-attrs (->> attrs
+                               (remove (fn [[k v]]
+                                         (or (re-matches dangerous-attrs-pattern (name k))
+                                             (and (#{:href :xlink:href} k)
+                                                  (string? v)
+                                                  (re-find javascript-href-pattern (str/trim v))))))
+                               (into {}))
+              clean-content (when content
+                              (->> content
+                                   (filter #(or (string? %) (map? %)))
+                                   (map (fn [child]
+                                          (if (map? child)
+                                            (sanitize-svg-element child)
+                                            child)))
+                                   (filter some?)
+                                   vec))]
+          (cond-> {:tag tag :attrs clean-attrs}
+            (seq clean-content) (assoc :content clean-content)))))))
+
+(defn sanitize-svg
+  "Sanitize SVG content by removing dangerous elements and attributes.
+   Removes <script> tags, <foreignObject> elements, event handlers (on*),
+   and javascript: URLs from href attributes."
+  [svg-text]
+  (try
+    (let [parsed (parse-svg svg-text)
+          sanitized (sanitize-svg-element parsed)]
+      (if sanitized
+        (with-out-str (xml/emit sanitized))
+        (ex/raise :type :validation
+                  :code :invalid-svg-file
+                  :hint "SVG sanitization produced no output")))
+    (catch Exception e
+      (l/warn :hint "SVG sanitization failed, rejecting upload" :cause e)
+      (ex/raise :type :validation
+                :code :invalid-svg-file
+                :hint "SVG parsing failed during sanitization"
+                :cause e))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG INFO EXTRACTION
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn get-basic-info-from-svg
+  [{:keys [tag attrs] :as data}]
+  (when (not= tag :svg)
+    (ex/raise :type :validation
+              :code :unable-to-parse-svg
+              :hint "uploaded svg has invalid content"))
+  (reduce (fn [default f]
+            (if-let [res (f attrs)]
+              (reduced res)
+              default))
+          {:width 100 :height 100}
+          [(fn parse-width-and-height
+             [{:keys [width height]}]
+             (when (and (string? width)
+                        (string? height))
+               (let [width  (d/parse-double width)
+                     height (d/parse-double height)]
+                 (when (and width height)
+                   {:width (int width)
+                    :height (int height)}))))
+           (fn parse-viewbox
+             [{:keys [viewBox]}]
+             (let [[x y width height] (->> (str/split viewBox #"\s+" 4)
+                                           (map d/parse-double))]
+               (when (and x y width height)
+                 {:width (int width)
+                  :height (int height)})))]))
diff --git a/backend/src/app/media/validation.clj b/backend/src/app/media/validation.clj
new file mode 100644
index 0000000000..17dbd80e71
--- /dev/null
+++ b/backend/src/app/media/validation.clj
@@ -0,0 +1,68 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.validation
+  "Schemas and validation functions for media uploads.
+   Leaf namespace — depends on app.common.* and app.config only."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.media :as cm]
+   [app.common.schema :as sm]
+   [app.config :as cf]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]))
+
+(def schema:upload
+  [:map {:title "Upload"}
+   [:filename :string]
+   [:size ::sm/int]
+   [:path ::fs/path]
+   [:mtype {:optional true} :string]
+   [:headers {:optional true}
+    [:map-of :string :string]]])
+
+(def schema:input
+  [:map {:title "Input"}
+   [:path ::fs/path]
+   [:mtype {:optional true} ::sm/text]])
+
+(def check-input
+  (sm/check-fn schema:input))
+
+(defn validate-media-type!
+  ([upload] (validate-media-type! upload cm/image-types))
+  ([upload allowed]
+   (when-not (contains? allowed (:mtype upload))
+     (ex/raise :type :validation
+               :code :media-type-not-allowed
+               :hint "Seems like you are uploading an invalid media object"))
+
+   upload))
+
+(defn validate-media-size!
+  [upload]
+  (let [max-size (cf/get :media-max-file-size)]
+    (when (> (:size upload) max-size)
+      (ex/raise :type :restriction
+                :code :media-max-file-size-reached
+                :hint (str/ffmt "the uploaded file size % is greater than the maximum %"
+                                (:size upload)
+                                max-size)))
+    upload))
+
+(defn validate-font-size!
+  "Validates that the font file `upload` does not exceed the configured
+  `:font-max-file-size` limit.  Accepts the same map shape as
+  `validate-media-size!` — requires a `:size` key in bytes."
+  [upload]
+  (let [max-size (cf/get :font-max-file-size)]
+    (when (> (:size upload) max-size)
+      (ex/raise :type :restriction
+                :code :font-max-file-size-reached
+                :hint (str/ffmt "the uploaded font size % is greater than the maximum %"
+                                (:size upload)
+                                max-size)))
+    upload))
diff --git a/backend/src/app/migrations.clj b/backend/src/app/migrations.clj
index 150e69ced2..2edb8614d5 100644
--- a/backend/src/app/migrations.clj
+++ b/backend/src/app/migrations.clj
@@ -496,7 +496,10 @@
     :fn (mg/resource "app/migrations/sql/0151-mod-file-tagged-object-thumbnail-table.sql")}
 
    {:name "0152-improve-uuid-defaults-and-drop-extension"
-    :fn (mg/resource "app/migrations/sql/0152-improve-uuid-defaults-and-drop-extension.sql")}])
+    :fn (mg/resource "app/migrations/sql/0152-improve-uuid-defaults-and-drop-extension.sql")}
+
+   {:name "0152-rename-version-and-add-indexes-to-server-error-report"
+    :fn (mg/resource "app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql")}])
 
 (defn apply-migrations!
   [pool name migrations]
diff --git a/backend/src/app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql b/backend/src/app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql
new file mode 100644
index 0000000000..eb646b9274
--- /dev/null
+++ b/backend/src/app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql
@@ -0,0 +1,44 @@
+-- Add source column (keep version column as-is for backward compatibility)
+ALTER TABLE server_error_report
+  ADD COLUMN source integer;
+
+-- Trigger function to sync version -> source (backward compatibility with old code)
+CREATE OR REPLACE FUNCTION server_error_report__sync_version_to_source()
+RETURNS TRIGGER AS $$
+BEGIN
+  IF NEW.version IS NOT NULL AND NEW.source IS NULL THEN
+    NEW.source := NEW.version;
+  END IF;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger fires on INSERT or UPDATE OF version column
+CREATE TRIGGER server_error_report__sync_version_to_source__tgr
+  BEFORE INSERT OR UPDATE OF version ON server_error_report
+  FOR EACH ROW
+  EXECUTE FUNCTION server_error_report__sync_version_to_source();
+
+-- Backfill existing rows
+UPDATE server_error_report SET source = version WHERE source IS NULL;
+
+-- Drop old version index
+DROP INDEX IF EXISTS server_error_report__version__idx;
+
+-- Create new source index
+CREATE INDEX server_error_report__source__idx
+  ON server_error_report (source);
+
+-- Content-based indexes
+CREATE INDEX server_error_report__content_kind__idx
+  ON server_error_report (COALESCE(content->>'~:kind', content->>'~:origin'));
+
+CREATE INDEX server_error_report__content_tenant__idx
+  ON server_error_report ((content->>'~:tenant'));
+
+CREATE INDEX server_error_report__content_version__idx
+  ON server_error_report ((content->>'~:version'));
+
+-- Index for pagination
+CREATE INDEX server_error_report__created_at_id__idx
+  ON server_error_report (created_at DESC, id DESC);
diff --git a/backend/src/app/nitrate.clj b/backend/src/app/nitrate.clj
index 741e0f836f..7f4b470ab3 100644
--- a/backend/src/app/nitrate.clj
+++ b/backend/src/app/nitrate.clj
@@ -49,7 +49,7 @@
   "Joins relative path segments to the Nitrate backend URI.
    Segments must not start with `/`"
   [& segments]
-  (apply join-base-uri (cf/get :nitrate-backend-uri) segments))
+  (apply join-base-uri (cf/get :admin-console-uri) segments))
 
 (defn- generate-public-uri
   "Joins relative path segments to the public backend URI.
@@ -143,7 +143,7 @@
 
 (defn- request-to-nitrate
   [cfg method uri schema {:keys [::rpc/profile-id request-params throw-on-error?] :as params}]
-  (let [shared-key     (-> cfg ::setup/shared-keys :nitrate)
+  (let [shared-key     (-> cfg ::setup/shared-keys :admin-console)
         full-http-call (-> (request-builder cfg method uri shared-key profile-id request-params)
                            (with-retries 3)
                            (with-validate uri schema :throw-on-error? throw-on-error?))]
@@ -155,14 +155,14 @@
 
 (defn call
   [cfg method params]
-  (when (contains? cf/flags :nitrate)
+  (when (contains? cf/flags :admin-console)
     (let [client (get cfg ::client)
           method (get client method)]
       (method params))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private schema:org-summary
+(def ^:private schema:organization-summary
   [:map
    [:id ::sm/uuid]
    [:name ::sm/text]
@@ -173,13 +173,6 @@
       [:id ::sm/uuid]
       [:is-your-penpot :boolean]]]]])
 
-(def ^:private schema:profile-org
-  [:map
-   [:is-member :boolean]
-   [:organization-id {:optional true} [:maybe ::sm/uuid]]
-   [:default-team-id {:optional true} [:maybe ::sm/uuid]]])
-
-
 ;; TODO Unify with schemas on backend/src/app/http/management.clj
 (def ^:private schema:timestamp
   (sm/type-schema
@@ -196,6 +189,13 @@
      :decode/json ct/inst
      :encode/json inst-ms}}))
 
+(def ^:private schema:profile-organization
+  [:map
+   [:is-member :boolean]
+   [:organization-id {:optional true} [:maybe ::sm/uuid]]
+   [:default-team-id {:optional true} [:maybe ::sm/uuid]]
+   [:created-at {:optional true} [:maybe schema:timestamp]]])
+
 (def ^:private schema:subscription
   [:map {:title "Subscription"}
    [:id ::sm/text]
@@ -253,13 +253,13 @@
   [:map
    [:licenses ::sm/boolean]])
 
-(defn- get-team-org-api
+(defn- get-team-organization-api
   [cfg {:keys [team-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri "api/teams/" team-id)
                       cto/schema:team-with-organization params))
 
-(defn- get-org-membership-api
+(defn- get-organization-membership-api
   [cfg {:keys [profile-id organization-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
@@ -267,9 +267,9 @@
                        organization-id
                        "members/"
                        profile-id)
-                      schema:profile-org params))
+                      schema:profile-organization params))
 
-(defn- get-org-membership-by-team-api
+(defn- get-organization-membership-by-team-api
   [cfg {:keys [profile-id team-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
@@ -277,28 +277,28 @@
                        team-id
                        "users/"
                        profile-id)
-                      schema:profile-org params))
+                      schema:profile-organization params))
 
-(defn- get-org-summary-api
+(defn- get-organization-summary-api
   [cfg {:keys [organization-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
                        "api/organizations/"
                        organization-id
                        "summary")
-                      schema:org-summary params))
+                      schema:organization-summary params))
 
-(defn- get-owned-orgs-api
+(defn- get-owned-organizations-api
   [cfg {:keys [profile-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
                        "api/users/"
                        profile-id
                        "owned-organizations")
-                      [:vector schema:org-summary]
+                      [:vector schema:organization-summary]
                       params))
 
-(def ^:private schema:org-summary-counts
+(def ^:private schema:organization-summary-counts
   [:map
    [:id ::sm/uuid]
    [:name ::sm/text]
@@ -308,20 +308,20 @@
    [:avatar-bg-url {:optional true} [:maybe ::sm/uri]]
    [:logo-id {:optional true} [:maybe ::sm/uuid]]])
 
-(defn- get-owned-orgs-summary-api
+(defn- get-owned-organizations-summary-api
   [cfg {:keys [profile-id] :as params}]
-  (let [orgs (request-to-nitrate cfg :get
-                                 (generate-nitrate-uri
-                                  "api/users/"
-                                  profile-id
-                                  "owned-organizations-summary")
-                                 [:vector schema:org-summary-counts]
-                                 params)]
-    (mapv (fn [org]
-            (if-let [logo-id (:logo-id org)]
-              (assoc org :custom-photo (generate-public-uri "assets/by-id/" logo-id))
-              org))
-          orgs)))
+  (let [organizations (request-to-nitrate cfg :get
+                                          (generate-nitrate-uri
+                                           "api/users/"
+                                           profile-id
+                                           "owned-organizations-summary")
+                                          [:vector schema:organization-summary-counts]
+                                          params)]
+    (mapv (fn [organization]
+            (if-let [logo-id (:logo-id organization)]
+              (assoc organization :custom-photo (generate-public-uri "assets/by-id/" logo-id))
+              organization))
+          organizations)))
 
 (defn- cleanup-deleted-penpot-user-api
   [cfg {:keys [profile-id] :as params}]
@@ -332,7 +332,7 @@
                        "cleanup-after-deletion")
                       nil params))
 
-(defn- set-team-org-api
+(defn- set-team-organization-api
   [cfg {:keys [organization-id team-id is-default] :as params}]
   (let [params (assoc params :request-params {:team-id team-id
                                               :is-your-penpot (true? is-default)})
@@ -348,7 +348,7 @@
       custom-photo
       (assoc-in [:organization :custom-photo] custom-photo))))
 
-(defn- add-profile-to-org-api
+(defn- add-profile-to-organization-api
   [cfg {:keys [profile-id organization-id team-id email] :as params}]
   (let [request-params (cond-> {:user-id profile-id :team-id team-id}
                          (some? email) (assoc :email email))
@@ -358,11 +358,16 @@
                          "api/organizations/"
                          organization-id
                          "add-user")
-                        schema:profile-org params)))
+                        schema:profile-organization params)))
 
-(defn- remove-profile-from-org-api
-  [cfg {:keys [profile-id organization-id] :as params}]
-  (let [params (assoc params :request-params {:user-id profile-id})]
+(defn- remove-profile-from-organization-api
+  [cfg {:keys [profile-id organization-id user-who-delete-member deleted-by-role] :as params}]
+  (let [request-params (cond-> {:user-id profile-id}
+                         (some? user-who-delete-member)
+                         (assoc :user-who-delete-member user-who-delete-member)
+                         (some? deleted-by-role)
+                         (assoc :deleted-by-role deleted-by-role))
+        params (assoc params :request-params request-params)]
     (request-to-nitrate cfg :post
                         (generate-nitrate-uri
                          "api/organizations/"
@@ -370,7 +375,7 @@
                          "remove-user")
                         nil params)))
 
-(defn- remove-team-from-org-api
+(defn- remove-team-from-organization-api
   [cfg {:keys [team-id organization-id] :as params}]
   (let [params (assoc params :request-params {:team-id team-id})]
     (request-to-nitrate cfg :post
@@ -413,11 +418,22 @@
                       (generate-nitrate-uri "api/connectivity")
                       schema:connectivity params))
 
+(def ^:private schema:identity
+  [:map
+   [:nitrate-id ::sm/text]
+   [:public-key ::sm/text]])
+
+(defn- get-identity-api
+  [cfg params]
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/identity")
+                      schema:identity params))
+
 (def ^:private schema:redeem-result
   [:map
    [:cancel-at [:maybe schema:timestamp]]])
 
-(defn- get-org-permissions-api
+(defn- get-organization-permissions-api
   [cfg {:keys [organization-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
@@ -430,7 +446,7 @@
                        [:permissions [:map-of :keyword :string]]]
                       params))
 
-(defn- get-org-sso-api
+(defn- get-organization-sso-api
   "Fetches the SSO configuration for an organization from Nitrate."
   [cfg {:keys [organization-id] :as params}]
   (request-to-nitrate cfg :get
@@ -441,14 +457,14 @@
                       schema:nitrate-sso
                       params))
 
-(defn- get-org-sso-by-team-api
+(defn- get-organization-sso-by-team-api
   [cfg {:keys [team-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri "api/teams/" team-id "sso")
                       schema:nitrate-sso
                       params))
 
-(defn- get-org-members-api
+(defn- get-organization-members-api
   [cfg {:keys [organization-id] :as params}]
   (request-to-nitrate cfg :get
                       (generate-nitrate-uri
@@ -471,35 +487,36 @@
 
 (defmethod ig/init-key ::client
   [_ cfg]
-  (when (contains? cf/flags :nitrate)
-    {:get-team-org                 (partial get-team-org-api cfg)
-     :set-team-org                 (partial set-team-org-api cfg)
-     :get-org-membership           (partial get-org-membership-api cfg)
-     :get-org-membership-by-team   (partial get-org-membership-by-team-api cfg)
-     :get-org-summary              (partial get-org-summary-api cfg)
-     :get-owned-orgs               (partial get-owned-orgs-api cfg)
-     :get-owned-orgs-summary       (partial get-owned-orgs-summary-api cfg)
-     :get-org-members              (partial get-org-members-api cfg)
+  (when (contains? cf/flags :admin-console)
+    {:get-team-organization                 (partial get-team-organization-api cfg)
+     :set-team-organization                 (partial set-team-organization-api cfg)
+     :get-organization-membership           (partial get-organization-membership-api cfg)
+     :get-organization-membership-by-team   (partial get-organization-membership-by-team-api cfg)
+     :get-organization-summary              (partial get-organization-summary-api cfg)
+     :get-owned-organizations               (partial get-owned-organizations-api cfg)
+     :get-owned-organizations-summary       (partial get-owned-organizations-summary-api cfg)
+     :get-organization-members              (partial get-organization-members-api cfg)
      :cleanup-deleted-penpot-user  (partial cleanup-deleted-penpot-user-api cfg)
-     :add-profile-to-org           (partial add-profile-to-org-api cfg)
-     :remove-profile-from-org      (partial remove-profile-from-org-api cfg)
-     :get-org-permissions          (partial get-org-permissions-api cfg)
-     :get-org-sso-by-team          (partial get-org-sso-by-team-api cfg)
-     :get-org-sso                  (partial get-org-sso-api cfg)
+     :add-profile-to-organization           (partial add-profile-to-organization-api cfg)
+     :remove-profile-from-organization      (partial remove-profile-from-organization-api cfg)
+     :get-organization-permissions          (partial get-organization-permissions-api cfg)
+     :get-organization-sso-by-team          (partial get-organization-sso-by-team-api cfg)
+     :get-organization-sso                  (partial get-organization-sso-api cfg)
      :delete-team                  (partial delete-team-api cfg)
-     :remove-team-from-org         (partial remove-team-from-org-api cfg)
+     :remove-team-from-organization         (partial remove-team-from-organization-api cfg)
      :get-subscription             (partial get-subscription-api cfg)
      :get-subscription-warning     (partial get-subscription-warning-api cfg)
      :connectivity                 (partial get-connectivity-api cfg)
+     :get-identity                 (partial get-identity-api cfg)
      :redeem-activation-code       (partial redeem-activation-code-api cfg)}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; UTILS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defonce ^:private team-org-owner-cache
+(defonce ^:private team-organization-owner-cache
   ;; Short TTL: permission checks run on the read path, so we avoid an
-  ;; HTTP call to nitrate per check. The org owner of a team rarely
+  ;; HTTP call to nitrate per check. The organization owner of a team rarely
   ;; changes, and stale entries only grant read access for a few seconds.
   (cache/create :expire "30s" :max-size 2048))
 
@@ -509,47 +526,47 @@
   [cfg]
   (and (map? cfg) (some? (get cfg ::client))))
 
-(def ^:private cache-miss ::no-org-owner)
+(def ^:private cache-miss ::no-organization-owner)
 
-(defn- get-team-org-owner-id
+(defn- get-team-organization-owner-id
   "Returns the organization owner-id for `team-id`, or nil. Cached
   briefly, including negative results (teams with no organization) so
   repeated unauthorized probes don't each hit nitrate."
   [cfg team-id]
-  (let [owner-id (cache/get team-org-owner-cache team-id
+  (let [owner-id (cache/get team-organization-owner-cache team-id
                             (fn [team-id]
-                              (let [team-with-org (call cfg :get-team-org {:team-id team-id})]
-                                (or (get-in team-with-org [:organization :owner-id])
+                              (let [team-with-organization (call cfg :get-team-organization {:team-id team-id})]
+                                (or (get-in team-with-organization [:organization :owner-id])
                                     cache-miss))))]
     (when-not (= owner-id cache-miss)
       owner-id)))
 
 (defn organization-owner-of-team?
   "True if `profile-id` is the owner of the organization that owns
-  `team-id`. Used to grant non-member org owners read-only access to the
+  `team-id`. Used to grant non-member organization owners read-only access to the
   teams of their organizations. `cfg` must be a config map with the
   nitrate client; raw db connections/pools yield false so internal
   callers are unaffected. Returns false when the :nitrate flag is off."
   [cfg profile-id team-id]
   (boolean
-   (when (and (contains? cf/flags :nitrate)
+   (when (and (contains? cf/flags :admin-console)
               (nitrate-client? cfg)
               (some? team-id)
               (some? profile-id))
-     (= profile-id (get-team-org-owner-id cfg team-id)))))
+     (= profile-id (get-team-organization-owner-id cfg team-id)))))
 
 (defn sso-session-authorized?
-  "Fetches the org-SSO config for the given organization or team and checks
+  "Fetches the organization-SSO config for the given organization or team and checks
   whether the HTTP request has a valid session entry for it. Returns a map
   with :authorized and :sso keys."
   [cfg organization-id team-id request]
   (let [session (session/get-session request)
         sso     (if organization-id
-                  (call cfg :get-org-sso {:organization-id organization-id})
-                  (call cfg :get-org-sso-by-team {:team-id team-id}))]
+                  (call cfg :get-organization-sso {:organization-id organization-id})
+                  (call cfg :get-organization-sso-by-team {:team-id team-id}))]
     (if-not (:active sso)
       {:authorized true :sso sso}
-      (if (or (:issuer sso) (:base-url sso))
+      (if-not (str/blank? (:issuer sso))
         (let [props           (:props session)
               sso-map         (get props :sso {})
               organization-id (:organization-id sso)
@@ -579,21 +596,21 @@
                    :cause cause)
           profile)))))
 
-(defn add-org-info-to-team
+(defn add-organization-info-to-team
   "Enriches a team map with organization information from Nitrate.
   Adds organization-id, organization-name, organization-slug, organization-owner-id, and your-penpot fields.
-  Returns the original team unchanged if the request fails or org data is nil.
+  Returns the original team unchanged if the request fails or organization data is nil.
   Propagates `:nitrate-unavailable` so the request is rejected when Nitrate is unreachable."
   [cfg team params]
   (try
     (let [params        (assoc (or params {}) :team-id (:id team))
-          team-with-org (call cfg :get-team-org params)
-          org           (:organization team-with-org)]
-      (if (some? org)
-        (-> (cto/apply-organization team (assoc org :custom-photo
-                                                (when-let [logo-id (:logo-id org)]
+          team-with-organization (call cfg :get-team-organization params)
+          organization           (:organization team-with-organization)]
+      (if (some? organization)
+        (-> (cto/apply-organization team (assoc organization :custom-photo
+                                                (when-let [logo-id (:logo-id organization)]
                                                   (generate-public-uri "assets/by-id/" logo-id))))
-            (assoc :is-default (or (:is-default team) (true? (:is-your-penpot team-with-org)))))
+            (assoc :is-default (or (:is-default team) (true? (:is-your-penpot team-with-organization)))))
         team))
     (catch Throwable cause
       (if (= :nitrate-unavailable (-> cause ex-data :type))
@@ -613,10 +630,10 @@
                       :team-id (:id team)
                       :organization-id (:organization-id params)
                       :is-default (:is-default params))
-        result (call cfg :set-team-org params)]
+        result (call cfg :set-team-organization params)]
     (when (nil? result)
       (ex/raise :type :internal
-                :code :failed-to-set-team-org
+                :code :failed-to-set-team-organization
                 :context {:team-id (:id team)
                           :organization-id (:organization-id params)}))
     team))
diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj
index 98126e574d..c7e33312ca 100644
--- a/backend/src/app/rpc.clj
+++ b/backend/src/app/rpc.clj
@@ -41,6 +41,7 @@
    [app.util.cache :as cache]
    [app.util.inet :as inet]
    [app.util.services :as sv]
+   [clojure.set :as set]
    [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
    [integrant.core :as ig]
@@ -102,8 +103,10 @@
             session-id   (yreq/get-header request "x-session-id")
 
             key-id       (get request ::http/auth-key-id)
-            profile-id   (or (::session/profile-id request)
-                             (::actoken/profile-id request)
+            session-pid  (::session/profile-id request)
+            token-pid    (::actoken/profile-id request)
+            profile-id   (or session-pid
+                             token-pid
                              (if key-id uuid/zero nil))
 
             ip-addr      (inet/parse-request request)
@@ -116,7 +119,15 @@
                              (assoc ::session-id (some-> session-id uuid/parse*))
                              (assoc ::cond/key etag)
                              (cond-> (uuid? profile-id)
-                               (assoc ::profile-id profile-id)))
+                               (assoc ::profile-id profile-id))
+                             (cond-> (uuid? session-pid)
+                               (assoc ::auth-type :session))
+                             (cond-> (and (not (uuid? session-pid))
+                                          (uuid? token-pid))
+                               (-> (assoc ::auth-type :token)
+                                   (assoc ::token-perms (set (::actoken/perms request #{})))))
+                             (cond-> key-id
+                               (assoc ::auth-key-id key-id)))
 
             data         (with-meta data
                            {::http/request request})
@@ -151,13 +162,40 @@
 
 (defn- wrap-authentication
   [_ f mdata]
-  (fn [cfg params]
-    (let [profile-id (::profile-id params)]
-      (if (and (::auth mdata true) (not (uuid? profile-id)))
-        (ex/raise :type :authentication
-                  :code :authentication-required
-                  :hint "authentication required for this endpoint")
-        (f cfg params)))))
+  (let [required-auth?      (::auth mdata true)
+        required-auth-type  (::auth-type mdata)
+        required-perms      (into #{} (::perms mdata))]
+    (fn [cfg params]
+      (let [profile-id  (::profile-id params)
+            auth-type   (::auth-type params)
+            token-perms (set (::token-perms params #{}))]
+        (cond
+          (and required-auth? (not (uuid? profile-id)))
+          (ex/raise :type :authentication
+                    :code :authentication-required
+                    :hint "authentication required for this endpoint")
+
+          (and (= required-auth-type :token)
+               (not= auth-type :token))
+          (ex/raise :type :authorization
+                    :code :token-auth-required
+                    :hint "access token authentication required for this endpoint")
+
+          (and (seq required-perms)
+               (not= auth-type :token))
+          (ex/raise :type :authorization
+                    :code :token-auth-required
+                    :hint "access token authentication required for this endpoint")
+
+          (and (seq required-perms)
+               (not (set/subset? required-perms token-perms)))
+          (ex/raise :type :authorization
+                    :code :missing-perms
+                    :hint "missing required permissions"
+                    :required required-perms)
+
+          :else
+          (f cfg params))))))
 
 (defn- wrap-db-transaction
   [_ f mdata]
@@ -212,13 +250,13 @@
     f))
 
 
-(defonce ^:private org-sso-auth-cache
+(defonce ^:private organization-sso-auth-cache
   (cache/create :expire "15m" :max-size 1024))
 
-(defn invalidate-org-sso-cache-by-org!
-  "Invalidates all org-SSO authorization cache entries for the given organization-id."
+(defn invalidate-organization-sso-cache-by-organization!
+  "Invalidates all organization-SSO authorization cache entries for the given organization-id."
   [organization-id]
-  (cache/invalidate-if org-sso-auth-cache #(= (:organization-id %) organization-id)))
+  (cache/invalidate-if organization-sso-auth-cache #(= (:organization-id %) organization-id)))
 
 (defn- wrap-nitrate-sso
   "Enforce Nitrate organization SSO authentication for RPC handlers.
@@ -230,18 +268,18 @@
    4. Explicit :file-id param -> lookup file's team via join
    5. :id param dispatched by ::rpc/id-type metadata (:team, :project, or :file)
 
-   Once the context is resolved, checks if the user is authorized within that org's
+   Once the context is resolved, checks if the user is authorized within that organization's
    SSO session using nitrate/sso-session-authorized?. Authorized results are cached
    by [profile-id cache-ref] for 15 minutes to avoid repeated lookups.
 
    Only activates when:
    - Nitrate flag is enabled
    - Endpoint requires authentication (::auth true by default)
-   - Endpoint is not marked with ::nitrate/org-sso false
+   - Endpoint is not marked with ::nitrate/organization-sso false
 
-   Raises :nitrate-sso-required error if user is not authorized in the org."
+   Raises :nitrate-sso-required error if user is not authorized in the organization."
   [_ f mdata]
-  (if (and (contains? cf/flags :nitrate)
+  (if (and (contains? cf/flags :admin-console)
            (::auth mdata true) ;; only for endpoints that needs auth
            (::nitrate/sso mdata true))
     (fn [cfg params]
@@ -261,7 +299,7 @@
           (let [cache-ref  (or organization-id team-id project-id file-id)
 
                 cache-key  [profile-id cache-ref]
-                cached     (cache/get org-sso-auth-cache cache-key)
+                cached     (cache/get organization-sso-auth-cache cache-key)
                 result     (if (some? cached)
                              cached
                              (let [team-id                  (when-not organization-id
@@ -276,7 +314,7 @@
                                    entry                    {:authorized      authorized
                                                              :organization-id (:organization-id sso)}]
                                (when authorized
-                                 (cache/get org-sso-auth-cache cache-key (constantly entry)))
+                                 (cache/get organization-sso-auth-cache cache-key (constantly entry)))
                                entry))]
             (if (:authorized result)
               (f cfg params)
@@ -339,6 +377,7 @@
           'app.rpc.commands.binfile
           'app.rpc.commands.comments
           'app.rpc.commands.demo
+          'app.rpc.commands.error-reports
           'app.rpc.commands.files
           'app.rpc.commands.files-create
           'app.rpc.commands.files-share
@@ -391,7 +430,7 @@
   [cfg]
   (let [cfg  (assoc cfg ::module "management" ::type "command" ::metrics-id :rpc-management-timing)
         mods (cond->> (list 'app.rpc.management.exporter)
-               (contains? cf/flags :nitrate)
+               (contains? cf/flags :admin-console)
                (cons 'app.rpc.management.nitrate))]
 
     (->> (apply sv/scan-ns mods)
diff --git a/backend/src/app/rpc/commands/access_token.clj b/backend/src/app/rpc/commands/access_token.clj
index 0aee2c42a8..0aa20ba3c1 100644
--- a/backend/src/app/rpc/commands/access_token.clj
+++ b/backend/src/app/rpc/commands/access_token.clj
@@ -29,11 +29,16 @@
       AND type = 'mcp'")
 
 (defn create-access-token
+  "Create an access token with empty perms.
+
+  Elevated permissions (e.g. error-reports:read) are not assignable via
+  the public API; grant them with SQL or `repl:grant-access-token-perm`."
   [{:keys [::db/conn] :as cfg} profile-id name expiration type]
   (let [token-id   (uuid/next)
         expires-at (some-> expiration (ct/in-future))
         created-at (ct/now)
-        token      (tokens/generate cfg {:iss "access-token"
+        token-iss  (if (= type "mcp") "urn:penpot:mcp-token" "access-token")
+        token      (tokens/generate cfg {:iss token-iss
                                          :uid profile-id
                                          :iat created-at
                                          :tid token-id})
@@ -61,6 +66,27 @@
   [cfg profile-id name expiration]
   (db/tx-run! cfg create-access-token profile-id name expiration))
 
+(def ^:private sql:grant-access-token-perm
+  "UPDATE access_token
+      SET perms = (
+            SELECT ARRAY(
+              SELECT DISTINCT unnest(perms || ARRAY[?]::text[])
+            )
+          ),
+          updated_at = now()
+    WHERE id = ?
+RETURNING id, perms")
+
+(defn repl:grant-access-token-perm
+  "Append a permission string to an access token (operator/SQL path).
+
+  Example: (repl:grant-access-token-perm cfg token-id \"error-reports:read\")"
+  [cfg token-id perm]
+  (db/tx-run! cfg
+              (fn [{:keys [::db/conn]}]
+                (let [row (db/exec-one! conn [sql:grant-access-token-perm perm token-id])]
+                  (some-> row (update :perms db/decode-pgarray #{}))))))
+
 (def ^:private schema:create-access-token
   [:map {:title "create-access-token"}
    [:name [:string {:max 250 :min 1}]]
diff --git a/backend/src/app/rpc/commands/auth.clj b/backend/src/app/rpc/commands/auth.clj
index 5444273862..07460633c4 100644
--- a/backend/src/app/rpc/commands/auth.clj
+++ b/backend/src/app/rpc/commands/auth.clj
@@ -8,6 +8,7 @@
   (:require
    [app.auth :as auth]
    [app.auth.oidc :as oidc]
+   [app.auth.passwords :as passwords]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
@@ -182,6 +183,7 @@
               (db/update! conn :profile {:password pwd :is-active true} {:id profile-id})
               nil))]
 
+    (passwords/validate-password password)
     (->> (validate-token token)
          (update-password conn))
 
@@ -240,6 +242,9 @@
               :code :email-as-password
               :hint "you can't use your email as password"))
 
+  ;; Validate password strength against common password dictionary
+  (passwords/validate-password (:password params))
+
   (when (eml/has-bounce-reports? cfg (:email params))
     (ex/raise :type :restriction
               :code :email-has-permanent-bounces
@@ -258,7 +263,8 @@
   (validate-register-attempt! cfg params)
 
   (let [email   (profile/clean-email email)
-        profile (profile/get-profile-by-email pool email)]
+        profile (profile/get-profile-by-email pool email)
+        fullname (d/normalize-string fullname)]
 
     ;; SECURITY: refuse to issue a prepared-register token when an active
     ;; profile already exists for this email.
@@ -359,6 +365,9 @@
         is-active (:is-active params false)
         theme     (:theme params nil)
         email     (str/lower email)
+        fullname  (d/normalize-string (:fullname params))
+        locale    (d/normalize-string locale)
+        theme     (d/normalize-string theme)
 
         photo-id  (some->> (or (:oidc/picture props)
                                (:google/picture props)
@@ -367,7 +376,7 @@
                            (import-profile-picture cfg))
 
         params    {:id id
-                   :fullname (:fullname params)
+                   :fullname fullname
                    :email email
                    :auth-backend backend
                    :lang locale
diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj
index 79b0bf7cf9..e68210aae3 100644
--- a/backend/src/app/rpc/commands/binfile.clj
+++ b/backend/src/app/rpc/commands/binfile.clj
@@ -19,7 +19,7 @@
    [app.http.sse :as sse]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
-   [app.media :as media]
+   [app.media.validation :as media.v]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.files :as files]
    [app.rpc.commands.media :as media-cmd]
@@ -122,44 +122,34 @@
     [:name [:or [:string {:max 250}]
             [:map-of ::sm/uuid [:string {:max 250}]]]]
     [:project-id ::sm/uuid]
-    [:file-id {:optional true} ::sm/uuid]
     [:version {:optional true} ::sm/int]
-    [:file {:optional true} media/schema:upload]
+    [:file {:optional true} media.v/schema:upload]
     [:upload-id {:optional true} ::sm/uuid]]
    [:fn {:error/message "one of :file or :upload-id is required"}
     (fn [{:keys [file upload-id]}]
       (or (some? file) (some? upload-id)))]])
 
 (sv/defmethod ::import-binfile
-  "Import a penpot file in a binary format. If `file-id` is provided,
-  an in-place import will be performed instead of creating a new file.
-
-  The in-place imports are only supported for binfile-v3 and when a
-  .penpot file only contains one penpot file.
+  "Import a penpot file in a binary format.
 
   The file content may be provided either as a multipart `file` upload
   or as an `upload-id` referencing a completed chunked-upload session,
   which allows importing files larger than the multipart size limit.
   "
   {::doc/added "1.15"
-   ::doc/changes ["1.20" "Add file-id param for in-place import"
-                  "1.20" "Set default version to 3"
-                  "2.15" "Add upload-id param for chunked upload support"]
+   ::doc/changes [["1.20" "Set default version to 3"]
+                  ["2.15" "Add upload-id param for chunked upload support"]]
 
    ::webhooks/event? true
    ::sse/stream? true
    ::sm/params schema:import-binfile}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version file-id upload-id] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version upload-id] :as params}]
   (projects/check-edition-permissions! pool profile-id project-id)
   (let [version (or version 3)
         params  (-> params
                     (assoc :profile-id profile-id)
                     (assoc :version version))
 
-        cfg     (cond-> cfg
-                  (uuid? file-id)
-                  (assoc ::bfc/file-id file-id))
-
         params
         (if (some? upload-id)
           (let [file (db/tx-run! cfg media-cmd/assemble-chunks upload-id)]
@@ -174,6 +164,5 @@
     (with-meta
       (sse/response (partial import-binfile cfg params))
       {::audit/props {:file nil
-                      :file-id file-id
                       :generated-by (:generated-by manifest)
                       :referer (:referer manifest)}})))
diff --git a/backend/src/app/rpc/commands/error_reports.clj b/backend/src/app/rpc/commands/error_reports.clj
new file mode 100644
index 0000000000..dfb6e6ba49
--- /dev/null
+++ b/backend/src/app/rpc/commands/error_reports.clj
@@ -0,0 +1,185 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.rpc.commands.error-reports
+  "RPC methods for listing and fetching server error reports.
+
+  Access is restricted to access-token authentication with the
+  `error-reports:read` permission. Grant via SQL (or REPL helper):
+
+      UPDATE access_token
+         SET perms = ARRAY['error-reports:read']::text[],
+             updated_at = now()
+       WHERE id = '<token-uuid>';
+
+  Call with: Authorization: Token <jwt>"
+  (:require
+   [app.common.data :as d]
+   [app.common.exceptions :as ex]
+   [app.common.schema :as sm]
+   [app.common.time :as ct]
+   [app.common.uuid :as uuid]
+   [app.db :as db]
+   [app.rpc :as-alias rpc]
+   [app.rpc.doc :as doc]
+   [app.util.services :as sv]
+   [cuerdas.core :as str]))
+
+(def ^:private max-limit 200)
+(def ^:private default-limit 50)
+
+(def ^:private source-names
+  {1 "legacy-v1"
+   2 "legacy-v2"
+   3 "logging"
+   4 "audit-log"
+   5 "rlimit"})
+
+(defn- source->name
+  [source]
+  (get source-names source (str "unknown-" source)))
+
+(defn- name->source
+  [name]
+  (some (fn [[k v]] (when (= v name) k)) source-names))
+
+(def ^:private schema:error-report-summary
+  [:map
+   [:id ::sm/uuid]
+   [:created-at ct/schema:inst]
+   [:source ::sm/text]
+   [:profile-id {:optional true} ::sm/text]
+   [:kind {:optional true} ::sm/text]
+   [:tenant {:optional true} ::sm/text]
+   [:version {:optional true} ::sm/text]
+   [:hint {:optional true} ::sm/text]])
+
+(def ^:private schema:get-error-reports-params
+  [:map {:title "get-error-reports-params"}
+   [:since {:optional true} ct/schema:inst]
+   [:since-id {:optional true} ::sm/uuid]
+   [:limit {:optional true}
+    [:and ::sm/int [:fn #(<= 1 % max-limit)]]]
+   [:source {:optional true} ::sm/text]
+   [:profile-id {:optional true} ::sm/text]
+   [:kind {:optional true} ::sm/text]
+   [:tenant {:optional true} ::sm/text]
+   [:version {:optional true} ::sm/text]
+   [:hint {:optional true} ::sm/text]
+   [:until {:optional true} ct/schema:inst]])
+
+(def ^:private schema:get-error-reports-result
+  [:map
+   [:items [:vector schema:error-report-summary]]
+   [:next-since {:optional true} ct/schema:inst]
+   [:next-id {:optional true} ::sm/uuid]])
+
+(def ^:private schema:error-report
+  [:map
+   [:id ::sm/uuid]
+   [:created-at ct/schema:inst]
+   [:source ::sm/text]
+   [:profile-id {:optional true} ::sm/text]
+   [:kind {:optional true} ::sm/text]
+   [:tenant {:optional true} ::sm/text]
+   [:version {:optional true} ::sm/text]
+   [:hint {:optional true} ::sm/text]
+   [:report {:optional true} ::sm/text]
+   [:href {:optional true} ::sm/text]
+   [:context {:optional true} ::sm/text]])
+
+(def ^:private schema:get-error-report-params
+  [:map
+   [:id ::sm/uuid]])
+
+(def ^:private base-list-sql
+  (str "SELECT id, created_at, source, "
+       "COALESCE(content->>'~:kind', content->>'~:origin') AS kind, "
+       "content->>'~:tenant' AS tenant, "
+       "content->>'~:version' AS version, "
+       "content->>'~:hint' AS hint, "
+       "content->>'~:profile-id' AS profile_id "
+       "FROM server_error_report"))
+
+(defn- build-list-query
+  [{:keys [since since-id source profile-id kind tenant version hint until limit]
+    :or {limit default-limit}}]
+  (let [source-id (when source (name->source source))
+        clauses (keep identity
+                      [(when source-id
+                         {:where "source = ?" :params [source-id]})
+                       (when profile-id
+                         {:where "content->>'~:profile-id' = ?"
+                          :params [profile-id]})
+                       (when kind
+                         {:where "COALESCE(content->>'~:kind', content->>'~:origin') = ?"
+                          :params [kind]})
+                       (when tenant
+                         {:where "content->>'~:tenant' = ?"
+                          :params [tenant]})
+                       (when version
+                         {:where "content->>'~:version' = ?"
+                          :params [version]})
+                       (when hint
+                         {:where "content->>'~:hint' ILIKE ?"
+                          :params [(str "%" hint "%")]})
+                       (when since
+                         {:where "(created_at, id) > (?::timestamptz, ?::uuid)"
+                          :params [since (or since-id uuid/zero)]})
+                       (when until
+                         {:where "(created_at, id) < (?::timestamptz, ?::uuid)"
+                          :params [until uuid/zero]})])
+        sql-parts  (map :where clauses)
+        sql-params (mapcat :params clauses)
+        sql        (str base-list-sql
+                        (when (seq sql-parts)
+                          (str " WHERE " (str/join " AND " sql-parts)))
+                        " ORDER BY created_at ASC, id ASC"
+                        " LIMIT ?")]
+    (into [sql] (concat sql-params [limit]))))
+
+(sv/defmethod ::get-error-reports
+  {::doc/added "2.20"
+   ::rpc/auth-type :token
+   ::rpc/perms #{"error-reports:read"}
+   ::sm/params schema:get-error-reports-params
+   ::sm/result schema:get-error-reports-result}
+  [cfg params]
+  (let [limit            (min (or (:limit params) default-limit) max-limit)
+        params           (assoc params :limit (inc limit))
+        [sql & sql-args] (build-list-query params)
+        rows             (db/exec! cfg (into [sql] sql-args))]
+    (if (seq rows)
+      (let [items      (->> (take limit rows)
+                            (mapv #(-> %
+                                       (update :source source->name)
+                                       d/without-nils)))
+            last-item  (peek items)
+            has-more?  (> (count rows) limit)]
+        {:items      items
+         :next-since (when has-more? (:created-at last-item))
+         :next-id    (when has-more? (:id last-item))})
+      {:items []})))
+
+(sv/defmethod ::get-error-report
+  {::doc/added "2.20"
+   ::rpc/auth-type :token
+   ::rpc/perms #{"error-reports:read"}
+   ::sm/params schema:get-error-report-params
+   ::sm/result schema:error-report}
+  [cfg {:keys [id]}]
+  (if-let [report (db/get-by-id cfg :server-error-report id {::db/check-deleted false})]
+    (let [content (db/decode-transit-pgobject (:content report))]
+      (-> report
+          (dissoc :content)
+          (merge content)
+          (update :source source->name)
+          (assoc :kind (or (:kind content) (:origin content)))
+          (assoc :version (:version content))
+          (d/without-nils)))
+    (ex/raise :type :not-found
+              :code :report-not-found
+              :hint (str "error report " id " not found"))))
diff --git a/backend/src/app/rpc/commands/feedback.clj b/backend/src/app/rpc/commands/feedback.clj
index 565f41d30e..b70341fc33 100644
--- a/backend/src/app/rpc/commands/feedback.clj
+++ b/backend/src/app/rpc/commands/feedback.clj
@@ -14,22 +14,25 @@
    [app.db :as db]
    [app.email :as eml]
    [app.rpc :as-alias rpc]
+   [app.rpc.climit :as-alias climit]
    [app.rpc.commands.profile :as profile]
    [app.rpc.doc :as-alias doc]
    [app.util.services :as sv]))
 
 (declare ^:private send-user-feedback!)
 
-(def ^:private schema:send-user-feedback
+(def schema:send-user-feedback
   [:map {:title "send-user-feedback"}
    [:subject [:string {:max 500}]]
    [:content [:string {:max 2500}]]
    [:type {:optional true} :string]
    [:error-href {:optional true} [:string {:max 2500}]]
-   [:error-report {:optional true} :string]])
+   [:error-report {:optional true} [:string {:max 1048576}]]])
 
 (sv/defmethod ::send-user-feedback
-  {::doc/added "1.18"
+  {::climit/id [[:send-user-feedback/by-profile ::rpc/profile-id]
+                [:send-user-feedback/global]]
+   ::doc/added "1.18"
    ::sm/params schema:send-user-feedback}
   [{:keys [::db/pool]} {:keys [::rpc/profile-id] :as params}]
   (when-not (contains? cf/flags :user-feedback)
diff --git a/backend/src/app/rpc/commands/files.clj b/backend/src/app/rpc/commands/files.clj
index 98a6ec0ec7..69bead539d 100644
--- a/backend/src/app/rpc/commands/files.clj
+++ b/backend/src/app/rpc/commands/files.clj
@@ -156,11 +156,13 @@
     (assoc mfile :permissions perms)))
 
 (defn get-file-etag
-  [{:keys [::rpc/profile-id]} {:keys [modified-at revn vern permissions]}]
+  [{:keys [::rpc/profile-id]} {:keys [modified-at revn vern deleted-at permissions]}]
   (str profile-id "/" revn "/" vern "/" (hash fmg/available-migrations) "/"
        (ct/format-inst modified-at :iso)
        "/"
-       (uri/map->query-string permissions)))
+       (uri/map->query-string permissions)
+       "/"
+       (some-> deleted-at (ct/format-inst :iso))))
 
 (sv/defmethod ::get-file
   "Retrieve a file by its ID. Only authenticated users."
@@ -1067,6 +1069,25 @@
   [cfg {:keys [::rpc/profile-id] :as params}]
   (db/tx-run! cfg delete-file (assoc params :profile-id profile-id)))
 
+;; --- Library relation helpers
+
+(defn- check-library-team-ownership!
+  "Verify that file and library belong to the same team.
+  Prevents cross-team library relation injection."
+  [conn file-id library-id]
+  (let [sql "SELECT EXISTS (
+               SELECT 1 FROM file AS f
+               JOIN project AS fp ON (fp.id = f.project_id)
+               JOIN file AS l ON (l.id = ?)
+               JOIN project AS lp ON (lp.id = l.project_id)
+               WHERE f.id = ? AND fp.team_id = lp.team_id
+             ) AS ok"
+        row (db/exec-one! conn [sql library-id file-id])]
+    (when-not (:ok row)
+      (ex/raise :type :not-found
+                :code :object-not-found
+                :hint "file and library must belong to the same team"))))
+
 ;; --- MUTATION COMMAND: link-file-to-library
 
 (def sql:link-file-to-library
@@ -1102,6 +1123,14 @@
 
   (check-edition-permissions! conn profile-id file-id)
   (check-edition-permissions! conn profile-id library-id)
+  (check-library-team-ownership! conn file-id library-id)
+
+  (let [transitive-deps (bfc/get-libraries cfg [library-id])]
+    (when (contains? transitive-deps file-id)
+      (ex/raise :type :validation
+                :code :circular-library-reference
+                :hint "linking this library would create a circular dependency")))
+
   (link-file-to-library conn params)
   (bfc/get-libraries cfg [library-id]))
 
@@ -1126,6 +1155,7 @@
   [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id file-id library-id] :as params}]
   (check-edition-permissions! conn profile-id file-id)
   (check-edition-permissions! conn profile-id library-id)
+  (check-library-team-ownership! conn file-id library-id)
   (unlink-file-from-library conn params)
   nil)
 
@@ -1150,6 +1180,7 @@
   [{:keys [::db/conn]} {:keys [::rpc/profile-id file-id library-id] :as params}]
   (check-edition-permissions! conn profile-id file-id)
   (check-edition-permissions! conn profile-id library-id)
+  (check-library-team-ownership! conn file-id library-id)
   (update-sync conn params))
 
 ;; --- MUTATION COMMAND: ignore-sync
diff --git a/backend/src/app/rpc/commands/files_thumbnails.clj b/backend/src/app/rpc/commands/files_thumbnails.clj
index 2681b51c09..f4d9b538cb 100644
--- a/backend/src/app/rpc/commands/files_thumbnails.clj
+++ b/backend/src/app/rpc/commands/files_thumbnails.clj
@@ -21,7 +21,7 @@
    [app.db.sql :as-alias sql]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
-   [app.media :as media]
+   [app.media.validation :as media.v]
    [app.rpc :as-alias rpc]
    [app.rpc.climit :as-alias climit]
    [app.rpc.commands.files :as files]
@@ -275,7 +275,7 @@
   [:map {:title "create-file-object-thumbnail"}
    [:file-id ::sm/uuid]
    [:object-id [:string {:max 250}]]
-   [:media media/schema:upload]
+   [:media media.v/schema:upload]
    [:tag {:optional true} [:string {:max 50}]]])
 
 (sv/defmethod ::create-file-object-thumbnail
@@ -289,8 +289,8 @@
    ::sm/params schema:create-file-object-thumbnail}
 
   [cfg {:keys [::rpc/profile-id file-id object-id media tag]}]
-  (media/validate-media-type! media)
-  (media/validate-media-size! media)
+  (media.v/validate-media-type! media)
+  (media.v/validate-media-size! media)
 
   (db/run! cfg files/check-edition-permissions! profile-id file-id)
   (when-let [file (files/get-minimal-file cfg file-id {::db/check-deleted false})]
@@ -374,67 +374,12 @@
 
 ;; --- MUTATION COMMAND: create-file-thumbnail
 
-(defn- create-file-thumbnail
-  [{:keys [::db/conn ::sto/storage] :as cfg} {:keys [file-id revn props media] :as params}]
-  (media/validate-media-type! media)
-  (media/validate-media-size! media)
-
-  (let [file  (bfc/get-file cfg file-id
-                            :include-deleted? true
-                            :load-data? false)
-
-        props (db/tjson (or props {}))
-        path  (:path media)
-        mtype (:mtype media)
-        hash  (sto/calculate-hash path)
-        data  (-> (sto/content path)
-                  (sto/wrap-with-hash hash))
-        tnow  (ct/now)
-
-        media (sto/put-object! storage
-                               {::sto/content data
-                                ::sto/deduplicate? true
-                                ::sto/touched-at tnow
-                                :content-type mtype
-                                :bucket "file-thumbnail"})
-
-        thumb (db/get* conn :file-thumbnail
-                       {:file-id file-id
-                        :revn revn}
-                       {::db/remove-deleted false
-                        ::sql/for-update true})]
-
-    (if (some? thumb)
-      (do
-        ;; We mark the old media id as touched if it does not match
-        (when (not= (:id media) (:media-id thumb))
-          (sto/touch-object! storage (:media-id thumb)))
-
-        (db/update! conn :file-thumbnail
-                    {:media-id (:id media)
-                     :deleted-at (:deleted-at file)
-                     :updated-at tnow
-                     :props props}
-                    {:file-id file-id
-                     :revn revn}))
-
-      (db/insert! conn :file-thumbnail
-                  {:file-id file-id
-                   :revn revn
-                   :created-at tnow
-                   :updated-at tnow
-                   :deleted-at (:deleted-at file)
-                   :props props
-                   :media-id (:id media)}))
-
-    media))
-
 (def ^:private
   schema:create-file-thumbnail
   [:map {:title "create-file-thumbnail"}
    [:file-id ::sm/uuid]
    [:revn ::sm/int]
-   [:media media/schema:upload]])
+   [:media media.v/schema:upload]])
 
 (sv/defmethod ::create-file-thumbnail
   "Creates or updates the file thumbnail. Mainly used for paint the
@@ -448,12 +393,57 @@
    ::rtry/when rtry/conflict-exception?
    ::sm/params schema:create-file-thumbnail}
 
-  ;; FIXME: do not run the thumbnail upload inside a transaction
-
   [cfg {:keys [::rpc/profile-id file-id] :as params}]
-  (db/tx-run! cfg (fn [{:keys [::db/conn] :as cfg}]
-                    (files/check-edition-permissions! conn profile-id file-id)
-                    (when-not (db/read-only? conn)
-                      (let [media (create-file-thumbnail cfg params)]
-                        {:uri (files/resolve-public-uri (:id media))
-                         :id (:id media)})))))
+  (media.v/validate-media-type! (:media params))
+  (media.v/validate-media-size! (:media params))
+
+  (db/run! cfg files/check-edition-permissions! profile-id file-id)
+
+  (when-not (db/read-only? (::db/pool cfg))
+    (let [storage (::sto/storage cfg)
+          file    (bfc/get-file cfg file-id :include-deleted? true :load-data? false)
+          props   (db/tjson (or (:props params) {}))
+          {:keys [path mtype]} (:media params)
+          hash    (sto/calculate-hash path)
+          data    (-> (sto/content path)
+                      (sto/wrap-with-hash hash))
+          tnow    (ct/now)
+
+          media   (sto/put-object! storage
+                                   {::sto/content data
+                                    ::sto/deduplicate? true
+                                    ::sto/touched-at tnow
+                                    :content-type mtype
+                                    :bucket "file-thumbnail"})
+
+          revn    (:revn params)
+
+          result  (db/tx-run! cfg
+                              (fn [{:keys [::db/conn]}]
+                                (let [thumb (db/get* conn :file-thumbnail
+                                                     {:file-id file-id :revn revn}
+                                                     {::db/remove-deleted false
+                                                      ::sql/for-update true})]
+                                  (if (some? thumb)
+                                    (do
+                                      (when (not= (:id media) (:media-id thumb))
+                                        (sto/touch-object! storage (:media-id thumb)))
+                                      (db/update! conn :file-thumbnail
+                                                  {:media-id (:id media)
+                                                   :deleted-at (:deleted-at file)
+                                                   :updated-at tnow
+                                                   :props props}
+                                                  {:file-id file-id :revn revn}))
+                                    (db/insert! conn :file-thumbnail
+                                                {:file-id file-id
+                                                 :revn revn
+                                                 :created-at tnow
+                                                 :updated-at tnow
+                                                 :deleted-at (:deleted-at file)
+                                                 :props props
+                                                 :media-id (:id media)}))
+                                  media)))]
+
+      (when result
+        {:uri (files/resolve-public-uri (:id result))
+         :id (:id result)}))))
diff --git a/backend/src/app/rpc/commands/fonts.clj b/backend/src/app/rpc/commands/fonts.clj
index 4d9eb77636..c0ca2d8da7 100644
--- a/backend/src/app/rpc/commands/fonts.clj
+++ b/backend/src/app/rpc/commands/fonts.clj
@@ -21,6 +21,7 @@
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
    [app.media :as media]
+   [app.media.validation :as media.v]
    [app.rpc :as-alias rpc]
    [app.rpc.climit :as-alias climit]
    [app.rpc.commands.files :as files]
@@ -38,10 +39,7 @@
    [datoteka.fs :as fs]
    [datoteka.io :as io])
   (:import
-   java.io.InputStream
    java.io.OutputStream
-   java.io.SequenceInputStream
-   java.util.Collections
    java.util.zip.ZipEntry
    java.util.zip.ZipOutputStream))
 
@@ -95,19 +93,26 @@
 
 (declare create-font-variant)
 
+(defn- check-font-team-ownership!
+  "When font-id already has variants belonging to a different team,
+  raises :not-found to prevent cross-team font injection."
+  [conn team-id font-id]
+  (let [row (db/get* conn :team-font-variant
+                     {:font-id font-id}
+                     {::db/columns [:team-id]})]
+    (when (and row (not= (:team-id row) team-id))
+      (ex/raise :type :not-found
+                :code :object-not-found
+                :hint "font does not belong to this team"))))
+
 (def ^:private schema:create-font-variant
-  [:and
-   [:map {:title "create-font-variant"}
-    [:team-id    ::sm/uuid]
-    [:font-id    ::sm/uuid]
-    [:font-family types.font/schema:font-family]
-    [:font-weight [::sm/one-of {:format "number"} valid-weight]]
-    [:font-style  [::sm/one-of {:format "string"} valid-style]]
-    [:data    {:optional true} [:map-of ::sm/text [:or ::sm/bytes [::sm/vec ::sm/bytes]]]]
-    [:uploads {:optional true} [:map-of ::sm/text ::sm/uuid]]]
-   [:fn {:error/message "one of :data or :uploads is required"}
-    (fn [{:keys [data uploads]}]
-      (or (seq data) (seq uploads)))]])
+  [:map {:title "create-font-variant"}
+   [:team-id    ::sm/uuid]
+   [:font-id    ::sm/uuid]
+   [:font-family types.font/schema:font-family]
+   [:font-weight [::sm/one-of {:format "number"} valid-weight]]
+   [:font-style  [::sm/one-of {:format "string"} valid-style]]
+   [:uploads [:map-of ::sm/text ::sm/uuid]]])
 
 (defn- prepare-font-data-from-uploads
   "Assembles each chunked-upload session in `uploads` (a `{mtype →
@@ -118,8 +123,8 @@
               (fn [acc mtype session-id]
                 (let [assembled (assemble-chunks cfg session-id)]
                   (-> {:mtype mtype :size (:size assembled)}
-                      (media/validate-media-type! cm/font-types)
-                      (media/validate-font-size!))
+                      (media.v/validate-media-type! cm/font-types)
+                      (media.v/validate-font-size!))
                   (assoc acc mtype (:path assembled))))
               {}
               uploads)]
@@ -128,54 +133,24 @@
         (assoc :data data)
         (dissoc :uploads))))
 
-(defn- prepare-font-data-from-legacy
-  "Validates the media type and size of every entry in the legacy
-  `:data` map (a `{mtype → bytes | [bytes]}` map). Normalises every
-  entry to a tempfile. Returns params with a normalised
-  `{mtype → path}` data map."
-  [{:keys [data] :as params}]
-  (let [data (reduce-kv
-              (fn [acc mtype content]
-                (let [tmp     (tmp/tempfile :prefix "penpot.tempfont." :suffix "")
-                      chunks  (if (vector? content) content [content])
-                      streams (map io/input-stream chunks)
-                      streams (Collections/enumeration streams)]
-
-                  ;; Generate the tempfile from all chunks
-                  (with-open [^OutputStream output (io/output-stream tmp)
-                              ^InputStream input (SequenceInputStream. streams)]
-                    (io/copy input output))
-
-                  ;; Validate
-                  (-> {:mtype mtype :size (fs/size tmp)}
-                      (media/validate-media-type! cm/font-types)
-                      (media/validate-font-size!))
-
-                  (assoc acc mtype tmp)))
-              {}
-              data)]
-    (assoc params :data data)))
-
 (sv/defmethod ::create-font-variant
-  "Upload a font variant.  Font data may be provided either as a
-  Transit-encoded `:data` map (keyed by mime-type) for small fonts, or
-  as an `:uploads` map (keyed by mime-type, values are upload-session
-  UUIDs from the chunked-upload API) for large fonts.  Exactly one of
-  the two must be present."
+  "Upload a font variant. Font data must be provided as an `:uploads`
+  map (keyed by mime-type, values are upload-session UUIDs from the
+  chunked-upload API)."
   {::doc/added "1.18"
-   ::doc/changes ["2.16" "Add :uploads param for chunked upload support"]
+   ::doc/changes [["2.16" "Add :uploads param for chunked upload support"]
+                  ["2.18" "Remove :data param, use :uploads exclusively"]]
    ::climit/id [[:process-font/by-profile ::rpc/profile-id]
                 [:process-font/global]]
    ::webhooks/event? true
    ::sm/params schema:create-font-variant}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id team-id uploads] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id team-id font-id] :as params}]
   (teams/check-edition-permissions! pool profile-id team-id)
+  (check-font-team-ownership! pool team-id font-id)
   (quotes/check! cfg {::quotes/id ::quotes/font-variants-per-team
                       ::quotes/profile-id profile-id
                       ::quotes/team-id team-id})
-  (let [params (if (some? uploads)
-                 (db/tx-run! cfg prepare-font-data-from-uploads params)
-                 (prepare-font-data-from-legacy params))]
+  (let [params (db/tx-run! cfg prepare-font-data-from-uploads params)]
     (create-font-variant cfg (assoc params :profile-id profile-id))))
 
 (defn create-font-variant
@@ -229,9 +204,7 @@
     (let [tpoint     (ct/tpoint)
           mtypes     (vec (keys data))
           total-size (reduce-kv (fn [acc _ content]
-                                  (+ acc (if (bytes? content)
-                                           (alength ^bytes content)
-                                           (fs/size content))))
+                                  (+ acc (fs/size content)))
                                 0
                                 data)]
 
@@ -370,7 +343,7 @@
 (defn- make-temporal-storage-object
   [cfg profile-id content]
   (let [storage (sto/resolve cfg)
-        content (media/check-input content)
+        content (media.v/check-input content)
         hash    (sto/calculate-hash (:path content))
         data    (-> (sto/content (:path content))
                     (sto/wrap-with-hash hash))
diff --git a/backend/src/app/rpc/commands/media.clj b/backend/src/app/rpc/commands/media.clj
index ff8add456a..612db21245 100644
--- a/backend/src/app/rpc/commands/media.clj
+++ b/backend/src/app/rpc/commands/media.clj
@@ -16,6 +16,8 @@
    [app.db :as db]
    [app.loggers.audit :as-alias audit]
    [app.media :as media]
+   [app.media.svg :as svg]
+   [app.media.validation :as media.v]
    [app.rpc :as-alias rpc]
    [app.rpc.climit :as climit]
    [app.rpc.commands.files :as files]
@@ -44,7 +46,7 @@
    [:file-id ::sm/uuid]
    [:is-local ::sm/boolean]
    [:name [:string {:max 250}]]
-   [:content media/schema:upload]])
+   [:content media.v/schema:upload]])
 
 (sv/defmethod ::upload-file-media-object
   {::doc/added "1.17"
@@ -53,8 +55,8 @@
                 [:process-image/global]]}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id content] :as params}]
   (files/check-edition-permissions! pool profile-id file-id)
-  (media/validate-media-type! content)
-  (media/validate-media-size! content)
+  (media.v/validate-media-type! content)
+  (media.v/validate-media-size! content)
 
   (db/run! cfg (fn [{:keys [::db/conn] :as cfg}]
                  ;; We get the minimal file for proper checking if
@@ -113,13 +115,22 @@
 
 (defn- process-main-image
   [info]
-  (let [hash (sto/calculate-hash (:path info))
-        data (-> (sto/content (:path info))
-                 (sto/wrap-with-hash hash))]
+  (let [path  (:path info)
+        mtype (:mtype info)
+        path  (if (= mtype "image/svg+xml")
+                (let [content   (slurp path)
+                      sanitized (svg/sanitize-svg content)
+                      temp-path (tmp/tempfile :prefix "penpot-svg-" :suffix ".svg" :min-age "5m")]
+                  (spit (str temp-path) sanitized)
+                  temp-path)
+                path)
+        hash  (sto/calculate-hash path)
+        data  (-> (sto/content path)
+                  (sto/wrap-with-hash hash))]
     {::sto/content data
      ::sto/deduplicate? true
      ::sto/touched-at (:ts info)
-     :content-type (:mtype info)
+     :content-type mtype
      :bucket "file-media-object"}))
 
 (defn- process-thumb-image
@@ -315,7 +326,7 @@
   [:map {:title "upload-chunk"}
    [:session-id ::sm/uuid]
    [:index      ::sm/int]
-   [:content    media/schema:upload]])
+   [:content    media.v/schema:upload]])
 
 (def ^:private schema:upload-chunk-result
   [:map {:title "upload-chunk-result"}
@@ -386,7 +397,7 @@
 (defn assemble-chunks
   "Validates that all expected chunks are present for `session-id` and
   concatenates them into a single temporary file.  Returns a map
-  conforming to `media/schema:upload` with `:filename`, `:path` and
+  conforming to `media.v/schema:upload` with `:filename`, `:path` and
   `:size`.
 
   Raises a :validation/:missing-chunks error when the number of stored
@@ -440,8 +451,8 @@
                       content (-> content
                                   (assoc :filename (str "upload:" name))
                                   (assoc :mtype mtype)
-                                  (media/validate-media-type!)
-                                  (media/validate-media-size!))
+                                  (media.v/validate-media-type!)
+                                  (media.v/validate-media-size!))
                       mobj    (create-file-media-object cfg (assoc params
                                                                    :id id
                                                                    :from-chunks? true
diff --git a/backend/src/app/rpc/commands/nitrate.clj b/backend/src/app/rpc/commands/nitrate.clj
index 71a2e93b17..b7143ebe85 100644
--- a/backend/src/app/rpc/commands/nitrate.clj
+++ b/backend/src/app/rpc/commands/nitrate.clj
@@ -11,9 +11,10 @@
    [app.auth.oidc :as oidc]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
+   [app.common.json :as json]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
+   [app.common.types.organization :as cto]
    [app.config :as cf]
    [app.db :as db]
    [app.nitrate :as nitrate]
@@ -24,7 +25,8 @@
    [app.rpc.nitrate.emails-helper :as neh]
    [app.rpc.nitrate.organization-helper :as noh]
    [app.rpc.notifications :as notifications]
-   [app.util.services :as sv]))
+   [app.util.services :as sv]
+   [buddy.core.codecs :as bc]))
 
 
 (defn assert-is-owner [cfg profile-id team-id]
@@ -40,11 +42,11 @@
                 :code :cant-move-default-team))))
 
 (defn assert-membership [cfg profile-id organization-id]
-  (let [membership (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                          :organization-id organization-id})]
+  (let [membership (nitrate/call cfg :get-organization-membership {:profile-id profile-id
+                                                                   :organization-id organization-id})]
     (when-not (:organization-id membership)
       (ex/raise :type :validation
-                :code :organization-doesnt-exists))
+                :code :organization-does-not-exist))
 
     (when-not (:is-member membership)
       (ex/raise :type :validation
@@ -114,6 +116,35 @@
                       :cause cause)
             (throw cause)))))))
 
+(def ^:private activation-code-request-filename
+  "penpot-activation-code-request.txt")
+
+(sv/defmethod ::get-nitrate-activation-code-request
+  "Returns a Base64-encoded JSON file requesting a Nitrate activation code.
+  Payload includes nitrateId, publicKey, email and iat."
+  {::rpc/auth true
+   ::doc/added "2.20"
+   ::sm/params [:map]
+   ::sm/result ::sm/text}
+  [cfg {:keys [::rpc/profile-id]}]
+  (let [profile          (db/get cfg :profile {:id profile-id})
+        nitrate-identity (nitrate/call cfg :get-identity {})]
+    (when-not nitrate-identity
+      (ex/raise :type :validation
+                :code :nitrate-identity-unavailable
+                :hint "Unable to retrieve nitrate identity"))
+    (-> (json/encode {:nitrate-id (:nitrate-id nitrate-identity)
+                      :public-key (:public-key nitrate-identity)
+                      :email      (:email profile)
+                      :iat        (ct/seconds (ct/now))}
+                     :key-fn json/write-camel-key)
+        (bc/str->bytes)
+        (bc/bytes->b64-str)
+        (rph/wrap)
+        (rph/with-header "content-type" "text/plain")
+        (rph/with-header "content-disposition"
+          (str "attachment; filename=\"" activation-code-request-filename "\"")))))
+
 (def ^:private sql:prefix-team-name-and-unset-default
   "UPDATE team
       SET name = ? || name,
@@ -150,7 +181,7 @@
                    {})))
     {}))
 
-(defn- build-leave-org-plan
+(defn- build-leave-organization-plan
   [{:keys [::db/conn]} default-team-id teams-to-delete keep-default-team-requested?]
   (let [all-teams     (cond-> (set teams-to-delete) default-team-id (conj default-team-id))
         files-counts  (get-team-files-counts conn all-teams)
@@ -163,18 +194,18 @@
     {:deletable-team-ids       deletable
      :keep-default-team?       keep-default?
      :delete-default-team?     (boolean (and default-team-id (not keep-default?)))
-     :detach-from-org-team-ids to-detach}))
+     :detach-from-organization-team-ids to-detach}))
 
-(defn get-leave-org-summary
+(defn get-leave-organization-summary
   [cfg default-team-id teams-to-delete teams-to-transfer-count teams-to-exit-count]
-  (let [{:keys [deletable-team-ids detach-from-org-team-ids]}
-        (build-leave-org-plan cfg default-team-id teams-to-delete nil)]
+  (let [{:keys [deletable-team-ids detach-from-organization-team-ids]}
+        (build-leave-organization-plan cfg default-team-id teams-to-delete nil)]
     {:teams-to-delete   (count deletable-team-ids)
      :teams-to-transfer teams-to-transfer-count
      :teams-to-exit     teams-to-exit-count
-     :teams-to-detach   (count detach-from-org-team-ids)}))
+     :teams-to-detach   (count detach-from-organization-team-ids)}))
 
-(def ^:private schema:leave-org
+(def ^:private schema:leave-organization
   [:map
    [:id ::sm/uuid]
    [:name ::sm/text]
@@ -187,47 +218,49 @@
       [:id ::sm/uuid]
       [:reassign-to {:optional true} ::sm/uuid]]]]])
 
-(def ^:private schema:get-leave-org-summary-result
+(def ^:private schema:get-leave-organization-summary-result
   [:map
    [:teams-to-delete ::sm/int]
    [:teams-to-transfer ::sm/int]
    [:teams-to-exit ::sm/int]
-   [:teams-to-detach ::sm/int]])
+   [:teams-to-detach ::sm/int]
+   [:member-added-at [:maybe ct/schema:inst]]
+   [:organization-member-count-before ::sm/int]])
 
-(def ^:private schema:get-leave-org-summary
+(def ^:private schema:get-leave-organization-summary
   [:map
    [:id ::sm/uuid]
    [:default-team-id ::sm/uuid]])
 
 
 (defn- get-organization-teams-for-user
-  [{:keys [::db/conn] :as cfg} org-summary profile-id]
-  (let [org-team-ids (->> (:teams org-summary)
-                          (map :id))
-        ids-array    (db/create-array conn "uuid" org-team-ids)]
+  [{:keys [::db/conn] :as cfg} organization-summary profile-id]
+  (let [organization-team-ids (->> (:teams organization-summary)
+                                   (map :id))
+        ids-array    (db/create-array conn "uuid" organization-team-ids)]
     (db/exec! conn [sql:get-member-teams-info profile-id ids-array])))
 
 (defn- calculate-valid-teams
-  ([org-teams default-team-id]
+  ([organization-teams default-team-id]
    (let [;; valid default team is the one which id is default-team-id
-         valid-default-team          (d/seek #(= default-team-id (:id %)) org-teams)
+         valid-default-team          (d/seek #(= default-team-id (:id %)) organization-teams)
 
          ;; Remove your-penpot for the rest of validations
-         org-teams                   (remove #(= default-team-id (:id %)) org-teams)
+         organization-teams                   (remove #(= default-team-id (:id %)) organization-teams)
 
          ;; valid teams to delete are those that the user is owner, and only have one member
-         valid-teams-to-delete-ids   (->> org-teams
+         valid-teams-to-delete-ids   (->> organization-teams
                                           (filter #(and (:is-owner %)
                                                         (= (:num-members %) 1)))
                                           (map :id)
                                           (into #{}))
          ;; valid teams to transfer are those that the user is owner, and have more than one member
-         valid-teams-to-transfer     (->> org-teams
+         valid-teams-to-transfer     (->> organization-teams
                                           (filter #(and (:is-owner %)
                                                         (> (:num-members %) 1))))
 
          ;; valid teams to exit are those that the user isn't owner, and have more than one member
-         valid-teams-to-exit         (->> org-teams
+         valid-teams-to-exit         (->> organization-teams
                                           (filter #(and (not (:is-owner %))
                                                         (> (:num-members %) 1))))]
      {:valid-teams-to-delete-ids valid-teams-to-delete-ids
@@ -236,17 +269,17 @@
       :valid-default-team valid-default-team})))
 
 (defn get-valid-teams [cfg organization-id profile-id default-team-id]
-  (let [org-summary                (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        org-teams                  (get-organization-teams-for-user cfg org-summary profile-id)]
-    (calculate-valid-teams org-teams default-team-id)))
+  (let [organization-summary                (nitrate/call cfg :get-organization-summary {:organization-id organization-id})
+        organization-teams                  (get-organization-teams-for-user cfg organization-summary profile-id)]
+    (calculate-valid-teams organization-teams default-team-id)))
 
 (defn- assert-valid-teams [cfg profile-id organization-id default-team-id teams-to-delete teams-to-leave]
-  (let [org-summary                (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        org-teams                  (get-organization-teams-for-user cfg org-summary profile-id)
+  (let [organization-summary                (nitrate/call cfg :get-organization-summary {:organization-id organization-id})
+        organization-teams                  (get-organization-teams-for-user cfg organization-summary profile-id)
         {:keys [valid-teams-to-delete-ids
                 valid-teams-to-transfer
                 valid-teams-to-exit
-                valid-default-team]} (calculate-valid-teams org-teams default-team-id)
+                valid-default-team]} (calculate-valid-teams organization-teams default-team-id)
 
 
 
@@ -264,7 +297,7 @@
         ;; - if it has a reassign-to, it belongs to valid-teams-to-transfer and
         ;;   the reassign-to is a member of the team and not the current user;
         ;; - if it hasn't a reassign-to, check that it belongs to valid-teams-to-exit
-        teams-by-id                 (d/index-by :id org-teams)
+        teams-by-id                 (d/index-by :id organization-teams)
         valid-teams-to-leave?       (and
                                      (= valid-teams-to-leave-ids (->> teams-to-leave (map :id) (into #{})))
                                      (every? (fn [{:keys [id reassign-to]}]
@@ -275,10 +308,10 @@
                                                         (contains? members reassign-to)))
                                                  (contains? valid-teams-to-exit-ids id)))
                                              teams-to-leave))]
-    ;; the org owner cannot leave
-    (when (= (:owner-id org-summary) profile-id)
+    ;; the organization owner cannot leave
+    (when (= (:owner-id organization-summary) profile-id)
       (ex/raise :type :validation
-                :code :org-owner-cannot-leave))
+                :code :organization-owner-cannot-leave))
 
     (when (or
            (not valid-teams-to-delete?)
@@ -289,13 +322,14 @@
 
 
 
-(defn leave-org
+(defn leave-organization
   [{:keys [::db/conn] :as cfg}
-   {:keys [profile-id id name default-team-id teams-to-delete teams-to-leave skip-validation keep-default-team-requested?]}]
-  (let [org-prefix (str "[" (d/sanitize-string name) "] ")
+   {:keys [profile-id id name default-team-id teams-to-delete teams-to-leave skip-validation keep-default-team-requested?
+           user-who-delete-member deleted-by-role]}]
+  (let [organization-prefix (str "[" (d/sanitize-string name) "] ")
         {:keys [deletable-team-ids
                 keep-default-team?
-                detach-from-org-team-ids]} (build-leave-org-plan cfg default-team-id teams-to-delete keep-default-team-requested?)]
+                detach-from-organization-team-ids]} (build-leave-organization-plan cfg default-team-id teams-to-delete keep-default-team-requested?)]
 
     ;; assert that the received teams are valid, checking the different constraints
     (when-not skip-validation
@@ -312,87 +346,102 @@
     (doseq [{:keys [id reassign-to]} teams-to-leave]
       (teams/leave-team cfg {:profile-id profile-id :id id :reassign-to reassign-to}))
 
-    ;; Process org "Your Penpot" team: keep with prefix if needed, otherwise delete.
+    ;; Process organization "Your Penpot" team: keep with prefix if needed, otherwise delete.
     (when default-team-id
       (if keep-default-team?
-        (db/exec! conn [sql:prefix-team-name-and-unset-default org-prefix default-team-id])
+        (db/exec! conn [sql:prefix-team-name-and-unset-default organization-prefix default-team-id])
         (teams/delete-team cfg {:profile-id profile-id
                                 :team-id default-team-id})))
 
     ;; Detach retained owned teams from the organization in Nitrate.
-    ;; Nitrate will rehome them to its fallback/default org.
-    (doseq [team-id detach-from-org-team-ids]
-      (nitrate/call cfg :remove-team-from-org {:team-id team-id
-                                               :organization-id id}))
+    ;; Nitrate will rehome them to its fallback/default organization.
+    (doseq [team-id detach-from-organization-team-ids]
+      (nitrate/call cfg :remove-team-from-organization {:team-id team-id
+                                                        :organization-id id}))
 
     ;; Api call to nitrate
-    (nitrate/call cfg :remove-profile-from-org {:profile-id profile-id :organization-id id})
+    (nitrate/call cfg :remove-profile-from-organization
+                  {:profile-id profile-id
+                   :organization-id id
+                   :user-who-delete-member user-who-delete-member
+                   :deleted-by-role deleted-by-role})
 
     nil))
 
 
-(sv/defmethod ::leave-org
+(sv/defmethod ::leave-organization
   {::rpc/auth true
    ::doc/added "2.15"
-   ::sm/params schema:leave-org
+   ::sm/params schema:leave-organization
    ::db/transaction true}
   [cfg {:keys [::rpc/profile-id] :as params}]
-  (leave-org cfg (assoc params :profile-id profile-id)))
+  (leave-organization cfg (assoc params
+                                 :profile-id profile-id
+                                 :user-who-delete-member profile-id
+                                 :deleted-by-role "organization-member")))
 
 
-(sv/defmethod ::get-leave-org-summary
+(sv/defmethod ::get-leave-organization-summary
   {::rpc/auth true
    ::doc/added "2.18"
-   ::sm/params schema:get-leave-org-summary
-   ::sm/result schema:get-leave-org-summary-result
+   ::sm/params schema:get-leave-organization-summary
+   ::sm/result schema:get-leave-organization-summary-result
    ::db/transaction true}
   [cfg {:keys [::rpc/profile-id id default-team-id]}]
   (let [{:keys [valid-teams-to-delete-ids
                 valid-teams-to-transfer
                 valid-teams-to-exit
                 valid-default-team]} (get-valid-teams cfg id profile-id default-team-id)
+        membership              (nitrate/call cfg :get-organization-membership
+                                              {:profile-id profile-id
+                                               :organization-id id})
+        organization-members    (nitrate/call cfg :get-organization-members
+                                              {:organization-id id})
         teams-to-transfer-count (count valid-teams-to-transfer)
         teams-to-exit-count     (count valid-teams-to-exit)]
     (when-not valid-default-team
       (ex/raise :type :validation
                 :code :not-valid-teams))
-    (get-leave-org-summary cfg default-team-id valid-teams-to-delete-ids teams-to-transfer-count teams-to-exit-count)))
+    (assoc
+     (get-leave-organization-summary cfg default-team-id valid-teams-to-delete-ids teams-to-transfer-count teams-to-exit-count)
+     :member-added-at (:created-at membership)
+     :organization-member-count-before (count organization-members))))
 
 
-(def ^:private schema:remove-team-from-org
+(def ^:private schema:remove-team-from-organization
   [:map
    [:team-id ::sm/uuid]
    [:organization-id ::sm/uuid]
    [:organization-name ::sm/text]])
 
-(sv/defmethod ::remove-team-from-org
+(sv/defmethod ::remove-team-from-organization
   {::doc/added "2.17"
-   ::sm/params schema:remove-team-from-org}
+   ::sm/params schema:remove-team-from-organization}
   [cfg {:keys [::rpc/profile-id  team-id organization-id organization-name]}]
 
   (assert-is-owner cfg profile-id team-id)
   (assert-not-default-team cfg team-id)
   (assert-membership cfg profile-id organization-id)
   ;; Check moveTeams permission on the source organization
-  (when (contains? cf/flags :nitrate)
-    (let [org-perms (nitrate/call cfg :get-org-permissions
-                                  {:organization-id organization-id})]
-      (if (nil? org-perms)
+  (when (contains? cf/flags :admin-console)
+    (let [organization-perms (nitrate/call cfg :get-organization-permissions
+                                           {:organization-id organization-id})]
+      (if (nil? organization-perms)
         (ex/raise :type :validation
                   :code :not-allowed
                   :hint "Unable to verify organization permissions")
-        (when-not (nitrate-perms/allowed? :move-team
-                                          {:org-perms org-perms
-                                           :profile-id profile-id})
+        (when-not (cto/allowed? :move-team
+                                {:organization-perms organization-perms
+                                 :profile-id profile-id})
           (ex/raise :type :validation
                     :code :not-allowed
                     :hint "You are not allowed to move teams that are part of this organization. If you need more information, contact the owner.")))))
 
   ;; Api call to nitrate
-  (nitrate/call cfg :remove-team-from-org {:team-id team-id :organization-id organization-id})
+  (nitrate/call cfg :remove-team-from-organization {:team-id team-id :organization-id organization-id})
 
   ;; Notify connected users
-  (notifications/notify-team-change cfg {:id team-id :organization {:name organization-name}} "dashboard.team-no-longer-belong-org")
+  (notifications/notify-team-change cfg {:id team-id :organization {:name organization-name}} "dashboard.team-no-longer-belong-organization")
   nil)
 
 (def ^:private sql:delete-team-external-invitations
@@ -408,12 +457,12 @@
       AND deleted_at IS NULL")
 
 (defn- get-external-invitation-info
-  "Returns info about external (non-org-member) invitations pending for a team.
-   External invitations are those sent to users who are not members of the given org.
+  "Returns info about external (non-organization-member) invitations pending for a team.
+   External invitations are those sent to users who are not members of the given organization.
    Returns {:allows-anybody bool :external-emails [...]}"
   [{:keys [::db/conn] :as cfg} team-id organization-id]
-  (let [org-perms      (nitrate/call cfg :get-org-permissions {:organization-id organization-id})
-        allows-anybody (nitrate-perms/allowed? :add-anybody-to-team {:org-perms org-perms})]
+  (let [organization-perms      (nitrate/call cfg :get-organization-permissions {:organization-id organization-id})
+        allows-anybody (cto/allowed? :add-anybody-to-team {:organization-perms organization-perms})]
     (if allows-anybody
       {:allows-anybody true :external-emails []}
       (let [emails (map :email (noh/get-team-invitation-emails conn team-id))]
@@ -421,9 +470,9 @@
           {:allows-anybody false :external-emails []}
           (let [emails-array    (db/create-array conn "text" (vec emails))
                 profiles        (db/exec! conn [sql:get-profiles-by-emails emails-array])
-                org-member-ids  (into #{} (nitrate/call cfg :get-org-members {:organization-id organization-id}))
+                organization-member-ids  (into #{} (nitrate/call cfg :get-organization-members {:organization-id organization-id}))
                 external-emails (->> profiles
-                                     (remove #(contains? org-member-ids (:id %)))
+                                     (remove #(contains? organization-member-ids (:id %)))
                                      (map :email)
                                      (vec))]
             {:allows-anybody false :external-emails external-emails}))))))
@@ -444,59 +493,61 @@
   (assert-not-default-team cfg team-id)
   (assert-membership cfg profile-id organization-id)
 
-  (when (contains? cf/flags :nitrate)
-    (let [org-member-ids-before (into #{} (nitrate/call cfg :get-org-members {:organization-id organization-id}))
-          team-with-org         (nitrate/call cfg :get-team-org {:team-id team-id})
-          source-org-id         (get-in team-with-org [:organization :id])
-          source-org-perms      (when source-org-id
-                                  (nitrate/call cfg :get-org-permissions
-                                                {:organization-id source-org-id}))
-          target-org-perms      (nitrate/call cfg :get-org-permissions
-                                              {:organization-id organization-id})
-          target-org-same-owner? (and (some? source-org-perms)
-                                      (some? target-org-perms)
-                                      (= (:owner-id source-org-perms)
-                                         (:owner-id target-org-perms)))]
-      (when (nil? target-org-perms)
+  (when (contains? cf/flags :admin-console)
+    (let [organization-member-ids-before (into #{} (nitrate/call cfg :get-organization-members {:organization-id organization-id}))
+          team-with-organization         (nitrate/call cfg :get-team-organization {:team-id team-id})
+          source-organization-id         (get-in team-with-organization [:organization :id])
+          source-organization-perms      (when source-organization-id
+                                           (nitrate/call cfg :get-organization-permissions
+                                                         {:organization-id source-organization-id}))
+          target-organization-perms      (nitrate/call cfg :get-organization-permissions
+                                                       {:organization-id organization-id})
+          target-organization-same-owner? (and (some? source-organization-perms)
+                                               (some? target-organization-perms)
+                                               (= (:owner-id source-organization-perms)
+                                                  (:owner-id target-organization-perms)))]
+      (when (nil? target-organization-perms)
         (ex/raise :type :validation
                   :code :not-allowed
                   :hint "Unable to verify organization permissions"))
 
-      ;; Team already belongs to an organization: check move-teams on source org.
-      (when (some? source-org-id)
-        (when (nil? source-org-perms)
+      ;; Team already belongs to an organization: check move-teams on the source organization.
+      (when (some? source-organization-id)
+        (when (nil? source-organization-perms)
           (ex/raise :type :validation
                     :code :not-allowed
                     :hint "Unable to verify organization permissions"))
-        (when-not (nitrate-perms/allowed? :move-team
-                                          {:org-perms source-org-perms
-                                           :profile-id profile-id
-                                           :target-org-same-owner? target-org-same-owner?})
+        (when-not (cto/allowed? :move-team
+                                {:organization-perms source-organization-perms
+                                 :profile-id profile-id
+                                 :target-organization-same-owner? target-organization-same-owner?})
           (ex/raise :type :validation
                     :code :not-allowed
                     :hint "You are not allowed to move teams that are part of this organization. If you need more information, contact the owner.")))
 
       ;; Always check target create-teams permission (new/add and move flows).
-      (when-not (nitrate-perms/allowed? :create-team
-                                        {:org-perms target-org-perms
-                                         :profile-id profile-id})
+      (when-not (cto/allowed? :create-team
+                              {:organization-perms target-organization-perms
+                               :profile-id profile-id})
         (ex/raise :type :validation
                   :code :not-allowed
                   :hint "You are not allowed to add teams in this organization"))
 
-      ;; Add teammates to the org if needed
+      ;; Add teammates to the organization if needed
       (let [team-members (db/query cfg :team-profile-rel {:team-id team-id})
             new-member-ids (->> team-members
                                 (map :profile-id)
                                 (remove #{profile-id})
-                                (remove org-member-ids-before))]
+                                (remove organization-member-ids-before))]
         (doseq [member-id new-member-ids]
-          (teams/initialize-user-in-nitrate-org cfg member-id organization-id)))
+          (teams/initialize-user-in-organization cfg member-id organization-id)))
 
       ;; Api call to nitrate
-      (let [team (nitrate/call cfg :set-team-org {:team-id team-id :organization-id organization-id :is-default false})]
+      (let [team (nitrate/call cfg :set-team-organization {:team-id team-id
+                                                           :organization-id organization-id
+                                                           :is-default false})]
         ;; Notify connected users
-        (notifications/notify-team-change cfg team "dashboard.team-belong-org"))
+        (notifications/notify-team-change cfg team "dashboard.team-belong-organization"))
 
       ;; Delete pending invitations for users who are not members of the target organization
       (let [{:keys [allows-anybody external-emails]} (get-external-invitation-info cfg team-id organization-id)]
@@ -505,73 +556,73 @@
                 emails-array (db/create-array conn "text" external-emails)]
             (db/exec! conn [sql:delete-team-external-invitations team-id emails-array]))))
 
-      ;; Send warnings via email if the org has sso
+      ;; Send warnings via email if the organization has sso
       (neh/send-organization-setup-sso-emails-for-team!
-       cfg organization-id team-id org-member-ids-before)))
+       cfg organization-id team-id organization-member-ids-before)))
 
   nil)
 
-(def ^:private schema:check-org-members-params
-  [:map {:title "CheckOrgMembersParams"}
+(def ^:private schema:check-organization-members-params
+  [:map {:title "CheckOrganizationMembersParams"}
    [:organization-id ::sm/uuid]
    [:emails [:vector ::sm/email]]])
 
-(sv/defmethod ::check-org-members
+(sv/defmethod ::check-organization-members
   {::rpc/auth true
    ::doc/added "2.17"
-   ::sm/params schema:check-org-members-params
+   ::sm/params schema:check-organization-members-params
    ::sm/result [:map-of :string :boolean]
    ::db/transaction true}
   [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id organization-id emails]}]
-  (or (when (contains? cf/flags :nitrate)
+  (or (when (contains? cf/flags :admin-console)
         (assert-membership cfg profile-id organization-id)
         (let [emails-array   (db/create-array conn "text" emails)
               profiles       (db/exec! conn [sql:get-profiles-by-emails emails-array])
               email->id      (into {} (map (fn [p] [(:email p) (:id p)])) profiles)
-              org-member-ids (into #{} (nitrate/call cfg :get-org-members {:organization-id organization-id}))]
+              organization-member-ids (into #{} (nitrate/call cfg :get-organization-members {:organization-id organization-id}))]
           (into {}
                 (map (fn [email]
                        (let [pid (get email->id email)]
-                         [email (boolean (and pid (contains? org-member-ids pid)))])))
+                         [email (boolean (and pid (contains? organization-member-ids pid)))])))
                 emails)))
       {}))
 
-(def ^:private schema:all-org-members-in-team-params
-  [:map {:title "CheckOrgMembersInTeamParams"}
+(def ^:private schema:all-organization-members-in-team-params
+  [:map {:title "CheckOrganizationMembersInTeamParams"}
    [:team-id ::sm/uuid]
    [:organization-id ::sm/uuid]])
 
-(sv/defmethod ::all-org-members-in-team
+(sv/defmethod ::all-organization-members-in-team
   {::rpc/auth true
    ::doc/added "2.17"
-   ::sm/params schema:all-org-members-in-team-params
+   ::sm/params schema:all-organization-members-in-team-params
    ::sm/result ::sm/boolean}
   [cfg {:keys [::rpc/profile-id team-id organization-id]}]
-  (if (contains? cf/flags :nitrate)
+  (if (contains? cf/flags :admin-console)
     (let [perms (teams/get-permissions cfg profile-id team-id)]
       (when-not (or (:is-admin perms) (:is-owner perms))
         (ex/raise :type :validation
                   :code :insufficient-permissions))
       (assert-membership cfg profile-id organization-id)
-      (let [org-members     (nitrate/call cfg :get-org-members {:organization-id organization-id})
-            org-member-ids  (into #{} org-members)
+      (let [organization-members     (nitrate/call cfg :get-organization-members {:organization-id organization-id})
+            organization-member-ids  (into #{} organization-members)
             team-members    (db/query cfg :team-profile-rel {:team-id team-id})
             team-member-ids (into #{} (map :profile-id team-members))]
-        (every? #(contains? team-member-ids %) org-member-ids)))
+        (every? #(contains? team-member-ids %) organization-member-ids)))
     false))
 
-(def ^:private schema:all-team-members-in-orgs-params
-  [:map {:title "CheckTeamMembersInOrgsParams"}
+(def ^:private schema:all-team-members-in-organizations-params
+  [:map {:title "CheckTeamMembersInOrganizationsParams"}
    [:team-id ::sm/uuid]
    [:organization-ids [:vector ::sm/uuid]]])
 
-(sv/defmethod ::all-team-members-in-orgs
+(sv/defmethod ::all-team-members-in-organizations
   {::rpc/auth true
    ::doc/added "2.17"
-   ::sm/params schema:all-team-members-in-orgs-params
+   ::sm/params schema:all-team-members-in-organizations-params
    ::sm/result [:map-of ::sm/uuid ::sm/boolean]}
   [cfg {:keys [::rpc/profile-id team-id organization-ids]}]
-  (if (contains? cf/flags :nitrate)
+  (if (contains? cf/flags :admin-console)
     (let [perms (teams/get-permissions cfg profile-id team-id)]
       (when-not (or (:is-admin perms) (:is-owner perms))
         (ex/raise :type :validation
@@ -579,15 +630,15 @@
 
       (let [team-members    (db/query cfg :team-profile-rel {:team-id team-id})
             team-member-ids (into #{} (map :profile-id team-members))]
-        ;; Validate requester membership in all orgs before fetching members.
+        ;; Validate requester membership in all organizations before fetching members.
         (run! #(assert-membership cfg profile-id %) organization-ids)
 
         (into {}
               (map (fn [organization-id]
-                     (let [org-members    (nitrate/call cfg :get-org-members {:organization-id organization-id})
-                           org-member-ids (into #{} org-members)]
+                     (let [organization-members    (nitrate/call cfg :get-organization-members {:organization-id organization-id})
+                           organization-member-ids (into #{} organization-members)]
                        [organization-id
-                        (every? #(contains? org-member-ids %) team-member-ids)])))
+                        (every? #(contains? organization-member-ids %) team-member-ids)])))
               organization-ids)))
     {}))
 
@@ -608,7 +659,7 @@
    ::sm/result schema:check-team-external-invitations-result
    ::db/transaction true}
   [cfg {:keys [::rpc/profile-id team-id organization-id]}]
-  (if (contains? cf/flags :nitrate)
+  (if (contains? cf/flags :admin-console)
     (let [perms (teams/get-permissions cfg profile-id team-id)]
       (when-not (or (:is-admin perms) (:is-owner perms))
         (ex/raise :type :validation
@@ -631,8 +682,8 @@
 
 (sv/defmethod ::check-nitrate-sso
   "Check if a user needs to login into the organization SSO.
-  Accepts either team-id (to look up the org via the team) or organization-id directly.
-  Returns {:authorized true} when SSO is not active.
+  Accepts either team-id (to look up the organization via the team) or organization-id directly.
+  Returns {:authorized true} when SSO is not active or the user cannot access the team.
   Returns {:authorized false :redirect-uri <url>} when SSO is active;
   the client must redirect there. The OIDC provider itself handles
   re-authentication transparently if the user already has an active SSO session."
@@ -640,17 +691,22 @@
    ::doc/added "2.19"
    ::sm/params schema:check-nitrate-sso
    ::nitrate/sso false}
-  [cfg {:keys [team-id organization-id url] :as params}]
-  (if (contains? cf/flags :nitrate)
-    (let [request                  (rph/get-request params)
-          {:keys [authorized sso]} (nitrate/sso-session-authorized? cfg organization-id team-id request)]
-      (if authorized
-        {:authorized true}
-        (if (oidc/org-sso-discovery-uri sso)
-          {:authorized false
-           :redirect-uri (oidc/build-org-sso-auth-redirect-uri cfg sso
-                                                               :dest-url url
-                                                               :organization-id organization-id)}
-          {:authorized false
-           :redirect-uri nil})))
+  [cfg {:keys [::rpc/profile-id team-id organization-id url] :as params}]
+  (if (contains? cf/flags :admin-console)
+    (if (and team-id
+             (not (teams/has-read-permissions? cfg profile-id team-id)))
+      ;; Let the destination RPC enforce its own permissions. Starting SSO before
+      ;; access is established sends unrelated users through the organization's IdP.
+      {:authorized true}
+      (let [request                  (rph/get-request params)
+            {:keys [authorized sso]} (nitrate/sso-session-authorized? cfg organization-id team-id request)]
+        (if authorized
+          {:authorized true}
+          (if (oidc/organization-sso-discovery-uri sso)
+            {:authorized false
+             :redirect-uri (oidc/build-organization-sso-auth-redirect-uri cfg sso
+                                                                          :dest-url url
+                                                                          :organization-id organization-id)}
+            {:authorized false
+             :redirect-uri nil}))))
     {:authorized true}))
diff --git a/backend/src/app/rpc/commands/profile.clj b/backend/src/app/rpc/commands/profile.clj
index eb89684afa..8b683a577f 100644
--- a/backend/src/app/rpc/commands/profile.clj
+++ b/backend/src/app/rpc/commands/profile.clj
@@ -7,6 +7,7 @@
 (ns app.rpc.commands.profile
   (:require
    [app.auth :as auth]
+   [app.auth.passwords :as passwords]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.schema :as sm]
@@ -21,6 +22,7 @@
    [app.loggers.audit :as audit]
    [app.main :as-alias main]
    [app.media :as media]
+   [app.media.validation :as media.v]
    [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
    [app.rpc.climit :as climit]
@@ -45,8 +47,17 @@
    [:email-comments [::sm/one-of #{:all :partial :none}]]
    [:email-invites [::sm/one-of #{:all :none}]]])
 
+(def schema:nudge
+  [:map {:title "Nudge"}
+   [:big {:optional true} ::sm/number]
+   [:small {:optional true} ::sm/number]])
+
+(def system-managed-props
+  "Props keys managed by the system (not user-writable via RPC)."
+  #{:subscription})
+
 (def schema:props
-  [:map {:title "ProfileProps"}
+  [:map {:title "ProfileProps" :closed true}
    [:plugins {:optional true} schema:plugin-registry]
    [:renderer {:optional true} [::sm/one-of #{:svg :wasm}]]
    [:mcp-enabled {:optional true} ::sm/boolean]
@@ -54,12 +65,18 @@
    [:newsletter-news {:optional true} ::sm/boolean]
    [:onboarding-team-id {:optional true} ::sm/uuid]
    [:onboarding-viewed {:optional true} ::sm/boolean]
+   [:onboarding-questions {:optional true} [:map-of :keyword :string]]
+   [:onboarding-questions-answered {:optional true} ::sm/boolean]
+   [:nitrate-onboarding-viewed {:optional true} ::sm/boolean]
    [:v2-info-shown {:optional true} ::sm/boolean]
    [:welcome-file-id {:optional true} [:maybe ::sm/boolean]]
    [:release-notes-viewed {:optional true}
     [::sm/text {:max 100}]]
    [:notifications {:optional true} schema:props-notifications]
-   [:workspace-visited {:optional true} ::sm/boolean]])
+   [:workspace-visited {:optional true} ::sm/boolean]
+   [:custom-shortcuts {:optional true}
+    [:map-of {:gen/max 10} :keyword [:map-of :keyword :string]]]
+   [:nudge {:optional true} schema:nudge]])
 
 (def schema:profile
   [:map {:title "Profile"}
@@ -93,7 +110,7 @@
 
 (defn- with-nitrate-licence
   [profile cfg]
-  (if (contains? cf/flags :nitrate)
+  (if (contains? cf/flags :admin-console)
     (nitrate/add-nitrate-licence-to-profile cfg profile)
     profile))
 
@@ -146,6 +163,9 @@
   ;; it or not for explicit locking and avoid concurrent updates of
   ;; the same row/object.
   (let [profile (get-profile conn profile-id ::db/for-update true)
+        fullname (d/normalize-string fullname)
+        lang     (d/normalize-string lang)
+        theme    (d/normalize-string theme)
         ;; Update the profile map with direct params
         profile (-> profile
                     (assoc :fullname fullname)
@@ -191,6 +211,9 @@
                 :code :email-as-password
                 :hint "you can't use your email as password"))
 
+    ;; Validate password strength against common password dictionary
+    (passwords/validate-password (:password params))
+
     (update-profile-password! cfg (assoc profile :password password))
 
     (->> (rph/get-request params)
@@ -263,7 +286,7 @@
 (def ^:private
   schema:update-profile-photo
   [:map {:title "update-profile-photo"}
-   [:file media/schema:upload]])
+   [:file media.v/schema:upload]])
 
 (sv/defmethod ::update-profile-photo
   {:doc/added "1.1"
@@ -271,8 +294,8 @@
    ::sm/result :nil}
   [cfg {:keys [::rpc/profile-id file] :as params}]
   ;; Validate incoming mime type
-  (media/validate-media-type! file #{"image/jpeg" "image/png" "image/webp"})
-  (media/validate-media-size! file)
+  (media.v/validate-media-type! file #{"image/jpeg" "image/png" "image/webp"})
+  (media.v/validate-media-size! file)
   (update-profile-photo cfg (assoc params :profile-id profile-id)))
 
 (defn update-profile-photo
@@ -449,7 +472,7 @@
                                  (assoc props k v))
                                props))
                            (:props profile)
-                           props)]
+                           (apply dissoc props system-managed-props))]
 
     (db/update! conn :profile
                 {:props (db/tjson props)}
@@ -491,14 +514,14 @@
                 {:id profile-id})
 
     ;; Delete owned organizations on the fly (no grace period).
-    ;; Nitrate iterates the user's owned orgs and, per org, calls
+    ;; Nitrate iterates the user's owned organizations and, per organization, calls
     ;; Penpot back through two paths: ::notify-user-organizations-deletion
-    ;; (during delete-owned-orgs) and ::notify-organization-deletion.
-    ;; Both preserve org teams unchanged and only prefix or delete
+    ;; (during delete-owned-organizations) and ::notify-organization-deletion.
+    ;; Both preserve organization teams unchanged and only prefix or delete
     ;; imported "Your Penpot" teams according to whether they still have files.
     ;; Let Nitrate clean up the data associated with the deleted Penpot user:
     ;; owned organizations, remaining memberships, and subscription cancellation.
-    (when (contains? cf/flags :nitrate)
+    (when (contains? cf/flags :admin-console)
       (nitrate/call cfg :cleanup-deleted-penpot-user
                     {:profile-id profile-id}))
 
@@ -557,8 +580,8 @@
   {::doc/added "2.18"
    ::sm/result schema:get-owned-organizations-summary-result}
   [cfg {:keys [::rpc/profile-id]}]
-  (if (contains? cf/flags :nitrate)
-    (or (nitrate/call cfg :get-owned-orgs-summary {:profile-id profile-id}) [])
+  (if (contains? cf/flags :admin-console)
+    (or (nitrate/call cfg :get-owned-organizations-summary {:profile-id profile-id}) [])
     []))
 
 ;; --- HELPERS
diff --git a/backend/src/app/rpc/commands/projects.clj b/backend/src/app/rpc/commands/projects.clj
index 12da9bb7c5..cfb03a2f0d 100644
--- a/backend/src/app/rpc/commands/projects.clj
+++ b/backend/src/app/rpc/commands/projects.clj
@@ -6,6 +6,7 @@
 
 (ns app.rpc.commands.projects
   (:require
+   [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.schema :as sm]
@@ -259,7 +260,8 @@
    ::db/transaction true}
   [{:keys [::db/conn]} {:keys [::rpc/profile-id id name] :as params}]
   (check-edition-permissions! conn profile-id id)
-  (let [project (db/get-by-id conn :project id ::sql/for-update true)]
+  (let [project (db/get-by-id conn :project id ::sql/for-update true)
+        name    (d/normalize-string name)]
     (db/update! conn :project
                 {:name name}
                 {:id id})
diff --git a/backend/src/app/rpc/commands/search.clj b/backend/src/app/rpc/commands/search.clj
index 796ddf4810..7b60e6db30 100644
--- a/backend/src/app/rpc/commands/search.clj
+++ b/backend/src/app/rpc/commands/search.clj
@@ -6,9 +6,11 @@
 
 (ns app.rpc.commands.search
   (:require
+   [app.common.data.macros :as dm]
    [app.common.schema :as sm]
    [app.db :as db]
    [app.rpc :as-alias rpc]
+   [app.rpc.commands.teams :as teams]
    [app.rpc.doc :as-alias doc]
    [app.util.services :as sv]))
 
@@ -66,11 +68,13 @@
 (def ^:private schema:search-files
   [:map {:title "search-files"}
    [:team-id ::sm/uuid]
-   [:search-term {:optional true} :string]])
+   [:search-term {:optional true} [:string {:max 250}]]])
 
 (sv/defmethod ::search-files
   {::doc/added "1.17"
    ::doc/module :files
    ::sm/params schema:search-files}
   [{:keys [::db/pool]} {:keys [::rpc/profile-id team-id search-term]}]
-  (some->> search-term (search-files pool profile-id team-id)))
+  (dm/with-open [conn (db/open pool)]
+    (teams/check-read-permissions! conn profile-id team-id)
+    (some->> search-term (search-files conn profile-id team-id))))
diff --git a/backend/src/app/rpc/commands/teams.clj b/backend/src/app/rpc/commands/teams.clj
index b091516586..196b35c051 100644
--- a/backend/src/app/rpc/commands/teams.clj
+++ b/backend/src/app/rpc/commands/teams.clj
@@ -12,7 +12,7 @@
    [app.common.features :as cfeat]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
+   [app.common.types.organization :as cto]
    [app.common.types.team :as types.team]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -22,7 +22,7 @@
    [app.features.logical-deletion :as ldel]
    [app.loggers.audit :as audit]
    [app.main :as-alias main]
-   [app.media :as media]
+   [app.media.validation :as media.v]
    [app.msgbus :as mbus]
    [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
@@ -197,9 +197,9 @@
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id] :as params}]
   (dm/with-open [conn (db/open pool)]
     (cond->> (get-teams conn profile-id)
-      (contains? cf/flags :nitrate)
-      (map #(nitrate/add-org-info-to-team cfg % params))
-      (contains? cf/flags :nitrate)
+      (contains? cf/flags :admin-console)
+      (map #(nitrate/add-organization-info-to-team cfg % params))
+      (contains? cf/flags :admin-console)
       (remove #(get-in % [:organization :expired-license])))))
 
 (def ^:private sql:get-owned-teams
@@ -244,11 +244,11 @@
    ::sm/params schema:get-team}
   [cfg {:keys [::rpc/profile-id id file-id] :as params}]
   (let [team (get-team cfg :profile-id profile-id :team-id id :file-id file-id)]
-    (if (contains? cf/flags :nitrate)
-      (nitrate/add-org-info-to-team cfg team params)
+    (if (contains? cf/flags :admin-console)
+      (nitrate/add-organization-info-to-team cfg team params)
       team)))
 
-(defn- get-org-owner-viewer-team
+(defn- get-organization-owner-viewer-team
   "When `profile-id` is a non-member owner of the organization that owns
   the requested team, returns the team shaped with viewer permissions;
   otherwise nil. `cfg` must carry the nitrate client."
@@ -305,7 +305,7 @@
       (-> result
           (decode-row)
           (process-permissions))
-      (or (get-org-owner-viewer-team cfg profile-id default-team-id params)
+      (or (get-organization-owner-viewer-team cfg profile-id default-team-id params)
           (ex/raise :type :not-found
                     :code :team-does-not-exist)))))
 
@@ -535,18 +535,18 @@
   (quotes/check! cfg {::quotes/id ::quotes/teams-per-profile
                       ::quotes/profile-id profile-id})
 
-  ;; When creating inside an org, verify the user has permission to do so.
-  ;; Fail closed: if org permissions cannot be fetched, deny the operation.
-  (when (and organization-id (contains? cf/flags :nitrate))
-    (let [org-perms (nitrate/call cfg :get-org-permissions
-                                  {:organization-id organization-id})]
-      (if (nil? org-perms)
+  ;; When creating inside an organization, verify the user has permission to do so.
+  ;; Fail closed: if organization permissions cannot be fetched, deny the operation.
+  (when (and organization-id (contains? cf/flags :admin-console))
+    (let [organization-perms (nitrate/call cfg :get-organization-permissions
+                                           {:organization-id organization-id})]
+      (if (nil? organization-perms)
         (ex/raise :type :validation
                   :code :not-allowed
                   :hint "Unable to verify organization permissions")
-        (when-not (nitrate-perms/allowed? :create-team
-                                          {:org-perms org-perms
-                                           :profile-id profile-id})
+        (when-not (cto/allowed? :create-team
+                                {:organization-perms organization-perms
+                                 :profile-id profile-id})
           (ex/raise :type :validation
                     :code :not-allowed
                     :hint "You are not allowed to create teams in this organization")))))
@@ -563,7 +563,7 @@
       {::audit/props {:id (:id team)}})))
 
 
-(defn create-default-org-team
+(defn create-default-organization-team
   [cfg profile-id organization-id]
   (quotes/check! cfg {::quotes/id ::quotes/teams-per-profile
                       ::quotes/profile-id profile-id})
@@ -579,37 +579,37 @@
         team     (create-team cfg params)]
     (select-keys team [:id])))
 
-(defn initialize-user-in-nitrate-org
+(defn initialize-user-in-organization
   "If needed, create a default team for the user on the organization,
-   and notify Nitrate that an user has been added to an org."
+   and initialize the user in the organization."
   ([cfg profile-id organization-id]
-   (initialize-user-in-nitrate-org cfg profile-id organization-id nil))
+   (initialize-user-in-organization cfg profile-id organization-id nil))
   ([cfg profile-id organization-id email]
    (assert (db/connection-map? cfg)
            "expected cfg with valid connection")
-   (when (contains? cf/flags :nitrate)
+   (when (contains? cf/flags :admin-console)
      (db/tx-run!
       cfg
       (fn [{:keys [::db/conn] :as tx-cfg}]
 
-        (let [membership (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                                :organization-id organization-id})]
+        (let [membership (nitrate/call cfg :get-organization-membership {:profile-id profile-id
+                                                                         :organization-id organization-id})]
           ;; Only when the user doesn't belong to the organization yet
           (when (and
                  (some? (:organization-id membership)) ;; the organization exists
-                 (not (:is-member membership)))        ;; the user is not a member of the org yet
+                 (not (:is-member membership)))        ;; the user is not a member of the organization yet
 
 
             (let [organization-id           organization-id
-                  default-team     (create-default-org-team (assoc tx-cfg ::db/conn conn) profile-id organization-id)
+                  default-team     (create-default-organization-team (assoc tx-cfg ::db/conn conn) profile-id organization-id)
                   default-team-id  (:id default-team)
-                  result           (nitrate/call tx-cfg :add-profile-to-org (cond-> {:profile-id profile-id
-                                                                                     :team-id default-team-id
-                                                                                     :organization-id organization-id}
-                                                                              (some? email) (assoc :email email)))]
+                  result           (nitrate/call tx-cfg :add-profile-to-organization (cond-> {:profile-id profile-id
+                                                                                              :team-id default-team-id
+                                                                                              :organization-id organization-id}
+                                                                                       (some? email) (assoc :email email)))]
               (when (not (:is-member result))
                 (ex/raise :type :internal
-                          :code :failed-add-profile-org-nitrate
+                          :code :failed-add-profile-organization-nitrate
                           :context {:profile-id profile-id
                                     :organization-id organization-id
                                     :default-team-id default-team-id}))
@@ -621,13 +621,13 @@
   ([{:keys [::db/conn] :as cfg} {:keys [:profile-id :team-id] :as params} options]
    (assert (db/connection-map? cfg)
            "expected cfg with valid connection")
-   (when (contains? cf/flags :nitrate)
-     (let [membership (nitrate/call cfg :get-org-membership-by-team {:profile-id profile-id :team-id team-id})]
+   (when (contains? cf/flags :admin-console)
+     (let [membership (nitrate/call cfg :get-organization-membership-by-team {:profile-id profile-id :team-id team-id})]
        ;; Only when the team belong to an organization and the user is not a member
        (when (and
               (some? (:organization-id membership)) ;; the team do belong to an organization
-              (not (:is-member membership)))        ;; the user is not a member of the org yet
-         (initialize-user-in-nitrate-org cfg profile-id (:organization-id membership)))))
+              (not (:is-member membership)))        ;; the user is not a member of the organization yet
+         (initialize-user-in-organization cfg profile-id (:organization-id membership)))))
    (db/insert! conn :team-profile-rel (assoc params :id (uuid/next)) options)))
 
 (defn create-team
@@ -643,7 +643,7 @@
         project (create-team-default-project conn params)]
     (create-team-role cfg params)
     ;; Set team organization in Nitrate if organization-id is provided
-    (when (and (contains? cf/flags :nitrate) (:organization-id params))
+    (when (and (contains? cf/flags :admin-console) (:organization-id params))
       (nitrate/set-team-organization cfg team params))
     (assoc team :default-project-id (:id project))))
 
@@ -652,6 +652,7 @@
   (let [id         (or id (uuid/next))
         is-default (if (boolean? is-default) is-default false)
         features   (db/create-array conn "text" features)
+        name       (d/normalize-string name)
         team       (db/insert! conn :team
                                {:id id
                                 :name name
@@ -688,6 +689,7 @@
   [conn {:keys [id team-id name is-default created-at modified-at]}]
   (let [id         (or id (uuid/next))
         is-default (if (boolean? is-default) is-default false)
+        name       (d/normalize-string name)
         params     {:id id
                     :name name
                     :team-id team-id
@@ -718,9 +720,10 @@
    ::db/transaction true}
   [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id name]}]
   (check-edition-permissions! conn profile-id id)
-  (db/update! conn :team
-              {:name name}
-              {:id id})
+  (let [name (d/normalize-string name)]
+    (db/update! conn :team
+                {:name name}
+                {:id id}))
   nil)
 
 
@@ -803,19 +806,19 @@
   [{:keys [::db/conn] :as cfg} {:keys [profile-id team-id] :as params}]
 
   (let [team  (get-team conn :profile-id profile-id :team-id team-id)
-        team  (if (contains? cf/flags :nitrate)
-                (nitrate/add-org-info-to-team cfg team params)
+        team  (if (contains? cf/flags :admin-console)
+                (nitrate/add-organization-info-to-team cfg team params)
                 team)
         perms (get team :permissions)
-        org   (:organization team)
-        in-org? (and (contains? cf/flags :nitrate) org)
+        organization   (:organization team)
+        in-organization? (and (contains? cf/flags :admin-console) organization)
         can-delete?
-        (if in-org?
-          (nitrate-perms/allowed? :delete-team
-                                  {:org-perms {:owner-id    (dm/get-in team [:organization :owner-id])
-                                               :permissions (dm/get-in team [:organization :permissions])}
-                                   :profile-id profile-id
-                                   :team-perms perms})
+        (if in-organization?
+          (cto/allowed? :delete-team
+                        {:organization-perms {:owner-id    (dm/get-in team [:organization :owner-id])
+                                              :permissions (dm/get-in team [:organization :permissions])}
+                         :profile-id profile-id
+                         :team-perms perms})
           (boolean (:is-owner perms)))]
 
     (when-not can-delete?
@@ -823,8 +826,8 @@
                 :code :only-owner-can-delete-team))
 
     ;; Protect the user's personal default team from deletion.
-    ;; Org-scoped default teams ("Your Penpot") are allowed to be deleted when they have no files.
-    (when (and (:is-default team) (not in-org?))
+    ;; Organization-scoped default teams ("Your Penpot") are allowed to be deleted when they have no files.
+    (when (and (:is-default team) (not in-organization?))
       (ex/raise :type :validation
                 :code :non-deletable-team
                 :hint "impossible to delete default team"))
@@ -836,7 +839,7 @@
                             {::db/return-keys true})]
 
       ;; Api call to nitrate
-      (when (contains? cf/flags :nitrate)
+      (when (contains? cf/flags :admin-console)
         (nitrate/call cfg :delete-team {:profile-id profile-id :team-id team-id}))
 
       (wrk/submit! {::db/conn conn
@@ -951,12 +954,23 @@
 
     (db/delete! conn :team-profile-rel {:profile-id member-id
                                         :team-id team-id})
-    (mbus/pub! msgbus
-               :topic member-id
-               :message {:type :team-membership-change
-                         :change :removed
-                         :team-id team-id
-                         :team-name (:name team)})
+
+    ;; A removed member that owns the organization of this team keeps
+    ;; read-only access to it, so instead of kicking them out we degrade
+    ;; their session to viewer, same as any other role change.
+    (if (nitrate/organization-owner-of-team? cfg member-id team-id)
+      (mbus/pub! msgbus
+                 :topic member-id
+                 :message {:type :team-role-change
+                           :topic member-id
+                           :team-id team-id
+                           :role :viewer})
+      (mbus/pub! msgbus
+                 :topic member-id
+                 :message {:type :team-membership-change
+                           :change :removed
+                           :team-id team-id
+                           :team-name (:name team)}))
 
     nil))
 
@@ -968,7 +982,7 @@
 (def ^:private schema:update-team-photo
   [:map {:title "update-team-photo"}
    [:team-id ::sm/uuid]
-   [:file media/schema:upload]])
+   [:file media.v/schema:upload]])
 
 (sv/defmethod ::update-team-photo
   {::doc/added "1.17"
@@ -976,8 +990,8 @@
   [cfg {:keys [::rpc/profile-id file] :as params}]
   ;; Validate incoming mime type
 
-  (media/validate-media-type! file #{"image/jpeg" "image/png" "image/webp"})
-  (media/validate-media-size! file)
+  (media.v/validate-media-type! file #{"image/jpeg" "image/png" "image/webp"})
+  (media.v/validate-media-size! file)
   (update-team-photo cfg (assoc params :profile-id profile-id)))
 
 (defn update-team-photo
diff --git a/backend/src/app/rpc/commands/teams_invitations.clj b/backend/src/app/rpc/commands/teams_invitations.clj
index c17a4e5a45..0ba235a444 100644
--- a/backend/src/app/rpc/commands/teams_invitations.clj
+++ b/backend/src/app/rpc/commands/teams_invitations.clj
@@ -14,7 +14,7 @@
    [app.common.logging :as l]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
+   [app.common.types.organization :as cto]
    [app.common.types.team :as types.team]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -44,12 +44,31 @@
           update set role = ?, valid_until = ?, updated_at = now()
    returning *")
 
-(def sql:upsert-org-invitation
+(def sql:upsert-organization-invitation
   "insert into team_invitation(id, team_id, org_id, email_to, created_by, role, valid_until)
-   values (?, null, ?, ?, ?, ?, ?)
-       on conflict(org_id, email_to) where team_id is null do
-          update set role = ?, valid_until = ?, updated_at = now()
-   returning *")
+    values (?, null, ?, ?, ?, ?, ?)
+        on conflict(org_id, email_to) where team_id is null do
+           update set role = ?, valid_until = ?, updated_at = now()
+    returning *")
+
+(def ^:private sql:check-recent-invitation
+  "SELECT 1 FROM team_invitation
+   WHERE team_id = ? AND email_to = ?
+     AND updated_at > now() - interval '5 minutes'
+   LIMIT 1")
+
+(def ^:private sql:check-recent-org-invitation
+  "SELECT 1 FROM team_invitation
+   WHERE org_id = ? AND email_to = ?
+     AND updated_at > now() - interval '5 minutes'
+   LIMIT 1")
+
+(defn- recently-invited?
+  [{:keys [::db/conn]} team-id org-id email]
+  (let [query (if org-id
+                [sql:check-recent-org-invitation org-id email]
+                [sql:check-recent-invitation team-id email])]
+    (some? (db/exec-one! conn query))))
 
 (defn- create-invitation-token
   [cfg {:keys [profile-id valid-until organization-id organization-name team-id member-id member-email role]}]
@@ -86,17 +105,10 @@
    [:role types.team/schema:role]
    [:email ::sm/email]])
 
-(def ^:private schema:create-org-invitation
-  [:map {:title "params:create-org-invitation"}
+(def ^:private schema:create-organization-invitation
+  [:map {:title "params:create-organization-invitation"}
    [::rpc/profile-id ::sm/uuid]
-   [:organization
-    [:map
-     [:id ::sm/uuid]
-     [:name :string]
-     [:initials [:maybe :string]]
-     [:logo ::sm/uri]
-     [:avatar-bg-url [:maybe ::sm/uri]]
-     [:sso-active [:maybe ::sm/boolean]]]]
+   [:organization cto/schema:organization-with-avatar]
    [:profile
     [:map
      [:id ::sm/uuid]
@@ -107,8 +119,8 @@
 (def ^:private check-create-invitation-params
   (sm/check-fn schema:create-invitation))
 
-(def ^:private check-create-org-invitation-params
-  (sm/check-fn schema:create-org-invitation))
+(def ^:private check-create-organization-invitation-params
+  (sm/check-fn schema:create-organization-invitation))
 
 (defn- allow-invitation-emails?
   [member]
@@ -116,23 +128,24 @@
     (not= :none (:email-invites notifications))))
 
 (defn- assert-email-can-be-invited
-  "Asserts that member is an org member when the org
+  "Asserts that member is an organization member when the organization
   restricts who can be added to teams."
-  [member org-member-ids]
-  (when (some? org-member-ids)
-    (let [is-member? (and (some? member) (contains? org-member-ids (:id member)))]
+  [member organization-member-ids]
+  (when (some? organization-member-ids)
+    (let [is-member? (and (some? member) (contains? organization-member-ids (:id member)))]
       (when-not is-member?
         (ex/raise :type :validation
-                  :code :email-not-org-member
+                  :code :email-not-organization-member
                   :hint "The invited email is not a member of the organization")))))
 
 (defn- create-invitation
-  [{:keys [::db/conn] :as cfg} {:keys [team organization profile role email org-member-ids] :as params}]
+  [{:keys [::db/conn] :as cfg}
+   {:keys [team organization profile role email organization-member-ids all-organization-member-ids] :as params}]
 
   (assert (db/connection-map? cfg)
           "expected cfg with valid connection")
   (if organization
-    (assert (check-create-org-invitation-params params))
+    (assert (check-create-organization-invitation-params params))
     (assert (check-create-invitation-params params)))
 
   (let [email  (profile/clean-email email)
@@ -144,11 +157,11 @@
                 :code :email-domain-is-not-allowed
                 :hint "email domain is in the blacklist"))
 
-    ;; When nitrate is active and the team belongs to an org, check that
-    ;; the email is already an org member unless the org explicitly allows adding anybody.
-    (when (and (contains? cf/flags :nitrate)
+    ;; When nitrate is active and the team belongs to an organization, check that
+    ;; the email is already an organization member unless the organization explicitly allows adding anybody.
+    (when (and (contains? cf/flags :admin-console)
                (:organization team))
-      (assert-email-can-be-invited member org-member-ids))
+      (assert-email-can-be-invited member organization-member-ids))
 
 
     ;; When we have email verification disabled and invitation user is
@@ -164,9 +177,9 @@
                           (get types.team/permissions-for-role role))]
 
         (if organization
-          ;; Insert the invited member to the org
-          (when (contains? cf/flags :nitrate)
-            (teams/initialize-user-in-nitrate-org cfg (:id member) (:id organization) email))
+          ;; Insert the invited member to the organization
+          (when (contains? cf/flags :admin-console)
+            (teams/initialize-user-in-organization cfg (:id member) (:id organization) email))
           ;; Insert the invited member to the team
           (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true}))
 
@@ -184,57 +197,79 @@
         (teams/check-email-bounce conn email true)
         (teams/check-email-spam conn email true)
 
-        (let [id         (uuid/next)
-              expire     (if organization
-                           (ct/in-future "876000h")  ;; Organization invitations doesn't expire
-                           (ct/in-future "168h")) ;; 7 days
-              invitation (db/exec-one! conn (if organization
-                                              [sql:upsert-org-invitation id
-                                               (:id organization)
-                                               (str/lower email)
-                                               (:id profile)
-                                               (name role) expire
-                                               (name role) expire]
-                                              [sql:upsert-team-invitation id
-                                               (:id team)
-                                               (str/lower email)
-                                               (:id profile)
-                                               (name role) expire
-                                               (name role) expire]))
-              updated?   (not= id (:id invitation))
-              profile-id (:id profile)
-              tprops     {:profile-id profile-id
-                          :invitation-id (:id invitation)
-                          :valid-until expire
-                          :team-id (:id team)
-                          :organization-id (:id organization)
-                          :organization-name (:name organization)
-                          :member-email (:email-to invitation)
-                          :member-id (:id member)
-                          :role role}
-              itoken     (create-invitation-token cfg tprops)
-              ptoken     (create-profile-identity-token cfg profile-id)]
+        (let [id              (uuid/next)
+              expire          (if organization
+                                (ct/in-future "876000h")  ;; Organization invitations doesn't expire
+                                (ct/in-future "168h")) ;; 7 days
+              recent?         (recently-invited? cfg (:id team) (:id organization) email)
+              invitation      (db/exec-one! conn (if organization
+                                                   [sql:upsert-organization-invitation id
+                                                    (:id organization)
+                                                    (str/lower email)
+                                                    (:id profile)
+                                                    (name role) expire
+                                                    (name role) expire]
+                                                   [sql:upsert-team-invitation id
+                                                    (:id team)
+                                                    (str/lower email)
+                                                    (:id profile)
+                                                    (name role) expire
+                                                    (name role) expire]))
+              updated?        (not= id (:id invitation))
+              profile-id      (:id profile)
+              team-organization-id (get-in team [:organization :id])
+              tprops          {:profile-id profile-id
+                               :invitation-id (:id invitation)
+                               :valid-until expire
+                               :team-id (:id team)
+                               :organization-id (:id organization)
+                               :organization-name (:name organization)
+                               :member-email (:email-to invitation)
+                               :member-id (:id member)
+                               :role role}
+              audit-props
+              (cond-> {:invitation-id (:id invitation)
+                       :valid-until expire
+                       :team-id (:id team)
+                       :organization-id (:id organization)
+                       :organization-name (:name organization)
+                       :member-email (:email-to invitation)
+                       :member-id (:id member)
+                       :role role}
+                organization
+                (assoc :user-who-send-invitation (str profile-id))
+
+                (not organization)
+                (assoc :team-belongs-to-organization (boolean team-organization-id)
+                       :adds-invitee-to-organization (boolean team-organization-id)
+                       :invitee-already-organization-member
+                       (boolean
+                        (and team-organization-id
+                             member
+                             (contains? all-organization-member-ids (:id member))))))
+              itoken          (create-invitation-token cfg tprops)
+              ptoken          (create-profile-identity-token cfg profile-id)]
 
           (when (contains? cf/flags :log-invitation-tokens)
             (l/info :hint "invitation token" :token itoken))
 
-          (let [props  (-> (dissoc tprops :profile-id)
-                           (audit/clean-props))
+          (let [props  (audit/clean-props audit-props)
                 evname (cond
-                         (and updated? organization) "update-org-invitation"
+                         (and updated? organization) "update-organization-invitation"
                          updated? "update-team-invitation"
-                         organization "create-org-invitation"
+                         organization "create-organization-invitation"
                          :else "create-team-invitation")
                 event (-> (audit/event-from-rpc-params params)
                           (assoc :name evname)
                           (assoc :props props))]
             (audit/submit cfg event))
 
-          (when (allow-invitation-emails? member)
+          (when (and (allow-invitation-emails? member)
+                     (not recent?))
             (if organization
-              (when (contains? cf/flags :nitrate)
+              (when (contains? cf/flags :admin-console)
                 (eml/send! {::eml/conn conn
-                            ::eml/factory eml/invite-to-org
+                            ::eml/factory eml/invite-to-organization
                             :public-uri (cf/get :public-uri)
                             :to email
                             :invited-by (:fullname profile)
@@ -254,7 +289,7 @@
 
           itoken)))))
 
-(defn create-org-invitation
+(defn create-organization-invitation
   [cfg {:keys [::rpc/profile-id] :as params}]
   (let [profile  (db/get-by-id cfg :profile profile-id)]
     (create-invitation cfg
@@ -324,16 +359,21 @@
   - emails (set) + role (single role for all emails)
   - invitations (vector of {:email :role} maps)"
   [{:keys [::db/conn] :as cfg} {:keys [profile team role emails invitations] :as params}]
-  (let [;; Enrich team with org info once for all invitations when nitrate is active
-        team             (if (contains? cf/flags :nitrate)
-                           (nitrate/add-org-info-to-team cfg team {})
+  (let [;; Enrich team with organization info once for all invitations when nitrate is active
+        team             (if (contains? cf/flags :admin-console)
+                           (nitrate/add-organization-info-to-team cfg team {})
                            team)
-        org              (:organization team)
-        org-id           (:id org)
-        restricted?      (and org-id (not (nitrate-perms/allowed? :add-anybody-to-team {:org-perms org})))
-        org-member-ids   (when restricted?
-                           (into #{} (nitrate/call cfg :get-org-members {:organization-id org-id})))
-        params           (assoc params :team team :org-member-ids org-member-ids)
+        organization              (:organization team)
+        organization-id           (:id organization)
+        restricted?      (and organization-id (not (cto/allowed? :add-anybody-to-team {:organization-perms organization})))
+        all-organization-member-ids
+        (when organization-id
+          (into #{} (nitrate/call cfg :get-organization-members {:organization-id organization-id})))
+        organization-member-ids (when restricted? all-organization-member-ids)
+        params           (assoc params
+                                :team team
+                                :organization-member-ids organization-member-ids
+                                :all-organization-member-ids all-organization-member-ids)
 
         ;; Normalize input to a consistent format: [{:email :role}]
         invitation-data  (cond
diff --git a/backend/src/app/rpc/commands/verify_token.clj b/backend/src/app/rpc/commands/verify_token.clj
index ee15a63385..8db7afcd8b 100644
--- a/backend/src/app/rpc/commands/verify_token.clj
+++ b/backend/src/app/rpc/commands/verify_token.clj
@@ -87,7 +87,7 @@
 
 (defn- with-nitrate-licence
   [profile cfg]
-  (if (contains? cf/flags :nitrate)
+  (if (contains? cf/flags :admin-console)
     (nitrate/add-nitrate-licence-to-profile cfg profile)
     profile))
 
@@ -101,6 +101,17 @@
 
 ;; --- Team Invitation
 
+(def ^:private sql:get-organization-invitation
+  "SELECT *
+     FROM team_invitation
+    WHERE email_to = ?
+      AND org_id = ?")
+
+(def ^:private sql:delete-organization-invitation
+  "DELETE FROM team_invitation
+    WHERE email_to = ?
+      AND org_id = ?")
+
 (defn- accept-invitation
   [{:keys [::db/conn] :as cfg}
    {:keys [team-id organization-id role member-email] :as claims} invitation member]
@@ -124,9 +135,9 @@
                   (get types.team/permissions-for-role role))
 
           accepted-team-id (if organization-id
-                             ;; Insert the invited member to the org
-                             (when (contains? cf/flags :nitrate)
-                               (teams/initialize-user-in-nitrate-org cfg id-member organization-id member-email))
+                             ;; Insert the invited member to the organization
+                             (when (contains? cf/flags :admin-console)
+                               (teams/initialize-user-in-organization cfg id-member organization-id member-email))
                              ;; Insert the invited member to the team
                              (do (teams/add-profile-to-team! cfg params {::db/on-conflict-do-nothing? true})
                                  team-id))]
@@ -145,10 +156,11 @@
                     {:id id-member}))
 
       ;; Delete the invitation
-      (db/delete! conn :team-invitation
-                  (cond-> {:email-to member-email}
-                    team-id (assoc :team-id team-id)
-                    organization-id  (assoc :org-id organization-id)))
+      (if organization-id
+        (db/exec-one! conn [sql:delete-organization-invitation member-email organization-id])
+        (db/delete! conn :team-invitation
+                    {:email-to member-email
+                     :team-id team-id}))
 
       ;; Delete any request (only applicable for team invitations)
       (when team-id
@@ -184,16 +196,17 @@
               :code :invalid-invitation-token
               :hint "invitation token contains unexpected data"))
 
-  (let [invitation             (db/get* conn :team-invitation
-                                        (cond-> {:email-to member-email}
-                                          team-id (assoc :team-id team-id)
-                                          organization-id  (assoc :org-id organization-id)))
+  (let [invitation             (if organization-id
+                                 (db/exec-one! conn [sql:get-organization-invitation member-email organization-id])
+                                 (db/get* conn :team-invitation
+                                          {:email-to member-email
+                                           :team-id team-id}))
         profile                (db/get* conn :profile
                                         {:id profile-id}
                                         {:columns [:id :email :default-team-id]})
         registration-disabled? (not (contains? cf/flags :registration))
 
-        org-invitation?        (and (contains? cf/flags :nitrate) organization-id)]
+        organization-invitation?        (and (contains? cf/flags :admin-console) organization-id)]
 
     (if profile
       (do
@@ -215,58 +228,112 @@
         ;; existing invitation; querying it when the invitation is absent
         ;; would call nitrate needlessly and could mask the clean
         ;; :canceled-invitation/:invalid-token response with a generic error.
-        (let [membership (when org-invitation?
-                           (nitrate/call cfg :get-org-membership {:profile-id profile-id
-                                                                  :organization-id organization-id}))]
+        (let [membership
+              (when (contains? cf/flags :admin-console)
+                (cond
+                  organization-id
+                  (nitrate/call cfg :get-organization-membership {:profile-id profile-id
+                                                                  :organization-id organization-id})
+
+                  team-id
+                  (nitrate/call cfg :get-organization-membership-by-team {:profile-id profile-id
+                                                                          :team-id team-id})))
+
+              organization-id-on-add
+              (when (and (:organization-id membership)
+                         (not (:is-member membership)))
+                (:organization-id membership))
+
+              organization-add-source
+              (when organization-id-on-add
+                (if organization-id
+                  "direct-organization-invitation"
+                  "team-invitation"))
+
+              organization-event-origin
+              (when organization-id-on-add
+                (if organization-id
+                  "organization-invitation-acceptance"
+                  "team-invitation-acceptance"))
+
+              organization-member-count-before
+              (when organization-id-on-add
+                (count
+                 (nitrate/call cfg :get-organization-members
+                               {:organization-id organization-id-on-add})))]
 
           (when (:is-member membership)
-            (ex/raise :type :validation
-                      :code :already-an-org-member
-                      :team-id (:default-team-id membership)
-                      :hint "the user is already a member of the organization"))
+            (when organization-invitation?
+              (ex/raise :type :validation
+                        :code :already-an-organization-member
+                        :team-id (:default-team-id membership)
+                        :hint "the user is already a member of the organization")))
 
-          (when (and org-invitation? (not (:organization-id membership)))
+          (when (and organization-invitation? (not (:organization-id membership)))
             (ex/raise :type :validation
-                      :code :org-not-found
+                      :code :organization-not-found
                       :team-id (:default-team-id profile)
-                      :hint "the organization doesn't exist")))
+                      :hint "the organization doesn't exist"))
 
-        ;; if we have logged-in user and it matches the invitation we proceed
-        ;; with accepting the invitation and joining the current profile to the
-        ;; invited team.
-        (let [props {:team-id (:team-id claims)
-                     :role (:role claims)
-                     :invitation-id (:id invitation)}]
+          ;; if we have logged-in user and it matches the invitation we proceed
+          ;; with accepting the invitation and joining the current profile to the
+          ;; invited team.
+          (let [props {:team-id (:team-id claims)
+                       :role (:role claims)
+                       :invitation-id (:id invitation)}]
 
-          (audit/submit cfg
-                        (-> (audit/event-from-rpc-params params)
-                            (assoc :name "accept-team-invitation")
-                            (assoc :props props)))
+            (when team-id
+              (audit/submit cfg
+                            (-> (audit/event-from-rpc-params params)
+                                (assoc :name "accept-team-invitation")
+                                (assoc :props props)))
 
-          ;; NOTE: Backward compatibility; old invitations can
-          ;; have the `created-by` to be nil; so in this case we
-          ;; don't submit this event to the audit-log
-          (when-let [created-by (:created-by invitation)]
-            (audit/submit cfg
-                          (-> (audit/event-from-rpc-params params)
-                              (assoc :profile-id created-by)
-                              (assoc :name "accept-team-invitation-from")
-                              (assoc :props (assoc props
-                                                   :profile-id (:id profile)
-                                                   :email (:email profile))))))
+              ;; NOTE: Backward compatibility; old invitations can
+              ;; have the `created-by` to be nil; so in this case we
+              ;; don't submit this event to the audit-log
+              (when-let [created-by (:created-by invitation)]
+                (audit/submit cfg
+                              (-> (audit/event-from-rpc-params params)
+                                  (assoc :profile-id created-by)
+                                  (assoc :name "accept-team-invitation-from")
+                                  (assoc :props (assoc props
+                                                       :profile-id (:id profile)
+                                                       :email (:email profile)))))))
 
-          (let [accepted-team-id (accept-invitation cfg claims invitation profile)]
-            (cond-> (assoc claims :state :created)
-              ;; when the invitation is to an org, instead of a team, add the
-              ;; accepted-team-id as :org-team-id
-              (:organization-id claims)
-              (assoc :org-team-id accepted-team-id)))))
+            (let [accepted-team-id (accept-invitation cfg claims invitation profile)]
+              (when organization-id-on-add
+                (audit/submit
+                 cfg
+                 (-> (audit/event-from-rpc-params params)
+                     (assoc :name "accept-organization-invitation")
+                     (assoc :props
+                            (-> props
+                                (assoc :organization-id organization-id-on-add)
+                                (audit/clean-props))))))
+
+              (cond-> (assoc claims :state :created)
+                ;; when the invitation is to an organization, instead of a team, add the
+                ;; accepted-team-id as :organization-team-id
+                (:organization-id claims)
+                (assoc :organization-team-id accepted-team-id)
+
+                organization-id-on-add
+                (assoc :organization-invitation-audit
+                       {:origin organization-event-origin
+                        :props
+                        (-> props
+                            (assoc :organization-id organization-id-on-add
+                                   :organization-member-add-source organization-add-source
+                                   :belongs-to-team-on-add (boolean team-id)
+                                   :organization-member-count-before
+                                   organization-member-count-before)
+                            (audit/clean-props))}))))))
 
       (do
         ;; If the user is not logged-in and the invitation has been canceled
         ;; we return a specific error code so the frontend can redirect to
         ;; login with an appropriate message instead of showing the error page.
-        ;; This only applies to org invitations; team invitations keep the
+        ;; This only applies to organization invitations; team invitations keep the
         ;; existing :invalid-token behavior.
         (when (nil? invitation)
           (ex/raise :type :validation
@@ -289,4 +356,3 @@
   [_ _ _]
   (ex/raise :type :validation
             :code :invalid-token))
-
diff --git a/backend/src/app/rpc/commands/webhooks.clj b/backend/src/app/rpc/commands/webhooks.clj
index 33341bb34e..85051e8ad7 100644
--- a/backend/src/app/rpc/commands/webhooks.clj
+++ b/backend/src/app/rpc/commands/webhooks.clj
@@ -23,11 +23,9 @@
    [cuerdas.core :as str]))
 
 (defn get-webhooks-permissions
-  [conn profile-id team-id creator-id]
+  [conn profile-id team-id]
   (let [permissions (t/get-permissions conn profile-id team-id)
-
-        can-edit (boolean (or (:can-edit permissions)
-                              (= profile-id creator-id)))]
+        can-edit (boolean (:can-edit permissions))]
     (assoc permissions :can-edit can-edit)))
 
 (def has-webhook-edit-permissions?
@@ -120,7 +118,7 @@
   {::doc/added "1.17"
    ::sm/params schema:create-webhook}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id team-id] :as params}]
-  (check-webhook-edition-permissions! pool profile-id team-id profile-id)
+  (t/check-edition-permissions! pool profile-id team-id)
   (validate-quotes! cfg params)
   (validate-webhook! cfg nil params)
   (insert-webhook! cfg params))
@@ -137,7 +135,7 @@
    ::sm/params schema:update-webhook}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id] :as params}]
   (let [whook (-> (db/get pool :webhook {:id id}) (decode-row))]
-    (check-webhook-edition-permissions! pool profile-id (:team-id whook) (:profile-id whook))
+    (check-webhook-edition-permissions! pool profile-id (:team-id whook))
     (validate-webhook! cfg whook params)
     (update-webhook! cfg whook params)))
 
@@ -151,7 +149,7 @@
    ::db/transaction true}
   [{:keys [::db/conn]} {:keys [::rpc/profile-id id]}]
   (let [whook (-> (db/get conn :webhook {:id id}) decode-row)]
-    (check-webhook-edition-permissions! conn profile-id (:team-id whook) (:profile-id whook))
+    (check-webhook-edition-permissions! conn profile-id (:team-id whook))
     (db/delete! conn :webhook {:id id})
     nil))
 
diff --git a/backend/src/app/rpc/management/exporter.clj b/backend/src/app/rpc/management/exporter.clj
index 20e791e7d0..aac508669d 100644
--- a/backend/src/app/rpc/management/exporter.clj
+++ b/backend/src/app/rpc/management/exporter.clj
@@ -10,7 +10,7 @@
    [app.common.time :as ct]
    [app.common.uri :as u]
    [app.config :as cf]
-   [app.media :refer [schema:upload]]
+   [app.media.validation :refer [schema:upload]]
    [app.rpc :as-alias rpc]
    [app.rpc.doc :as doc]
    [app.storage :as sto]
diff --git a/backend/src/app/rpc/management/nitrate.clj b/backend/src/app/rpc/management/nitrate.clj
index c6178cda54..a87dd74ccb 100644
--- a/backend/src/app/rpc/management/nitrate.clj
+++ b/backend/src/app/rpc/management/nitrate.clj
@@ -14,15 +14,17 @@
    [app.common.exceptions :as ex]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.organization :refer [schema:team-with-organization schema:organization-with-avatar schema:nitrate-sso]]
+   [app.common.types.organization :as cto]
    [app.common.types.profile :refer [schema:profile, schema:basic-profile]]
    [app.common.types.team :refer [schema:team]]
+   [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
    [app.email :as eml]
+   [app.http :as-alias http]
    [app.http.session :as session]
    [app.loggers.audit :as audit]
-   [app.media :as media]
+   [app.media.validation :as media.v]
    [app.nitrate :as nitrate]
    [app.rpc :as rpc]
    [app.rpc.commands.auth :as auth]
@@ -45,6 +47,7 @@
   {:id            (:id profile)
    :name          (:fullname profile)
    :email         (:email profile)
+   :created-at    (:created-at profile)
    :photo-url     (files/resolve-public-uri (get profile :photo-id))})
 
 ;; ---- API: authenticate
@@ -116,7 +119,7 @@
 
 (def ^:private schema:upload-organization-logo
   [:map
-   [:content media/schema:upload]
+   [:content media.v/schema:upload]
    [:organization-id ::sm/uuid]
    [:previous-id {:optional true} ::sm/uuid]])
 
@@ -149,7 +152,7 @@
 (sv/defmethod ::notify-team-change
   "Notify to Penpot a team change from nitrate"
   {::doc/added "2.14"
-   ::sm/params schema:team-with-organization
+   ::sm/params cto/schema:team-with-organization
    ::rpc/auth false}
   [cfg team]
   (notifications/notify-team-change cfg (select-keys team [:id :is-your-penpot :organization]) nil)
@@ -164,12 +167,12 @@
    [:role ::sm/text]])
 
 (sv/defmethod ::notify-user-added-to-organization
-  "Notify to Penpot that an user has joined an org from nitrate"
+  "Notify to Penpot that an user has joined an organization from nitrate"
   {::doc/added "2.14"
    ::sm/params schema:notify-user-added-to-organization
    ::rpc/auth false}
   [cfg {:keys [profile-id organization-id]}]
-  (db/tx-run! cfg teams/create-default-org-team profile-id organization-id))
+  (db/tx-run! cfg teams/create-default-organization-team profile-id organization-id))
 
 
 ;; ---- API: get-managed-profiles
@@ -311,7 +314,7 @@ RETURNING id, deleted_at;")
   nil)
 
 (defn manage-deleted-organization-teams
-  "For a deleted organization, preserve org teams unchanged and only prefix or
+  "For a deleted organization, preserve organization teams unchanged and only prefix or
   delete member Your Penpot teams depending on whether they still contain files."
   [cfg {:keys [organization-id organization-name teams]}]
   (let [all-team-ids (->> teams
@@ -326,7 +329,7 @@ RETURNING id, deleted_at;")
                                   distinct
                                   (into []))]
     (when (seq all-team-ids)
-      (let [org-prefix (str "[" (d/sanitize-string organization-name) "] ")]
+      (let [organization-prefix (str "[" (d/sanitize-string organization-name) "] ")]
         (db/tx-run!
          cfg
          (fn [{:keys [::db/conn] :as cfg}]
@@ -340,11 +343,11 @@ RETURNING id, deleted_at;")
                  teams-to-prefix  (->> your-penpot-team-ids (filter teams-with-files) (into []))
                  teams-to-delete  (->> your-penpot-team-ids (remove teams-with-files) (into []))]
 
-             ;; Org teams move to the fallback org unchanged. Only imported
-             ;; Your Penpot teams keep the org prefix when they still have files.
+             ;; Organization teams move to the fallback organization unchanged. Only imported
+             ;; Your Penpot teams keep the organization prefix when they still have files.
              (when (seq teams-to-prefix)
                (db/exec! conn [sql:prefix-teams-name-and-unset-default
-                               org-prefix
+                               organization-prefix
                                (db/create-array conn "uuid" teams-to-prefix)]))
 
              ;; Empty imported Your Penpot teams disappear entirely.
@@ -355,16 +358,16 @@ RETURNING id, deleted_at;")
 
 
 (sv/defmethod ::notify-organization-deletion
-  "For a deleted organization, preserve org teams and only prefix or delete
+  "For a deleted organization, preserve organization teams and only prefix or delete
    imported Your Penpot teams before notifying connected users."
   {::doc/added "2.15"
    ::sm/params schema:notify-organization-deletion
    ::rpc/auth false}
   [cfg {:keys [organization-id]}]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        teams       (:teams org-summary)]
-    (manage-deleted-organization-teams cfg {:organization-name (:name org-summary)
-                                            :organization-id (:id org-summary)
+  (let [organization-summary (nitrate/call cfg :get-organization-summary {:organization-id organization-id})
+        teams       (:teams organization-summary)]
+    (manage-deleted-organization-teams cfg {:organization-name (:name organization-summary)
+                                            :organization-id (:id organization-summary)
                                             :teams teams})
     nil))
 
@@ -375,18 +378,18 @@ RETURNING id, deleted_at;")
    [:profile-id ::sm/uuid]])
 
 (sv/defmethod ::notify-user-organizations-deletion
-  "For a given user, find all owned organizations and apply the deleted-org
+  "For a given user, find all owned organizations and apply the deleted-organization
    transfer rules to their imported Your Penpot teams."
   {::doc/added "2.18"
    ::sm/params schema:notify-user-organizations-deletion
    ::nitrate/sso false}
   [cfg {:keys [profile-id]}]
-  (let [owned-orgs (nitrate/call cfg :get-owned-orgs {:profile-id profile-id})]
-    (doseq [org owned-orgs]
-      (let [organization-name (:name org)
-            teams             (:teams org)]
+  (let [owned-organizations (nitrate/call cfg :get-owned-organizations {:profile-id profile-id})]
+    (doseq [organization owned-organizations]
+      (let [organization-name (:name organization)
+            teams             (:teams organization)]
         (manage-deleted-organization-teams cfg {:organization-name organization-name
-                                                :organization-id (:id org)
+                                                :organization-id (:id organization)
                                                 :teams teams}))))
   nil)
 
@@ -490,10 +493,10 @@ RETURNING id, deleted_at;")
   {::doc/added "2.15"
    ::sm/params [:map
                 [:email ::sm/email]
-                [:organization schema:organization-with-avatar]]
+                [:organization cto/schema:organization-with-avatar]]
    ::nitrate/sso false}
   [cfg params]
-  (db/tx-run! cfg ti/create-org-invitation params)
+  (db/tx-run! cfg ti/create-organization-invitation params)
   nil)
 
 
@@ -521,9 +524,9 @@ RETURNING id, deleted_at;")
    ::sm/result schema:get-organization-invitations-result
    ::nitrate/sso false}
   [cfg {:keys [organization-id]}]
-  (let [team-ids (noh/get-org-team-ids cfg organization-id)]
+  (let [team-ids (noh/get-organization-team-ids cfg organization-id)]
     (db/run! cfg (fn [{:keys [::db/conn]}]
-                   (->> (noh/get-org-invitations conn organization-id team-ids)
+                   (->> (noh/get-organization-invitations conn organization-id team-ids)
                         (mapv (fn [{:keys [photo-id] :as invitation}]
                                 (cond-> (dissoc invitation :photo-id)
                                   photo-id
@@ -543,13 +546,13 @@ RETURNING id, deleted_at;")
    [:email ::sm/email]])
 
 (sv/defmethod ::delete-organization-invitations
-  "Delete all invitations for one email in an organization scope (org + org teams)."
+  "Delete all invitations for one email in an organization scope (organization + organization teams)."
   {::doc/added "2.16"
    ::sm/params schema:delete-organization-invitations-params
    ::nitrate/sso false}
   [cfg {:keys [organization-id email]}]
   (let [clean-email (profile/clean-email email)
-        team-ids    (noh/get-org-team-ids cfg organization-id)]
+        team-ids    (noh/get-organization-team-ids cfg organization-id)]
     (db/run! cfg (fn [{:keys [::db/conn]}]
                    (let [ids-array (db/create-array conn "uuid" team-ids)]
                      (db/exec! conn [sql:delete-organization-invitations clean-email organization-id ids-array]))))
@@ -568,14 +571,14 @@ RETURNING id, deleted_at;")
    [:organization-id ::sm/uuid]])
 
 (sv/defmethod ::delete-all-organization-invitations
-  "Delete every pending invitation associated with an organization (org-level + team-level).
+  "Delete every pending invitation associated with an organization (organization-level + team-level).
    Called from Nitrate when an organization is about to be deleted, so users that click
    their invitation token hit the existing invalid-token landing page."
   {::doc/added "2.18"
    ::sm/params schema:delete-all-organization-invitations-params
    ::rpc/auth false}
   [cfg {:keys [organization-id]}]
-  (let [team-ids (noh/get-org-team-ids cfg organization-id)]
+  (let [team-ids (noh/get-organization-team-ids cfg organization-id)]
     (db/run! cfg (fn [{:keys [::db/conn]}]
                    (let [ids-array (db/create-array conn "uuid" team-ids)]
                      (db/exec! conn [sql:delete-all-organization-invitations organization-id ids-array]))))
@@ -617,8 +620,12 @@ RETURNING id, deleted_at;")
                 [:default-team-id ::sm/uuid]]
    ::db/transaction true
    ::nitrate/sso false}
-  [cfg {:keys [profile-id organization-id organization-name default-team-id] :as params}]
-  (let [{:keys [valid-teams-to-delete-ids
+  [cfg {actor-profile-id ::rpc/profile-id
+        :keys [profile-id organization-id organization-name default-team-id]
+        :as params}]
+  (let [actor-profile-id (when-not (= actor-profile-id uuid/zero)
+                           actor-profile-id)
+        {:keys [valid-teams-to-delete-ids
                 valid-teams-to-transfer
                 valid-teams-to-exit]} (cnit/get-valid-teams cfg organization-id profile-id default-team-id)
         add-reassign-to (partial add-reassign-to cfg profile-id)
@@ -626,13 +633,16 @@ RETURNING id, deleted_at;")
         valid-teams-to-leave (into valid-teams-to-exit
                                    (map add-reassign-to valid-teams-to-transfer))]
 
-    (cnit/leave-org cfg (assoc params
-                               :id organization-id
-                               :name organization-name
-                               :teams-to-delete valid-teams-to-delete-ids
-                               :teams-to-leave valid-teams-to-leave
-                               :skip-validation true))
-    (notifications/notify-user-org-change cfg profile-id organization-id organization-name "dashboard.user-no-longer-belong-org")
+    (cnit/leave-organization cfg (assoc params
+                                        :id organization-id
+                                        :name organization-name
+                                        :teams-to-delete valid-teams-to-delete-ids
+                                        :teams-to-leave valid-teams-to-leave
+                                        :skip-validation true
+                                        :user-who-delete-member actor-profile-id
+                                        :deleted-by-role (when actor-profile-id
+                                                           "organization-owner")))
+    (notifications/notify-user-organization-change cfg profile-id organization-id organization-name "dashboard.user-no-longer-belong-organization")
     nil))
 
 ;; API: get-remove-from-organization-summary
@@ -663,11 +673,11 @@ RETURNING id, deleted_at;")
     (when-not valid-default-team
       (ex/raise :type :validation
                 :code :not-valid-teams))
-    (cnit/get-leave-org-summary cfg
-                                default-team-id
-                                valid-teams-to-delete-ids
-                                (count valid-teams-to-transfer)
-                                (count valid-teams-to-exit))))
+    (cnit/get-leave-organization-summary cfg
+                                         default-team-id
+                                         valid-teams-to-delete-ids
+                                         (count valid-teams-to-transfer)
+                                         (count valid-teams-to-exit))))
 
 ;; API: send-renewal-email
 
@@ -678,7 +688,7 @@ RETURNING id, deleted_at;")
    [:user-name [:maybe ::sm/text]]
    [:renewal-date :string]
    [:estimated-amount :double]
-   [:organizations [:vector schema:organization-with-avatar]]])
+   [:organizations [:vector cto/schema:organization-with-avatar]]])
 
 (sv/defmethod ::send-renewal-email
   "Send an Enterprise subscription renewal notice email to a user."
@@ -710,7 +720,7 @@ RETURNING id, deleted_at;")
     WHERE id = ANY(?)
       AND deleted_at IS NULL")
 
-(def ^:private sql:exists-non-member-org-team-invitations
+(def ^:private sql:exists-non-member-organization-team-invitations
   "SELECT EXISTS (
             SELECT 1
               FROM team_invitation
@@ -718,13 +728,13 @@ RETURNING id, deleted_at;")
                AND email_to <> ALL(?)
          ) AS non_member")
 
-(def ^:private sql:delete-non-member-org-team-invitations
+(def ^:private sql:delete-non-member-organization-team-invitations
   "DELETE FROM team_invitation
     WHERE team_id = ANY(?)
       AND email_to <> ALL(?)
    RETURNING email_to")
 
-(def ^:private schema:org-team-invitations-for-non-members-params
+(def ^:private schema:organization-team-invitations-for-non-members-params
   [:map
    [:team-ids [:vector ::sm/uuid]]
    [:member-ids [:vector ::sm/uuid]]])
@@ -732,8 +742,8 @@ RETURNING id, deleted_at;")
 (def ^:private schema:exists-organization-team-invitations-for-non-members-result
   [:map [:exists ::sm/boolean]])
 
-(defn- org-team-invitations-for-non-members-arrays
-  "Member emails and PG arrays used by exists/delete org team invitation endpoints."
+(defn- organization-team-invitations-for-non-members-arrays
+  "Member emails and PG arrays used by exists/delete organization team invitation endpoints."
   [conn {:keys [team-ids member-ids]}]
   (let [member-ids-array (db/create-array conn "uuid" member-ids)
         member-emails    (->> (db/exec! conn [sql:get-profile-emails-by-ids member-ids-array])
@@ -742,11 +752,11 @@ RETURNING id, deleted_at;")
     {:emails-array (db/create-array conn "text" (vec member-emails))
      :teams-array  (db/create-array conn "uuid" team-ids)}))
 
-(defn- non-member-org-team-invitations-exist?
+(defn- non-member-organization-team-invitations-exist?
   [conn params]
   (let [{:keys [emails-array teams-array]}
-        (org-team-invitations-for-non-members-arrays conn params)]
-    (-> (db/exec-one! conn [sql:exists-non-member-org-team-invitations
+        (organization-team-invitations-for-non-members-arrays conn params)]
+    (-> (db/exec-one! conn [sql:exists-non-member-organization-team-invitations
                             teams-array
                             emails-array])
         :non-member)))
@@ -754,24 +764,24 @@ RETURNING id, deleted_at;")
 (sv/defmethod ::exists-organization-team-invitations-for-non-members
   "Return if there are any team invitations for emails that are not organization members."
   {::doc/added "2.18"
-   ::sm/params schema:org-team-invitations-for-non-members-params
+   ::sm/params schema:organization-team-invitations-for-non-members-params
    ::sm/result schema:exists-organization-team-invitations-for-non-members-result
    ::nitrate/sso false}
   [cfg params]
   (db/run! cfg (fn [{:keys [::db/conn]}]
-                 {:exists (boolean (non-member-org-team-invitations-exist? conn params))})))
+                 {:exists (boolean (non-member-organization-team-invitations-exist? conn params))})))
 
 (sv/defmethod ::delete-organization-team-invitations-for-non-members
   "Delete team invitations for emails that are not organization members."
   {::doc/added "2.18"
-   ::sm/params schema:org-team-invitations-for-non-members-params
+   ::sm/params schema:organization-team-invitations-for-non-members-params
    ::db/transaction true
    ::nitrate/sso false}
   [cfg params]
   (db/run! cfg (fn [{:keys [::db/conn]}]
                  (let [{:keys [emails-array teams-array]}
-                       (org-team-invitations-for-non-members-arrays conn params)]
-                   (db/exec! conn [sql:delete-non-member-org-team-invitations
+                       (organization-team-invitations-for-non-members-arrays conn params)]
+                   (db/exec! conn [sql:delete-non-member-organization-team-invitations
                                    teams-array
                                    emails-array])
                    nil))))
@@ -782,38 +792,42 @@ RETURNING id, deleted_at;")
   [:map {:title "NitrateAuditEvent"}
    [:name [:and [:string {:max 250}]
            [:re #"[\d\w-]{1,50}"]]]
+   [:type {:optional true} ::sm/text]
    [:profile-id ::sm/uuid]
-   [:props {:optional true} [:map-of :keyword :any]]])
+   [:props {:optional true} [:map-of :keyword :any]]
+   [:context {:optional true} [:map-of :keyword :any]]])
 
 (def ^:private schema:push-audit-events-params
   [:map {:title "PushAuditEventsParams"}
    [:events [:vector schema:nitrate-audit-event]]])
 
-(defn- submit-nitrate-audit-event
-  [cfg {:keys [name profile-id props]}]
-  (let [now (ct/now)]
-    (audit/submit* cfg {:type "action"
-                        :name name
-                        :profile-id profile-id
-                        :props (or props {})
-                        :context {}
-                        :tracked-at now
-                        :created-at now
-                        :source "nitrate"
-                        :ip-addr "0.0.0.0"})))
-
 (sv/defmethod ::push-audit-events
-  "Push audit events from Nitrate to Penpot audit log"
+  "Push audit events from nitrate (strictly for nitrate backend
+  events)"
+
   {::doc/added "2.19"
+   ::audit/skip true
    ::sm/params schema:push-audit-events-params
    ::rpc/auth false}
-  [{:keys [::db/pool] :as cfg} {:keys [events]}]
-  (let [telemetry? (contains? cf/flags :telemetry)
-        audit-log? (contains? cf/flags :audit-log)
-        enabled?   (and (not (db/read-only? pool))
-                        (or audit-log? telemetry?))]
-    (when (and enabled? (seq events))
-      (run! (partial submit-nitrate-audit-event cfg) events))
+  [cfg {:keys [::rpc/request-at events] :as params}]
+  (let [request  (-> params meta ::http/request)
+        context' (-> (audit/prepare-context-from-request request)
+                     (assoc :request-id (::rpc/request-id params)))
+
+        ip-addr  (::rpc/ip-addr params)]
+
+    (run! (fn [{:keys [type name profile-id props context] :as event}]
+            (let [context (-> (merge context (d/without-nils context'))
+                              (d/without-nils))]
+              (audit/submit cfg {:type (d/nilv type "action")
+                                 :name name
+                                 :profile-id profile-id
+                                 :props (or props {})
+                                 :context context
+                                 :tracked-at request-at
+                                 :ip-addr ip-addr})))
+          events)
+
     nil))
 
 
@@ -839,6 +853,15 @@ RETURNING id, deleted_at;")
              WHERE p.team_id = t.id
                AND p.deleted_at IS NULL
                AND f.deleted_at IS NULL
+            UNION ALL
+            SELECT tpr2.created_at
+              FROM team_profile_rel AS tpr2
+             WHERE tpr2.team_id = t.id
+               AND tpr2.is_owner IS NOT TRUE
+            UNION ALL
+            SELECT ti.updated_at
+              FROM team_invitation AS ti
+             WHERE ti.team_id = t.id
           ) AS activity) AS last_activity_at,
      owner_tpr.profile_id AS owner_profile_id,
      owner_p.fullname AS owner_name,
@@ -894,8 +917,8 @@ RETURNING id, deleted_at;")
    ::sm/result schema:get-teams-detail-result
    ::nitrate/sso false}
   [cfg {:keys [organization-id]}]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})
-        team-ids    (into [] (comp d/xf:map-id (filter uuid?)) (:teams org-summary))]
+  (let [organization-summary (nitrate/call cfg :get-organization-summary {:organization-id organization-id})
+        team-ids    (into [] (comp d/xf:map-id (filter uuid?)) (:teams organization-summary))]
     (if (empty? team-ids)
       []
       (db/run! cfg
@@ -918,7 +941,7 @@ RETURNING id, deleted_at;")
   Nitrate calls this while configuring SSO to verify client credentials and OIDC
   discovery before saving the settings."
   {::doc/added "2.20"
-   ::sm/params schema:nitrate-sso
+   ::sm/params cto/schema:nitrate-sso
    ::sm/result schema:check-organization-sso-result
    ::rpc/auth false}
   [cfg params]
@@ -931,14 +954,14 @@ RETURNING id, deleted_at;")
    ::sm/params [:map
                 [:organization-id ::sm/uuid]
                 [:updated-props ::sm/boolean]
-                [:became-active ::sm/boolean]]
+                [:announce-activation ::sm/boolean]]
    ::rpc/auth false}
-  [{:keys [::db/pool] :as cfg} {:keys [organization-id updated-props became-active]}]
+  [{:keys [::db/pool] :as cfg} {:keys [organization-id updated-props announce-activation]}]
   (when updated-props
-    (rpc/invalidate-org-sso-cache-by-org! organization-id)
-    (session/clear-org-sso-sessions! pool organization-id))
+    (rpc/invalidate-organization-sso-cache-by-organization! organization-id)
+    (session/clear-organization-sso-sessions! pool organization-id))
   (notifications/notify-organization-change-sso cfg organization-id)
-  (when became-active
+  (when announce-activation
     (neh/send-organization-setup-sso-emails! cfg organization-id))
   nil)
 
@@ -974,12 +997,19 @@ RETURNING id, deleted_at;")
    created users skip email verification and onboarding. Emails that already
    belong to an existing profile are skipped. Intended for the Nitrate admin
    bulk-creation screen; access is gated by the shared key and, in Nitrate, an
-   email allow-list."
+   email allow-list. Requires the `admin-console-bulk-create-profiles` flag, disabled
+   by default so it is only available on test environments."
   {::doc/added "2.19"
    ::sm/params schema:bulk-create-profiles-params
    ::sm/result schema:bulk-create-profiles-result
    ::rpc/auth false}
   [cfg {:keys [password emails]}]
+
+  (when-not (contains? cf/flags :admin-console-bulk-create-profiles)
+    (ex/raise :type :restriction
+              :code :bulk-create-profiles-not-allowed
+              :hint "Bulk profile creation is disabled by config."))
+
   (let [derived (aauth/derive-password password)]
     (db/tx-run!
      cfg
diff --git a/backend/src/app/rpc/nitrate/emails_helper.clj b/backend/src/app/rpc/nitrate/emails_helper.clj
index 73fab3f6ba..73d72c178c 100644
--- a/backend/src/app/rpc/nitrate/emails_helper.clj
+++ b/backend/src/app/rpc/nitrate/emails_helper.clj
@@ -23,21 +23,21 @@
       AND deleted_at IS NULL")
 
 (def ^:private sql:get-profiles-by-emails
-  "SELECT id, email, fullname, is_muted
+  "SELECT id, email, is_muted
      FROM profile
     WHERE email = ANY(?)
       AND deleted_at IS NULL")
 
-(defn- org-sso-active?
+(defn- organization-sso-active?
   "Return whether SSO is enabled for the organization."
   [cfg organization-id]
-  (when (contains? cf/flags :nitrate)
-    (true? (:active (nitrate/call cfg :get-org-sso {:organization-id organization-id})))))
+  (when (contains? cf/flags :admin-console)
+    (true? (:active (nitrate/call cfg :get-organization-sso {:organization-id organization-id})))))
 
 (def ^:private xf:map-email (map :email))
 
 (defn- recipients-by-emails
-  "Build `{:email :user-name :profile}` maps for a deduplicated email list."
+  "Build `{:email :profile}` maps for a deduplicated email list."
   [conn emails]
   (let [profiles (if (seq emails)
                    (let [emails-array (db/create-array conn "text" emails)]
@@ -47,60 +47,58 @@
     (map (fn [email]
            (let [profile (get profile-by-email (str/lower email))]
              {:email email
-              :user-name (:fullname profile)
               :profile profile}))
          emails)))
 
 (defn- send-organization-setup-sso-email!
   "Send the organization SSO setup email to a single recipient, when allowed."
-  [conn organization-name {:keys [email user-name profile]}]
+  [conn organization-name {:keys [email profile]}]
   (when (or (nil? profile)
             (eml/allow-send-emails? conn profile))
     (eml/send! {::eml/conn conn
                 ::eml/factory eml/organization-setup-sso
                 :public-uri (cf/get :public-uri)
                 :to email
-                :user-name user-name
                 :organization-name organization-name})))
 
-(defn- get-org-sso-notify-recipients
-  "Unique org members and pending org/team invitees for SSO activation emails."
-  [conn cfg organization-id org-summary]
-  (let [member-ids    (nitrate/call cfg :get-org-members {:organization-id organization-id})
-        team-ids      (neh/get-org-team-ids org-summary)
+(defn- get-organization-sso-notify-recipients
+  "Unique organization members and pending organization/team invitees for SSO activation emails."
+  [conn cfg organization-id organization-summary]
+  (let [member-ids    (nitrate/call cfg :get-organization-members {:organization-id organization-id})
+        team-ids      (neh/get-organization-team-ids organization-summary)
         member-emails (if (seq member-ids)
                         (let [ids-array (db/create-array conn "uuid" member-ids)]
                           (into #{} (map :email (db/exec! conn [sql:get-profile-emails-by-ids ids-array]))))
                         #{})
         invite-emails (into #{} (map :email
-                                     (neh/get-org-invitations conn organization-id team-ids)))
+                                     (neh/get-organization-invitations conn organization-id team-ids)))
         emails        (into #{} (concat member-emails invite-emails))]
     (recipients-by-emails conn emails)))
 
 (defn- get-team-sso-notify-recipients
-  "Team members who are not in `org-member-ids`, plus pending team invitations."
-  [conn team-id org-member-ids]
+  "Team members who are not in `organization-member-ids`, plus pending team invitations."
+  [conn team-id organization-member-ids]
   (let [team-members (->> (teams/get-team-members conn team-id)
-                          (remove #(contains? org-member-ids (:id %))))
+                          (remove #(contains? organization-member-ids (:id %))))
         invitations  (neh/get-team-invitation-emails conn team-id)]
     (->> (sequence xf:map-email (concat team-members invitations))
          (recipients-by-emails conn))))
 
 (defn send-organization-setup-sso-emails!
-  "Notify all org members and pending org/team invitees that SSO is active."
+  "Notify all organization members and pending organization/team invitees that SSO is active."
   [cfg organization-id]
-  (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})]
+  (let [organization-summary (nitrate/call cfg :get-organization-summary {:organization-id organization-id})]
     (db/tx-run! cfg
                 (fn [{:keys [::db/conn]}]
-                  (doseq [recipient (get-org-sso-notify-recipients conn cfg organization-id org-summary)]
-                    (send-organization-setup-sso-email! conn (:name org-summary) recipient))))))
+                  (doseq [recipient (get-organization-sso-notify-recipients conn cfg organization-id organization-summary)]
+                    (send-organization-setup-sso-email! conn (:name organization-summary) recipient))))))
 
 (defn send-organization-setup-sso-emails-for-team!
-  "Notify team members who are not in `org-member-ids-before` and pending team invitees."
-  [cfg organization-id team-id org-member-ids-before]
-  (when (org-sso-active? cfg organization-id)
-    (let [org-summary (nitrate/call cfg :get-org-summary {:organization-id organization-id})]
+  "Notify team members who are not in `organization-member-ids-before` and pending team invitees."
+  [cfg organization-id team-id organization-member-ids-before]
+  (when (organization-sso-active? cfg organization-id)
+    (let [organization-summary (nitrate/call cfg :get-organization-summary {:organization-id organization-id})]
       (db/tx-run! cfg
                   (fn [{:keys [::db/conn]}]
-                    (doseq [recipient (get-team-sso-notify-recipients conn team-id org-member-ids-before)]
-                      (send-organization-setup-sso-email! conn (:name org-summary) recipient)))))))
+                    (doseq [recipient (get-team-sso-notify-recipients conn team-id organization-member-ids-before)]
+                      (send-organization-setup-sso-email! conn (:name organization-summary) recipient)))))))
diff --git a/backend/src/app/rpc/nitrate/organization_helper.clj b/backend/src/app/rpc/nitrate/organization_helper.clj
index 8627a4d10d..ed5d918e8b 100644
--- a/backend/src/app/rpc/nitrate/organization_helper.clj
+++ b/backend/src/app/rpc/nitrate/organization_helper.clj
@@ -10,7 +10,7 @@
    [app.db :as db]
    [app.nitrate :as nitrate]))
 
-(def ^:private sql:get-org-invitations
+(def ^:private sql:get-organization-invitations
   "SELECT DISTINCT ON (email_to)
           ti.id,
           ti.org_id AS organization_id,
@@ -35,24 +35,24 @@ LEFT JOIN profile AS p
       AND ti.valid_until >= now()
     ORDER BY ti.email_to, ti.valid_until DESC, ti.created_at DESC;")
 
-(defn get-org-team-ids
+(defn get-organization-team-ids
   "Return team ids for an organization.
 
-  Accepts either `cfg` and `organization-id` (fetches the org summary from
-  Nitrate) or an already-resolved org summary map."
+  Accepts either `cfg` and `organization-id` (fetches the organization summary from
+  Nitrate) or an already-resolved organization summary map."
   ([cfg organization-id]
-   (get-org-team-ids (nitrate/call cfg :get-org-summary {:organization-id organization-id})))
-  ([org-summary]
-   (->> (:teams org-summary)
+   (get-organization-team-ids (nitrate/call cfg :get-organization-summary {:organization-id organization-id})))
+  ([organization-summary]
+   (->> (:teams organization-summary)
         (map :id)
         (filter uuid?)
         (vec))))
 
-(defn get-org-invitations
-  "Fetch valid org-level and team-level invitations for an organization."
+(defn get-organization-invitations
+  "Fetch valid organization-level and team-level invitations for an organization."
   [conn organization-id team-ids]
   (let [ids-array (db/create-array conn "uuid" team-ids)]
-    (db/exec! conn [sql:get-org-invitations organization-id ids-array])))
+    (db/exec! conn [sql:get-organization-invitations organization-id ids-array])))
 
 (defn get-team-invitation-emails
   "Return distinct valid team invitation recipient emails."
diff --git a/backend/src/app/rpc/notifications.clj b/backend/src/app/rpc/notifications.clj
index d2410092aa..ec3d7c89d9 100644
--- a/backend/src/app/rpc/notifications.clj
+++ b/backend/src/app/rpc/notifications.clj
@@ -16,17 +16,17 @@
                ;;TODO There is a bug on dashboard with teams notifications.
                ;;For now we send it to uuid/zero instead of team-id
                :topic uuid/zero
-               :message {:type :team-org-change
+               :message {:type :team-organization-change
                          :team team
                          :notification notification})))
 
 
-(defn notify-user-org-change
+(defn notify-user-organization-change
   [cfg profile-id organization-id organization-name notification]
   (let [msgbus (::mbus/msgbus cfg)]
     (mbus/pub! msgbus
                :topic profile-id
-               :message {:type :user-org-change
+               :message {:type :user-organization-change
                          :topic profile-id
                          :organization-id organization-id
                          :organization-name organization-name
diff --git a/backend/src/app/setup.clj b/backend/src/app/setup.clj
index 58964c92c4..4a6ef8ec62 100644
--- a/backend/src/app/setup.clj
+++ b/backend/src/app/setup.clj
@@ -115,8 +115,9 @@
                     (assoc keys id key)))))
             {}
             [:exporter
-             :nitrate
-             :nexus])))
+             :admin-console
+             :nexus
+             :media-processor])))
 
 (sm/register! ::props [:map-of :keyword ::sm/any])
 (sm/register! ::shared-keys [:map-of :keyword ::sm/text])
diff --git a/backend/src/app/srepl.clj b/backend/src/app/srepl.clj
index 8753efdbb1..8faa741ab0 100644
--- a/backend/src/app/srepl.clj
+++ b/backend/src/app/srepl.clj
@@ -19,7 +19,8 @@
    [clojure.core :as c]
    [clojure.core.server :as ccs]
    [clojure.main :as cm]
-   [integrant.core :as ig]))
+   [integrant.core :as ig]
+   [nrepl.server :as nrepl]))
 
 (defn- repl-init
   []
@@ -107,37 +108,106 @@
         (finally
           (remove-tap tapfn))))))
 
-;; --- State initialization
+;; --- UREPL
 
-(defmethod ig/assert-key ::server
+(defmethod ig/assert-key ::urepl
   [_ params]
-  (assert (int? (::port params)) "expected valid port")
-  (assert (string? (::host params)) "expected valid host"))
+  (assert (int? (:port params)) "expected valid port")
+  (assert (string? (:host params)) "expected valid host"))
 
-(defmethod ig/expand-key ::server
-  [[type :as k] v]
-  {k (assoc v ::flag (keyword (str (name type) "-server")))})
+(defmethod ig/init-key ::urepl
+  [_ {:keys [:port :host] :as cfg}]
+  (when (contains? cf/flags :urepl-server)
 
-(defmethod ig/init-key ::server
-  [[type _] {:keys [::flag ::port ::host] :as cfg}]
-  (when (contains? cf/flags flag)
-
-    (l/inf :hint "initializing repl server"
-           :name (name type)
-           :port port
-           :host host)
-
-    (let [accept (case type
-                   ::prepl 'app.srepl/json-repl
-                   ::urepl 'app.srepl/user-repl)
+    (l/inf :hint "init urepl server" :host host :port port)
+    (let [accept 'app.srepl/user-repl
           params {:address host
                   :port port
-                  :name (name type)
+                  :name "urepl"
                   :accept accept}]
 
       (ccs/start-server params)
-      (assoc params :type type))))
+      "urepl")))
 
-(defmethod ig/halt-key! ::server
+(defmethod ig/halt-key! ::urepl
+  [_ name]
+  (some-> name ccs/stop-server))
+
+(defmethod ig/resume-key ::urepl
+  [key opts _ old-name]
+  (if old-name
+    (do
+      (l/inf :hint "keep urepl server")
+      old-name)
+    (ig/init-key key opts)))
+
+(defmethod ig/suspend-key! ::urepl
+  [_ _]
+  (l/inf :hint "keep urepl server"))
+
+;; --- PREPL
+
+(defmethod ig/assert-key ::prepl
   [_ params]
-  (some-> params :name ccs/stop-server))
+  (assert (int? (:port params)) "expected valid port")
+  (assert (string? (:host params)) "expected valid host"))
+
+(defmethod ig/init-key ::prepl
+  [_ {:keys [:port :host] :as cfg}]
+  (when (contains? cf/flags :prepl-server)
+
+    (l/inf :hint "init prepl server" :host host :port port)
+    (let [accept 'app.srepl/json-repl
+          params {:address host
+                  :port port
+                  :name "prepl"
+                  :accept accept}]
+
+      (ccs/start-server params)
+      "prepl")))
+
+
+(defmethod ig/halt-key! ::prepl
+  [_ name]
+  (some-> name ccs/stop-server))
+
+(defmethod ig/resume-key ::prepl
+  [key opts _ old-name]
+  (if old-name
+    (do
+      (l/inf :hint "keep prepl server")
+      old-name)
+    (ig/init-key key opts)))
+
+(defmethod ig/suspend-key! ::prepl
+  [_ _]
+  (l/inf :hint "keep prepl server"))
+
+;; --- NREPL
+
+(defmethod ig/assert-key ::nrepl
+  [_ params]
+  (assert (int? (:port params)) "expected valid port")
+  (assert (string? (:host params)) "expected valid host"))
+
+(defmethod ig/init-key ::nrepl
+  [_ {:keys [:port :host] :as cfg}]
+  (when (contains? cf/flags :nrepl-server)
+    (l/inf :hint "init nrepl server" :host host :port port)
+    (nrepl/start-server :bind host :port port)))
+
+(defmethod ig/halt-key! ::nrepl
+  [_ server]
+  (some-> server nrepl/stop-server))
+
+(defmethod ig/resume-key ::nrepl
+  [key opts _ old-server]
+  (if old-server
+    (do
+      (l/inf :hint "keep nrepl server")
+      old-server)
+    (ig/init-key key opts)))
+
+(defmethod ig/suspend-key! ::nrepl
+  [_ _]
+  (l/inf :hint "keep nrepl server"))
diff --git a/backend/src/app/srepl/binfile.clj b/backend/src/app/srepl/binfile.clj
index 0fbc09c460..badf02d98c 100644
--- a/backend/src/app/srepl/binfile.clj
+++ b/backend/src/app/srepl/binfile.clj
@@ -9,18 +9,18 @@
    [app.binfile.v2 :as binfile.v2]
    [app.common.uuid :as uuid]
    [app.db :as db]
-   [app.main :as main]
    [app.srepl.helpers :as h]
+   [app.system :as sys]
    [cuerdas.core :as str]))
 
 (defn export-team!
   [team-id]
   (let [team-id (h/parse-uuid team-id)]
-    (binfile.v2/export-team! main/system team-id)))
+    (binfile.v2/export-team! sys/system team-id)))
 
 (defn import-team!
   [path & {:keys [owner rollback?] :or {rollback? true}}]
-  (db/tx-run! (assoc main/system ::db/rollback rollback?)
+  (db/tx-run! (assoc sys/system ::db/rollback rollback?)
               (fn [cfg]
                 (let [team  (binfile.v2/import-team! cfg path)
                       owner (cond
diff --git a/backend/src/app/srepl/cli.clj b/backend/src/app/srepl/cli.clj
index 41f49a05e6..dc44047e32 100644
--- a/backend/src/app/srepl/cli.clj
+++ b/backend/src/app/srepl/cli.clj
@@ -29,7 +29,7 @@
 
 (defn- get-current-system
   []
-  (or (deref (requiring-resolve 'app.main/system))
+  (or (deref (requiring-resolve 'app.system/system))
       (deref (requiring-resolve 'user/system))))
 
 (defmulti ^:private exec-command ::cmd)
diff --git a/backend/src/app/srepl/helpers.clj b/backend/src/app/srepl/helpers.clj
index 6bf9d2cdd9..658181635b 100644
--- a/backend/src/app/srepl/helpers.clj
+++ b/backend/src/app/srepl/helpers.clj
@@ -15,7 +15,7 @@
    [app.common.time :as ct]
    [app.db :as db]
    [app.features.file-snapshots :as fsnap]
-   [app.main :as main]))
+   [app.system :as sys]))
 
 (def ^:dynamic *system* nil)
 
@@ -37,13 +37,13 @@
 (defn get-file
   "Get the migrated data of one file."
   ([id]
-   (get-file (or *system* main/system) id))
+   (get-file (or *system* sys/system) id))
   ([system id]
    (db/run! system bfc/get-file id)))
 
 (defn get-raw-file
   "Get the migrated data of one file."
-  ([id] (get-raw-file (or *system* main/system) id))
+  ([id] (get-raw-file (or *system* sys/system) id))
   ([system id]
    (db/run! system
             (fn [system]
diff --git a/backend/src/app/srepl/main.clj b/backend/src/app/srepl/main.clj
index 72792b7f5e..6745858f0e 100644
--- a/backend/src/app/srepl/main.clj
+++ b/backend/src/app/srepl/main.clj
@@ -27,7 +27,6 @@
    [app.features.file-snapshots :as fsnap]
    [app.http.session :as session]
    [app.loggers.audit :as audit]
-   [app.main :as main]
    [app.msgbus :as mbus]
    [app.rpc.commands.auth :as auth]
    [app.rpc.commands.files :as files]
@@ -37,6 +36,7 @@
    [app.rpc.commands.teams :as teams]
    [app.srepl.helpers :as h]
    [app.srepl.procs.file-repair :as procs.file-repair]
+   [app.system :as sys]
    [app.util.blob :as blob]
    [app.util.pointer-map :as pmap]
    [app.worker :as wrk]
@@ -58,14 +58,14 @@
 
 (defn print-tasks
   []
-  (let [tasks (:app.worker/registry main/system)]
+  (let [tasks (:app.worker/registry sys/system)]
     (pp/pprint (keys tasks) :level 200)))
 
 (defn run-task!
   ([tname]
    (run-task! tname {}))
   ([tname params]
-   (wrk/invoke! (-> main/system
+   (wrk/invoke! (-> sys/system
                     (assoc ::wrk/task tname)
                     (assoc ::wrk/params params)))))
 
@@ -73,14 +73,14 @@
   ([name]
    (schedule-task! name {}))
   ([name params]
-   (wrk/submit! (-> main/system
+   (wrk/submit! (-> sys/system
                     (assoc ::wrk/task name)
                     (assoc ::wrk/params params)))))
 
 (defn send-test-email!
   [destination]
   (assert (string? destination) "destination should be provided")
-  (-> main/system
+  (-> sys/system
       (assoc ::wrk/task :sendmail)
       (assoc ::wrk/params {:body "test email"
                            :subject "test email"
@@ -89,7 +89,7 @@
 
 (defn resend-email-verification-email!
   [email]
-  (db/tx-run! main/system
+  (db/tx-run! sys/system
               (fn [{:keys [::db/conn] :as cfg}]
                 (let [email   (profile/clean-email email)
                       profile (profile/get-profile-by-email conn email)]
@@ -103,7 +103,7 @@
   "Mark the profile blocked and removes all the http sessiones
   associated with the profile-id."
   [email]
-  (some-> main/system
+  (some-> sys/system
           (db/tx-run!
            (fn [{:keys [::db/conn] :as system}]
              (when-let [profile (db/get* conn :profile
@@ -117,7 +117,7 @@
   "Mark the profile blocked and removes all the http sessiones
   associated with the profile-id."
   [email]
-  (some-> main/system
+  (some-> sys/system
           (db/tx-run!
            (fn [{:keys [::db/conn] :as system}]
              (when-let [profile (db/get* conn :profile
@@ -135,7 +135,7 @@
   (assert (string? email) "expected email")
   (assert (string? password) "expected password")
 
-  (some-> main/system
+  (some-> sys/system
           (db/tx-run!
            (fn [{:keys [::db/conn] :as system}]
              (let [password (derive-password password)
@@ -156,7 +156,7 @@
               :hint (str "feature '" feature "' not supported")))
 
   (let [team-id (h/parse-uuid team-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [{:keys [::db/conn]}]
                   (let [team     (-> (db/get conn :team {:id team-id})
                                      (update :features db/decode-pgarray #{}))
@@ -175,7 +175,7 @@
               :hint (str "feature '" feature "' not supported")))
 
   (let [team-id (h/parse-uuid team-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [{:keys [::db/conn]}]
                   (let [team     (-> (db/get conn :team {:id team-id})
                                      (update :features db/decode-pgarray #{}))
@@ -216,7 +216,7 @@
               :code :incorrect-level
               :hint (str "level '" level "' not supported")))
 
-  (let [{:keys [::mbus/msgbus ::db/pool]} main/system
+  (let [{:keys [::mbus/msgbus ::db/pool]} sys/system
 
         send
         (fn [dest]
@@ -321,7 +321,7 @@
   collectable file-changes entry."
   [& {:keys [file-id label]}]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [cfg]
                   (let [file (bfc/get-file cfg file-id :realize? true)]
                     (fsnap/create! cfg file {:label label :created-by "admin"}))))))
@@ -330,7 +330,7 @@
   [file-id & {:keys [label id]}]
   (let [file-id     (h/parse-uuid file-id)
         snapshot-id (some-> id h/parse-uuid)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [{:keys [::db/conn] :as system}]
                   (cond
                     (uuid? snapshot-id)
@@ -348,7 +348,7 @@
 (defn list-file-snapshots!
   [file-id & {:as _}]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [cfg]
                   (->> (fsnap/get-visible-snapshots cfg file-id)
                        (print-table [:label :id :revn :created-at :created-by]))))))
@@ -356,7 +356,7 @@
 (defn take-team-snapshot!
   [team-id & {:keys [label rollback?] :or {rollback? true}}]
   (let [team-id (h/parse-uuid team-id)]
-    (-> (assoc main/system ::db/rollback rollback?)
+    (-> (assoc sys/system ::db/rollback rollback?)
         (db/tx-run! h/take-team-snapshot! team-id label))))
 
 (defn restore-team-snapshot!
@@ -364,7 +364,7 @@
   exists for all files; if is not the case, an exception is raised."
   [team-id label & {:keys [rollback?] :or {rollback? true}}]
   (let [team-id (h/parse-uuid team-id)]
-    (-> (assoc main/system ::db/rollback rollback?)
+    (-> (assoc sys/system ::db/rollback rollback?)
         (db/tx-run! h/restore-team-snapshot! team-id label))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -376,7 +376,7 @@
   all contents of a file. Returns a list of errors."
   [file-id]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! (assoc main/system ::db/rollback true)
+    (db/tx-run! (assoc sys/system ::db/rollback true)
                 (fn [system]
                   (let [file (bfc/get-file system file-id)
                         libs (bfc/get-resolved-file-libraries system file)]
@@ -387,7 +387,7 @@
   all contents of a file. Returns a list of errors."
   [file-id]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! (assoc main/system ::db/rollback true)
+    (db/tx-run! (assoc sys/system ::db/rollback true)
                 (fn [system]
                   (try
                     (let [file (bfc/get-file system file-id)]
@@ -405,7 +405,7 @@
 (defn repair-file!
   "Repair the list of errors detected by validation."
   [file-id & {:keys [rollback?] :or {rollback? true} :as options}]
-  (let [system  (assoc main/system ::db/rollback rollback?)
+  (let [system  (assoc sys/system ::db/rollback rollback?)
         file-id (h/parse-uuid file-id)
         options (assoc options ::h/with-libraries? true)]
     (db/tx-run! system h/process-file! file-id procs.file-repair/repair-file options)))
@@ -415,7 +415,7 @@
   The function receives the decoded and migrated file data."
   [file-id update-fn & {:keys [rollback?] :or {rollback? true} :as opts}]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! (assoc main/system ::db/rollback rollback?)
+    (db/tx-run! (assoc sys/system ::db/rollback rollback?)
                 (fn [system]
                   (binding [h/*system* system
                             db/*conn* (db/get-connection system)]
@@ -461,7 +461,7 @@
             (when-let [[index item] (sp/<! in-ch)]
               (l/dbg :hint "process item" :worker-id worker-id :index index :item item)
               (try
-                (-> main/system
+                (-> sys/system
                     (assoc ::db/rollback rollback?)
                     (db/tx-run! (fn [system]
                                   (binding [h/*system* system
@@ -506,7 +506,7 @@
              (doall))]
 
     (try
-      (db/tx-run! main/system process-items)
+      (db/tx-run! sys/system process-items)
 
       ;; Await threads termination
       (doseq [thread threads]
@@ -535,13 +535,13 @@
 (defn mark-file-as-trimmed
   [id]
   (let [id (h/parse-uuid id)]
-    (db/tx-run! main/system (fn [cfg]
-                              (-> (db/update! cfg :file
-                                              {:has-media-trimmed true}
-                                              {:id id}
-                                              {::db/return-keys false})
-                                  (db/get-update-count)
-                                  (pos?))))))
+    (db/tx-run! sys/system (fn [cfg]
+                             (-> (db/update! cfg :file
+                                             {:has-media-trimmed true}
+                                             {:id id}
+                                             {::db/return-keys false})
+                                 (db/get-update-count)
+                                 (pos?))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; DELETE/RESTORE OBJECTS (WITH CASCADE, SOFT)
@@ -553,14 +553,14 @@
   (let [file-id (h/parse-uuid file-id)
         tnow    (ct/now)]
 
-    (audit/insert main/system
+    (audit/insert sys/system
                   {:name "delete-file"
                    :type "action"
                    :props {:id file-id}
                    :context {:triggered-by "srepl"
                              :cause "explicit call to delete-file!"}
                    :tracked-at tnow})
-    (wrk/invoke! (-> main/system
+    (wrk/invoke! (-> sys/system
                      (assoc ::wrk/task :delete-object)
                      (assoc ::wrk/params {:object :file
                                           :deleted-at tnow
@@ -571,7 +571,7 @@
   "Mark a file and all related objects as not deleted"
   [file-id]
   (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [{:keys [::db/conn] :as system}]
                   (when-let [file (db/get* system :file
                                            {:id file-id}
@@ -593,7 +593,7 @@
   (let [project-id (h/parse-uuid project-id)
         tnow       (ct/now)]
 
-    (audit/insert main/system
+    (audit/insert sys/system
                   {:name "delete-project"
                    :type "action"
                    :props {:id project-id}
@@ -601,7 +601,7 @@
                              :cause "explicit call to delete-project!"}
                    :tracked-at tnow})
 
-    (wrk/invoke! (-> main/system
+    (wrk/invoke! (-> sys/system
                      (assoc ::wrk/task :delete-object)
                      (assoc ::wrk/params {:object :project
                                           :deleted-at tnow
@@ -625,7 +625,7 @@
   "Mark a project and all related objects as not deleted"
   [project-id]
   (let [project-id (h/parse-uuid project-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [system]
                   (when-let [project (db/get* system :project
                                               {:id project-id}
@@ -645,7 +645,7 @@
   (let [team-id (h/parse-uuid team-id)
         tnow    (ct/now)]
 
-    (audit/insert main/system
+    (audit/insert sys/system
                   {:name "delete-team"
                    :type "action"
                    :props {:id team-id}
@@ -653,7 +653,7 @@
                              :cause "explicit call to delete-profile!"}
                    :tracked-at tnow})
 
-    (wrk/invoke! (-> main/system
+    (wrk/invoke! (-> sys/system
                      (assoc ::wrk/task :delete-object)
                      (assoc ::wrk/params {:object :team
                                           :deleted-at tnow
@@ -681,7 +681,7 @@
   "Mark a team and all related objects as not deleted"
   [team-id]
   (let [team-id (h/parse-uuid team-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [system]
                   (when-let [team (some-> (db/get* system :team
                                                    {:id team-id}
@@ -702,14 +702,14 @@
   (let [profile-id (h/parse-uuid profile-id)
         tnow       (ct/now)]
 
-    (audit/insert main/system
+    (audit/insert sys/system
                   {:name "delete-profile"
                    :type "action"
                    :context {:triggered-by "srepl"
                              :cause "explicit call to delete-profile!"}
                    :tracked-at tnow})
 
-    (wrk/invoke! (-> main/system
+    (wrk/invoke! (-> sys/system
                      (assoc ::wrk/task :delete-object)
                      (assoc ::wrk/params {:object :profile
                                           :deleted-at tnow
@@ -720,7 +720,7 @@
   "Mark a team and all related objects as not deleted"
   [profile-id]
   (let [profile-id (h/parse-uuid profile-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [system]
                   (when-let [profile (some-> (db/get* system :profile
                                                       {:id profile-id}
@@ -793,9 +793,9 @@
 
 (defn process-deleted-profiles-cascade
   []
-  (->> (db/exec! main/system ["select id, deleted_at from profile where deleted_at is not null"])
+  (->> (db/exec! sys/system ["select id, deleted_at from profile where deleted_at is not null"])
        (run! (fn [{:keys [id deleted-at]}]
-               (wrk/invoke! (-> main/system
+               (wrk/invoke! (-> sys/system
                                 (assoc ::wrk/task :delete-object)
                                 (assoc ::wrk/params {:object :profile
                                                      :deleted-at deleted-at
@@ -803,9 +803,9 @@
 
 (defn process-deleted-teams-cascade
   []
-  (->> (db/exec! main/system ["select id, deleted_at from team where deleted_at is not null"])
+  (->> (db/exec! sys/system ["select id, deleted_at from team where deleted_at is not null"])
        (run! (fn [{:keys [id deleted-at]}]
-               (wrk/invoke! (-> main/system
+               (wrk/invoke! (-> sys/system
                                 (assoc ::wrk/task :delete-object)
                                 (assoc ::wrk/params {:object :team
                                                      :deleted-at deleted-at
@@ -813,9 +813,9 @@
 
 (defn process-deleted-projects-cascade
   []
-  (->> (db/exec! main/system ["select id, deleted_at from project where deleted_at is not null"])
+  (->> (db/exec! sys/system ["select id, deleted_at from project where deleted_at is not null"])
        (run! (fn [{:keys [id deleted-at]}]
-               (wrk/invoke! (-> main/system
+               (wrk/invoke! (-> sys/system
                                 (assoc ::wrk/task :delete-object)
                                 (assoc ::wrk/params {:object :project
                                                      :deleted-at deleted-at
@@ -823,9 +823,9 @@
 
 (defn process-deleted-files-cascade
   []
-  (->> (db/exec! main/system ["select id, deleted_at from file where deleted_at is not null"])
+  (->> (db/exec! sys/system ["select id, deleted_at from file where deleted_at is not null"])
        (run! (fn [{:keys [id deleted-at]}]
-               (wrk/invoke! (-> main/system
+               (wrk/invoke! (-> sys/system
                                 (assoc ::wrk/task :delete-object)
                                 (assoc ::wrk/params {:object :file
                                                      :deleted-at deleted-at
@@ -842,7 +842,7 @@
   (assert (string? client-id) "expected a valid client-id")
   (assert (string? client-secret) "expected a valid client-secret")
   (assert (string? domain) "expected a valid domain")
-  (db/insert! main/system :sso-provider
+  (db/insert! sys/system :sso-provider
               {:id (uuid/next)
                :type "oidc"
                :client-id client-id
@@ -856,7 +856,7 @@
 
 (defn decode-session-token
   [token]
-  (session/decode-token main/system token))
+  (session/decode-token sys/system token))
 
 (defn instrument-var
   [var]
@@ -881,7 +881,7 @@
 (defn duplicate-team
   [team-id & {:keys [name]}]
   (let [team-id (h/parse-uuid team-id)]
-    (db/tx-run! main/system
+    (db/tx-run! sys/system
                 (fn [{:keys [::db/conn] :as cfg}]
                   (db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"])
                   (let [team (-> (assoc cfg ::bfc/timestamp (ct/now))
diff --git a/backend/src/app/system.clj b/backend/src/app/system.clj
new file mode 100644
index 0000000000..a424bebcf1
--- /dev/null
+++ b/backend/src/app/system.clj
@@ -0,0 +1,9 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.system)
+
+(defonce system nil)
diff --git a/backend/src/app/util/blob.clj b/backend/src/app/util/blob.clj
index afc71653bc..09df353da1 100644
--- a/backend/src/app/util/blob.clj
+++ b/backend/src/app/util/blob.clj
@@ -8,6 +8,7 @@
   "A generic blob storage encoding. Mainly used for page data, page
   options and txlog payload storage."
   (:require
+   [app.common.exceptions :as ex]
    [app.common.fressian :as fres]
    [app.common.transit :as t]
    [app.config :as cf])
@@ -58,12 +59,18 @@
    (.encodeToString (.withoutPadding (Base64/getUrlEncoder)) ^bytes (encode data opts))))
 
 (defn decode
-  "A function used for decode persisted blobs in the database."
-  [^bytes data]
+  "A function used for decode persisted blobs in the database.
+   Accepts optional keyword arguments:
+     :max-size  — maximum allowed uncompressed size in bytes"
+  [^bytes data & {:keys [max-size]}]
   (with-open [bais (ByteArrayInputStream. data)
               dis  (DataInputStream. bais)]
     (let [version (.readShort dis)
           ulen    (.readInt dis)]
+      (when (and max-size (> ulen max-size))
+        (ex/raise :type :validation
+                  :code :blob-too-large
+                  :hint "blob uncompressed size exceeds limit"))
       (case version
         1 (decode-v1 data ulen)
         3 (decode-v3 data ulen)
@@ -72,9 +79,10 @@
         (throw (ex-info "unsupported version" {:version version}))))))
 
 (defn decode-str
-  "Decode a URL-safe base64 string produced by `encode-str` back to data."
-  [^String s]
-  (decode (.decode (Base64/getUrlDecoder) s)))
+  "Decode a URL-safe base64 string produced by `encode-str` back to data.
+   Accepts the same optional keyword arguments as `decode`."
+  [^String s & {:as opts}]
+  (decode (.decode (Base64/getUrlDecoder) s) opts))
 
 ;; --- IMPL
 
diff --git a/backend/test/backend_tests/auth_oidc_test.clj b/backend/test/backend_tests/auth_oidc_test.clj
index 22ccb624fe..62f04fd546 100644
--- a/backend/test/backend_tests/auth_oidc_test.clj
+++ b/backend/test/backend_tests/auth_oidc_test.clj
@@ -518,3 +518,16 @@
               loc    (redirect-location result)]
           (t/is (= 302 (::yres/status result)))
           (t/is (.contains loc "error=unable-to-auth")))))))
+
+(t/deftest prepare-organization-sso-provider-does-not-skip-ssrf-check
+  (t/testing "organization SSO provider must use SSRF protection"
+    (let [captured-params (atom nil)]
+      (with-redefs [oidc/prepare-oidc-provider (fn [_cfg params]
+                                                 (reset! captured-params params)
+                                                 {:type "oidc" :id "test"})]
+        (#'oidc/prepare-organization-sso-provider {}
+                                                  {:client-id "test-client"
+                                                   :client-secret "test-secret"
+                                                   :issuer "https://idp.example.com"})
+        (t/is (not (true? (:skip-ssrf-check? @captured-params)))
+              "SSRF protection must be disabled for organization SSO")))))
diff --git a/backend/test/backend_tests/binfile_test.clj b/backend/test/backend_tests/binfile_test.clj
index 232a44f87c..05f1525c5e 100644
--- a/backend/test/backend_tests/binfile_test.clj
+++ b/backend/test/backend_tests/binfile_test.clj
@@ -8,8 +8,10 @@
   "Internal binfile test, no RPC involved"
   (:require
    [app.binfile.common :as bfc]
+   [app.binfile.v1 :as v1]
    [app.binfile.v3 :as v3]
    [app.common.features :as cfeat]
+   [app.common.files.validate :as cfv]
    [app.common.pprint :as pp]
    [app.common.thumbnails :as thc]
    [app.common.types.shape :as cts]
@@ -24,7 +26,10 @@
    [clojure.test :as t]
    [cuerdas.core :as str]
    [datoteka.fs :as fs]
-   [datoteka.io :as io]))
+   [datoteka.io :as io])
+  (:import
+   java.io.ByteArrayInputStream
+   java.io.DataInputStream))
 
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
@@ -86,6 +91,102 @@
 
     (dissoc file :data)))
 
+(def ^:private svg-raw-page-id (uuid/custom 1 1))
+(def ^:private svg-raw-root-id (uuid/custom 3 1))
+(def ^:private svg-raw-child-id (uuid/custom 3 2))
+
+(defn- prepare-svg-raw-file
+  "A file containing an svg-raw subtree (an svg-raw parent with an
+  svg-raw child), which is what importing an SVG produces."
+  [profile]
+  (let [page-id  svg-raw-page-id
+        root-id  svg-raw-root-id
+        child-id svg-raw-child-id
+
+        file     (th/create-file* 1 {:profile-id (:id profile)
+                                     :project-id (:default-project-id profile)
+                                     :is-shared false})]
+    (update-file!
+     :file-id (:id file)
+     :profile-id (:id profile)
+     :revn 0
+     :vern 0
+     :changes
+     [{:type :add-page
+       :name "page 1"
+       :id page-id}])
+
+    (update-file!
+     :file-id (:id file)
+     :profile-id (:id profile)
+     :revn 0
+     :vern 0
+     :changes
+     [{:type :add-obj
+       :page-id page-id
+       :id root-id
+       :parent-id uuid/zero
+       :frame-id uuid/zero
+       :components-v2 true
+       :obj (cts/setup-shape
+             {:id root-id
+              :name "svg-root"
+              :frame-id uuid/zero
+              :parent-id uuid/zero
+              :type :svg-raw
+              :content {:tag :svg :attrs {} :content []}})}
+      {:type :add-obj
+       :page-id page-id
+       :id child-id
+       :parent-id root-id
+       :frame-id uuid/zero
+       :components-v2 true
+       :obj (cts/setup-shape
+             {:id child-id
+              :name "svg-text"
+              :frame-id uuid/zero
+              :parent-id root-id
+              :type :svg-raw
+              :content {:tag :text :attrs {} :content []}})}])
+
+    (dissoc file :data)))
+
+(t/deftest import-binfile-v3-preserves-svg-raw-children
+  (let [profile (th/create-profile* 1)
+        file    (prepare-svg-raw-file profile)
+        output  (tmp/tempfile :suffix ".zip")]
+
+    (v3/export-files!
+     (-> th/*system*
+         (assoc ::bfc/ids #{(:id file)})
+         (assoc ::bfc/embed-assets false)
+         (assoc ::bfc/include-libraries false))
+     (io/output-stream output))
+
+    (let [result (-> th/*system*
+                     (assoc ::bfc/project-id (:default-project-id profile))
+                     (assoc ::bfc/profile-id (:id profile))
+                     (assoc ::bfc/input output)
+                     (v3/import-files!))
+          imported (:result (th/command! {::th/type :get-file
+                                          ::rpc/profile-id (:id profile)
+                                          :id (first result)
+                                          :components-v2 true}))
+          root     (get-in imported [:data :pages-index svg-raw-page-id
+                                     :objects svg-raw-root-id])]
+
+      (t/is (= (count result) 1))
+
+      ;; The child ids of an svg-raw shape must survive the JSON round
+      ;; trip as uuids; when they came back as plain strings they no
+      ;; longer resolved against the objects map.
+      (t/is (every? uuid? (:shapes root)))
+      (t/is (= [svg-raw-child-id] (vec (:shapes root))))
+
+      ;; ...so the imported file passes referential integrity instead
+      ;; of failing with :child-not-found on the next update-file.
+      (t/is (nil? (cfv/validate-file imported []))))))
+
 (t/deftest export-binfile-v3
   (let [profile (th/create-profile* 1)
         file    (prepare-simple-file profile)
@@ -105,3 +206,26 @@
                      (v3/import-files!))]
       (t/is (= (count result) 1))
       (t/is (every? uuid? result)))))
+
+(t/deftest read-obj-rejects-oversized-buffer
+  ;; N1-07: read-obj! must reject objects exceeding max-object-size
+  ;; before attempting to allocate the buffer
+  (let [size (+ bfc/max-object-size 1)
+        baos (java.io.ByteArrayOutputStream. 17)
+        dos  (java.io.DataOutputStream. baos)]
+    (.writeByte dos 5)
+    (.writeLong dos (long size))
+    (.flush dos)
+    (let [input (java.io.DataInputStream.
+                 (ByteArrayInputStream. (.toByteArray baos)))]
+      (binding [v1/*position* (atom 0)]
+        (let [out (try
+                    (v1/read-obj! input)
+                    nil
+                    (catch clojure.lang.ExceptionInfo e
+                      (ex-data e)))]
+          ;; Without the guard, read-obj! will either OOM or proceed
+          ;; to read-bytes! on a truncated stream (no :max-file-size-reached).
+          ;; With the guard, it raises :validation :max-file-size-reached.
+          (t/is (= :validation (:type out)))
+          (t/is (= :max-file-size-reached (:code out))))))))
diff --git a/backend/test/backend_tests/email_sending_test.clj b/backend/test/backend_tests/email_sending_test.clj
index e96fd192ae..91d2848185 100644
--- a/backend/test/backend_tests/email_sending_test.clj
+++ b/backend/test/backend_tests/email_sending_test.clj
@@ -42,15 +42,15 @@
    :token "test-token"
    :organization organization})
 
-(t/deftest invite-to-org-includes-sso-notice-when-active
-  (let [result (emails/render emails/invite-to-org
+(t/deftest invite-to-organization-includes-sso-notice-when-active
+  (let [result (emails/render emails/invite-to-organization
                               (invite-email-params {:name "Acme Inc"
                                                     :sso-active true}))]
     (t/is (str/includes? (email-text-body result) sso-notice-snippet))
     (t/is (str/includes? (get-in result [:body "text/html"]) sso-notice-snippet))))
 
-(t/deftest invite-to-org-omits-sso-notice-when-inactive
-  (let [result (emails/render emails/invite-to-org
+(t/deftest invite-to-organization-omits-sso-notice-when-inactive
+  (let [result (emails/render emails/invite-to-organization
                               (invite-email-params {:name "Acme Inc"
                                                     :sso-active false}))]
     (t/is (not (str/includes? (email-text-body result) sso-notice-snippet)))
diff --git a/backend/test/backend_tests/helpers.clj b/backend/test/backend_tests/helpers.clj
index 247b27a699..0f582497d9 100644
--- a/backend/test/backend_tests/helpers.clj
+++ b/backend/test/backend_tests/helpers.clj
@@ -79,59 +79,66 @@
    :enable-auto-file-snapshot
    :disable-file-validation])
 
-(defn state-init
+(defn init-config
+  ([next]
+   (init-config nil next))
+  ([extra-flags next]
+   (let [flags (into default-flags extra-flags)]
+     (with-redefs [app.config/flags (flags/parse flags/default flags)
+                   app.config/config config
+                   app.loggers.audit/submit (constantly nil)
+                   app.auth/derive-password identity
+                   app.auth/verify-password (fn [a b] {:valid (= a b)})
+                   app.common.features/get-enabled-features
+                   (fn [& _] app.common.features/supported-features)]
+       (cf/validate! :exit-on-error? false)
+       (fs/create-dir "/tmp/penpot")
+       (next)))))
+
+(defn init-system
   [next]
-  (with-redefs [app.config/flags (flags/parse flags/default default-flags)
-                app.config/config config
-                app.loggers.audit/submit (constantly nil)
-                app.auth/derive-password identity
-                app.auth/verify-password (fn [a b] {:valid (= a b)})
-                app.common.features/get-enabled-features (fn [& _] app.common.features/supported-features)]
+  (let [templates [{:id "test"
+                    :name "test"
+                    :file-uri "test"
+                    :thumbnail-uri "test"
+                    :path (-> "backend_tests/test_files/template.penpot" io/resource fs/path)}]
+        system (-> (merge main/system-config main/worker-config)
+                   (assoc-in [:app.redis/client :app.redis/uri] (:redis-uri config))
+                   (assoc-in [::db/pool ::db/uri] (:database-uri config))
+                   (assoc-in [::db/pool ::db/username] (:database-username config))
+                   (assoc-in [::db/pool ::db/password] (:database-password config))
+                   (assoc-in [:app.rpc/methods :app.setup/templates] templates)
+                   (assoc-in [:app.rpc/methods :app.setup/templates] templates)
+                   (update :app.rpc/rlimit assoc
+                           :app.loggers.mattermost/reporter nil
+                           :app.loggers.database/reporter nil)
+                   (update :app.rpc/methods assoc
+                           :app.setup/templates templates
+                           :app.loggers.mattermost/reporter nil
+                           :app.loggers.database/reporter nil)
+                   (dissoc :app.srepl/server
+                           :app.http/server
+                           :app.http/route
+                           :app.setup/templates
+                           :app.http.oauth/handler
+                           :app.notifications/handler
+                           :app.loggers.mattermost/reporter
+                           :app.loggers.database/reporter
+                           :app.worker/cron
+                           :app.worker/dispatcher
+                           [:app.main/default :app.worker/runner]
+                           [:app.main/webhook :app.worker/runner]))
+        _      (ig/load-namespaces system)
+        system (-> (ig/expand system) (ig/init))]
+    (try
+      (binding [*system* system
+                *pool*   (:app.db/pool system)]
+        (next))
+      (finally
+        (ig/halt! system)))))
 
-    (cf/validate! :exit-on-error? false)
-
-    (fs/create-dir "/tmp/penpot")
-
-    (let [templates [{:id "test"
-                      :name "test"
-                      :file-uri "test"
-                      :thumbnail-uri "test"
-                      :path (-> "backend_tests/test_files/template.penpot" io/resource fs/path)}]
-          system (-> (merge main/system-config main/worker-config)
-                     (assoc-in [:app.redis/client :app.redis/uri] (:redis-uri config))
-                     (assoc-in [::db/pool ::db/uri] (:database-uri config))
-                     (assoc-in [::db/pool ::db/username] (:database-username config))
-                     (assoc-in [::db/pool ::db/password] (:database-password config))
-                     (assoc-in [:app.rpc/methods :app.setup/templates] templates)
-                     (assoc-in [:app.rpc/methods :app.setup/templates] templates)
-                     (update :app.rpc/rlimit assoc
-                             :app.loggers.mattermost/reporter nil
-                             :app.loggers.database/reporter nil)
-                     (update :app.rpc/methods assoc
-                             :app.setup/templates templates
-                             :app.loggers.mattermost/reporter nil
-                             :app.loggers.database/reporter nil)
-                     (dissoc :app.srepl/server
-                             :app.http/server
-                             :app.http/route
-                             :app.setup/templates
-                             :app.http.oauth/handler
-                             :app.notifications/handler
-                             :app.loggers.mattermost/reporter
-                             :app.loggers.database/reporter
-                             :app.worker/cron
-                             :app.worker/dispatcher
-                             [:app.main/default :app.worker/runner]
-                             [:app.main/webhook :app.worker/runner]))
-          _      (ig/load-namespaces system)
-          system (-> (ig/expand system)
-                     (ig/init))]
-      (try
-        (binding [*system* system
-                  *pool*   (:app.db/pool system)]
-          (next))
-        (finally
-          (ig/halt! system))))))
+(def state-init
+  (t/compose-fixtures init-config init-system))
 
 (defn database-reset
   [next]
@@ -182,7 +189,7 @@
    (let [params (merge {:id (mk-uuid "profile" i)
                         :fullname (str "Profile " i)
                         :email (str "profile" i ".test@nodomain.com")
-                        :password "123123"
+                        :password "Test123!"
                         :is-demo false}
                        params)]
      (db/run! system
@@ -386,29 +393,15 @@
                             (assoc :app.rpc/request-at (ct/now)))))))
 
 (defn management-command!
-  ([data]
-   (management-command! data nil))
-  ([{:keys [::type] :as data} flags-to-add]
-   (let [flags (reduce conj cf/flags (or flags-to-add []))
-
-         resolve-management-methods
-         (requiring-resolve 'app.rpc/resolve-management-methods)
-
-         methods
-         (with-redefs [cf/flags flags]
-           (resolve-management-methods *system*))
-
-         [_ method-fn]
-         (get methods type)]
-
-     (when-not method-fn
-       (ex/raise :type :assertion
-                 :code :rpc-method-not-found
-                 :hint (str/ffmt "management rpc method '%' not found" (name type))))
-
-     (try-on! (method-fn (-> data
-                             (dissoc ::type)
-                             (assoc :app.rpc/request-at (ct/now))))))))
+  [{:keys [::type] :as data}]
+  (let [[_ method-fn] (get-in *system* [:app.rpc/management-methods type])]
+    (when-not method-fn
+      (ex/raise :type :assertion
+                :code :rpc-method-not-found
+                :hint (str/ffmt "management rpc method '%' not found" (name type))))
+    (try-on! (method-fn (-> data
+                            (dissoc ::type)
+                            (assoc :app.rpc/request-at (ct/now)))))))
 
 (defn run-task!
   ([name]
diff --git a/backend/test/backend_tests/http_assets_test.clj b/backend/test/backend_tests/http_assets_test.clj
index bc521cb082..94510d73d6 100644
--- a/backend/test/backend_tests/http_assets_test.clj
+++ b/backend/test/backend_tests/http_assets_test.clj
@@ -110,7 +110,8 @@
     (doseq [bucket ["file-media-object"
                     "file-object-thumbnail"
                     "team-font-variant"
-                    "file-data-fragment"]]
+                    "file-data-fragment"
+                    "organization"]]
       (t/testing (str "bucket: " bucket)
         (let [object  (create-storage-object! storage bucket "public data")
               request {:path-params {:id (str (:id object))}}
@@ -120,6 +121,19 @@
           (t/is (not= 404 (::yres/status response))
                 (str "bucket " bucket " object should exist")))))))
 
+(t/deftest objects-handler-organization-logo-no-auth
+  ;; Organization logos are embedded in unauthenticated contexts, such as
+  ;; the invitation email image shown to a not-yet-registered invitee, so
+  ;; they must be servable without a session or access token.
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        object   (create-storage-object! storage "organization" "logo data")
+        request  {:path-params {:id (str (:id object))}}
+        response (assets/objects-handler cfg request)]
+    (t/is (not= 401 (::yres/status response)))
+    (t/is (not= 404 (::yres/status response)))))
+
 (t/deftest objects-handler-public-bucket-with-auth
   ;; Objects in public buckets should also be accessible WITH authentication.
   (let [storage  (-> (:app.storage/storage th/*system*)
@@ -445,6 +459,135 @@
 ;; Tests: objects-handler — expired objects
 ;; ----------------------------------------------------------------
 
+;; ----------------------------------------------------------------
+;; Tests: file-objects-handler — authz required (T2-N1-01)
+;; ----------------------------------------------------------------
+
+(t/deftest file-objects-handler-unauthenticated-returns-404
+  ;; Unauthenticated requests to file-media assets must return 404
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        profile  (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id profile)})
+        project  (th/create-project* 1 {:profile-id (:id profile)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id profile)
+                                     :project-id (:id project)})
+        media-storage (create-storage-object! storage "file-media-object" "image data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id media-storage)})
+        request  {:path-params {:id (str (:id media-obj))}}
+        response (assets/file-objects-handler cfg request)]
+    (t/is (= 404 (::yres/status response)))))
+
+(t/deftest file-objects-handler-no-file-perms-returns-404
+  ;; Authenticated user without file read permissions must get 404
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        owner    (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id owner)})
+        project  (th/create-project* 1 {:profile-id (:id owner)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id owner)
+                                     :project-id (:id project)})
+        media-storage (create-storage-object! storage "file-media-object" "image data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id media-storage)})
+        stranger (th/create-profile* 2)
+        request  {:path-params {:id (str (:id media-obj))}
+                  ::session/profile-id (:id stranger)}
+        response (assets/file-objects-handler cfg request)]
+    (t/is (= 404 (::yres/status response)))))
+
+(t/deftest file-objects-handler-with-file-perms-succeeds
+  ;; Authenticated user with file read permissions must get the object
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        owner    (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id owner)})
+        project  (th/create-project* 1 {:profile-id (:id owner)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id owner)
+                                     :project-id (:id project)})
+        media-storage (create-storage-object! storage "file-media-object" "image data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id media-storage)})
+        request  {:path-params {:id (str (:id media-obj))}
+                  ::session/profile-id (:id owner)}
+        response (assets/file-objects-handler cfg request)]
+    (t/is (= 204 (::yres/status response)))))
+
+(t/deftest file-thumbnails-handler-unauthenticated-returns-404
+  ;; Unauthenticated requests to file-thumbnail assets must return 404
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        profile  (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id profile)})
+        project  (th/create-project* 1 {:profile-id (:id profile)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id profile)
+                                     :project-id (:id project)})
+        media-storage (create-storage-object! storage "file-media-object" "image data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id media-storage)})
+        request  {:path-params {:id (str (:id media-obj))}}
+        response (assets/file-thumbnails-handler cfg request)]
+    (t/is (= 404 (::yres/status response)))))
+
+(t/deftest file-thumbnails-handler-with-file-perms-succeeds
+  ;; Authenticated user with file read permissions must get the thumbnail
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        owner    (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id owner)})
+        project  (th/create-project* 1 {:profile-id (:id owner)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id owner)
+                                     :project-id (:id project)})
+        thumb-storage (create-storage-object! storage "file-object-thumbnail" "thumb data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id thumb-storage)})
+        request  {:path-params {:id (str (:id media-obj))}
+                  ::session/profile-id (:id owner)}
+        response (assets/file-thumbnails-handler cfg request)]
+    ;; Falls back to media-id since no thumbnail-id, but still serves
+    (t/is (= 204 (::yres/status response)))))
+
+(t/deftest file-objects-handler-non-existent-media-returns-404
+  ;; Request for non-existent file-media-object returns 404
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        profile  (th/create-profile* 1)
+        request  {:path-params {:id (str (uuid/next))}
+                  ::session/profile-id (:id profile)}
+        response (assets/file-objects-handler cfg request)]
+    (t/is (= 404 (::yres/status response)))))
+
+(t/deftest file-objects-handler-nil-profile-id-returns-404
+  ;; When profile-id is nil (invalid session), must return 404
+  (let [storage  (-> (:app.storage/storage th/*system*)
+                     (configure-storage-backend))
+        cfg      (make-handler-cfg storage)
+        profile  (th/create-profile* 1)
+        team     (th/create-team* 1 {:profile-id (:id profile)})
+        project  (th/create-project* 1 {:profile-id (:id profile)
+                                        :team-id (:id team)})
+        file     (th/create-file* 1 {:profile-id (:id profile)
+                                     :project-id (:id project)})
+        media-storage (create-storage-object! storage "file-media-object" "image data")
+        media-obj (th/create-file-media-object* {:file-id (:id file)
+                                                 :media-id (:id media-storage)})
+        request  {:path-params {:id (str (:id media-obj))}
+                  ::session/profile-id nil}
+        response (assets/file-objects-handler cfg request)]
+    (t/is (= 404 (::yres/status response)))))
+
 (t/deftest objects-handler-expired-object
   ;; Expired objects should return 404 (get-object filters them out).
   (let [storage  (-> (:app.storage/storage th/*system*)
diff --git a/backend/test/backend_tests/http_middleware_test.clj b/backend/test/backend_tests/http_middleware_test.clj
index 357ddbad91..bd986fc031 100644
--- a/backend/test/backend_tests/http_middleware_test.clj
+++ b/backend/test/backend_tests/http_middleware_test.clj
@@ -21,19 +21,73 @@
    [clojure.test :as t]
    [mockery.core :refer [with-mocks]]
    [yetti.request :as yreq]
-   [yetti.response :as yres]))
+   [yetti.response :as yres])
+  (:import
+   io.undertow.server.RequestTooBigException))
 
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
-(defrecord DummyRequest [headers cookies]
+(defrecord DummyRequest [headers cookies method body-stream
+                         remote-addr server-name server-port
+                         scheme protocol path query ssl-client-cert]
   yreq/IRequestCookies
   (get-cookie [_ name]
     {:value (get cookies name)})
 
   yreq/IRequest
   (get-header [_ name]
-    (get headers name)))
+    (get headers name))
+  (method [_] method)
+  (body [_] body-stream)
+  (path [_] path)
+  (query [_] query)
+  (server-port [_] server-port)
+  (server-name [_] server-name)
+  (remote-addr [_] remote-addr)
+  (ssl-client-cert [_] ssl-client-cert)
+  (scheme [_] scheme)
+  (protocol [_] protocol))
+
+(defn- make-dummy-request
+  "Constructs a DummyRequest from an options map. Every key is
+  optional; missing values fall back to sensible defaults. New
+  fields added to DummyRequest won't break existing call sites
+  as long as this constructor keeps its `:or` defaults in sync.
+
+  Recognized keys:
+    :headers         — map of header name → value
+    :cookies         — map of cookie name → value
+    :method          — HTTP method keyword (default :get)
+    :body-stream     — InputStream for the body (used directly)
+    :body-bytes      — bytes or string for the body; wrapped in a
+                       ByteArrayInputStream if :body-stream is not
+                       given
+    :remote-addr     — string (default \"127.0.0.1\")
+    :server-name     — string (default \"test\")
+    :server-port     — long   (default 0)
+    :scheme          — keyword (default :http)
+    :protocol        — string (default \"HTTP/1.1\")
+    :path            — string (default \"/test\")
+    :query           — string or nil (default nil)
+    :ssl-client-cert — X509Certificate or nil (default nil)"
+  [{:keys [headers cookies method body-stream body-bytes
+           remote-addr server-name server-port scheme protocol
+           path query ssl-client-cert]
+    :or   {headers {} cookies {} method :get
+           body-stream nil
+           remote-addr "127.0.0.1" server-name "test" server-port 0
+           scheme :http protocol "HTTP/1.1" path "/test" query nil
+           ssl-client-cert nil}}]
+  (let [body-stream (or body-stream
+                        (when body-bytes
+                          (java.io.ByteArrayInputStream.
+                           (if (string? body-bytes)
+                             (.getBytes ^String body-bytes "UTF-8")
+                             body-bytes))))]
+    (->DummyRequest headers cookies method body-stream
+                    remote-addr server-name server-port
+                    scheme protocol path query ssl-client-cert)))
 
 (t/deftest auth-middleware-1
   (let [request (volatile! nil)
@@ -41,11 +95,11 @@
                  (fn [req] (vreset! request req))
                  {})]
 
-    (handler (->DummyRequest {} {}))
+    (handler (make-dummy-request {}))
 
     (t/is (nil? (::http/auth-data @request)))
 
-    (handler (->DummyRequest {"authorization" "Token aaaa"} {}))
+    (handler (make-dummy-request {:headers {"authorization" "Token aaaa"}}))
 
     (let [{:keys [token claims] token-type :type} (get @request ::http/auth-data)]
       (t/is (= :token token-type))
@@ -58,10 +112,10 @@
                  (fn [req] (vreset! request req))
                  {})]
 
-    (handler (->DummyRequest {} {}))
+    (handler (make-dummy-request {}))
     (t/is (nil? (::http/auth-data @request)))
 
-    (handler (->DummyRequest {"authorization" "Bearer aaaa"} {}))
+    (handler (make-dummy-request {:headers {"authorization" "Bearer aaaa"}}))
 
     (let [{:keys [token claims] token-type :type} (get @request ::http/auth-data)]
       (t/is (= :bearer token-type))
@@ -74,10 +128,10 @@
                  (fn [req] (vreset! request req))
                  {})]
 
-    (handler (->DummyRequest {} {}))
+    (handler (make-dummy-request {}))
     (t/is (nil? (::http/auth-data @request)))
 
-    (handler (->DummyRequest {} {"auth-token" "foobar"}))
+    (handler (make-dummy-request {:cookies {"auth-token" "foobar"}}))
 
     (let [{:keys [token claims] token-type :type} (get @request ::http/auth-data)]
       (t/is (= :cookie token-type))
@@ -89,16 +143,16 @@
                  (fn [req] {::yres/status 200})
                  {:test1 "secret-key"})]
 
-    (let [response (handler (->DummyRequest {} {}))]
+    (let [response (handler (make-dummy-request {}))]
       (t/is (= 403 (::yres/status response))))
 
-    (let [response (handler (->DummyRequest {"x-shared-key" "secret-key2"} {}))]
+    (let [response (handler (make-dummy-request {:headers {"x-shared-key" "secret-key2"}}))]
       (t/is (= 403 (::yres/status response))))
 
-    (let [response (handler (->DummyRequest {"x-shared-key" "secret-key"} {}))]
+    (let [response (handler (make-dummy-request {:headers {"x-shared-key" "secret-key"}}))]
       (t/is (= 403 (::yres/status response))))
 
-    (let [response (handler (->DummyRequest {"x-shared-key" "test1 secret-key"} {}))]
+    (let [response (handler (make-dummy-request {:headers {"x-shared-key" "test1 secret-key"}}))]
       (t/is (= 200 (::yres/status response))))))
 
 (t/deftest access-token-authz
@@ -113,6 +167,21 @@
       (t/is (= #{} (:app.http.access-token/perms response)))
       (t/is (= (:id profile) (:app.http.access-token/profile-id response))))))
 
+(t/deftest access-token-authz-sets-token-id-and-type
+  (let [profile (th/create-profile* 1)
+        token   (db/tx-run! th/*system* app.rpc.commands.access-token/create-access-token
+                            (:id profile) "test" nil "mcp")
+        handler (#'app.http.access-token/wrap-authz identity th/*system*)
+        request {::http/auth-data {:type :token :token "foobar" :claims {:tid (:id token)}}}
+        response (handler request)]
+    ;; Must set ::actoken/id from claims :tid
+    (t/is (= (:id token) (:app.http.access-token/id response)))
+    ;; Must set ::actoken/type from database
+    (t/is (= "mcp" (:app.http.access-token/type response)))
+    ;; Existing assertions still pass
+    (t/is (= #{} (:app.http.access-token/perms response)))
+    (t/is (= (:id profile) (:app.http.access-token/profile-id response)))))
+
 (defrecord MethodAwareDummyRequest [req-method headers]
   yreq/IRequest
   (method [_] req-method)
@@ -194,7 +263,7 @@
                                                        :user-agent "user agent"})
                       (#'session/assign-token cfg))
 
-        response (handler (->DummyRequest {} {"auth-token" (:token session)}))
+        response (handler (make-dummy-request {:cookies {"auth-token" (:token session)}}))
 
         {:keys [token claims] token-type :type}
         (get response ::http/auth-data)]
@@ -205,3 +274,127 @@
     (t/is (= "penpot" (:aud claims)))
     (t/is (= (:id session) (:sid claims)))
     (t/is (= (:id profile) (:uid claims)))))
+
+(t/deftest parse-request-illegal-argument-exception
+  ;; clojure.data.json raises IllegalArgumentException (case
+  ;; fall-through) on several kinds of malformed input. The
+  ;; parse-request middleware should convert any such IAE into a
+  ;; 400 :malformed-json validation error rather than letting it
+  ;; surface as a 500 internal error. Because the conversion is
+  ;; done by raising an ex-info (caught by the top-level error
+  ;; handler in app.http/router-handler), this test asserts on
+  ;; the ex-info thrown by wrap-parse-request directly.
+  (let [handler (#'app.http.middleware/wrap-parse-request
+                 (fn [_] {::yres/status 200 ::yres/body :ok}))
+        ;; Body contains the bytes for: {"x": "\}"}  -- a string
+        ;; value with a backslash followed by '}', which
+        ;; clojure.data.json v0.5.x cannot handle.
+        body    (.getBytes "{\"x\": \"\\}\"}" "UTF-8")
+        request (make-dummy-request
+                 {:method  :post
+                  :headers {"content-type" "application/json"}
+                  :body-bytes body})
+        ex      (try
+                  (handler request)
+                  (catch clojure.lang.ExceptionInfo e e))]
+    (t/is (instance? clojure.lang.ExceptionInfo ex))
+    (t/is (= :validation (-> ex ex-data :type)))
+    (t/is (= :malformed-json (-> ex ex-data :code)))
+    (t/is (string? (-> ex ex-data :hint)))))
+
+(t/deftest parse-request-request-too-big-exception
+  ;; When RequestTooBigException is raised (e.g. the request body
+  ;; exceeded the configured size limit), the middleware should
+  ;; convert it to a 413 :request-body-too-large validation
+  ;; error.
+  (let [handler (#'app.http.middleware/wrap-parse-request
+                 (fn [_] (throw (RequestTooBigException. "too large"))))
+        request (make-dummy-request
+                 {:method  :post
+                  :headers {"content-type" "application/json"}
+                  :body-bytes (.getBytes "{}" "UTF-8")})
+        ex      (try
+                  (handler request)
+                  (catch clojure.lang.ExceptionInfo e e))]
+    (t/is (instance? clojure.lang.ExceptionInfo ex))
+    (t/is (= :validation (-> ex ex-data :type)))
+    (t/is (= :request-body-too-large (-> ex ex-data :code)))
+    (t/is (string? (-> ex ex-data :hint)))))
+
+(t/deftest parse-request-eof-exception
+  ;; When java.io.EOFException is raised (e.g. the body stream
+  ;; was closed before the parser could read it), the middleware
+  ;; should convert it to a 400 :malformed-json validation error.
+  (let [handler (#'app.http.middleware/wrap-parse-request
+                 (fn [_] (throw (java.io.EOFException. "stream closed"))))
+        request (make-dummy-request
+                 {:method  :post
+                  :headers {"content-type" "application/json"}
+                  :body-bytes (.getBytes "{}" "UTF-8")})
+        ex      (try
+                  (handler request)
+                  (catch clojure.lang.ExceptionInfo e e))]
+    (t/is (instance? clojure.lang.ExceptionInfo ex))
+    (t/is (= :validation (-> ex ex-data :type)))
+    (t/is (= :malformed-json (-> ex ex-data :code)))
+    (t/is (string? (-> ex ex-data :hint)))))
+
+(t/deftest parse-request-runtime-exception-with-cause
+  ;; When a RuntimeException with a non-nil ex-cause is raised,
+  ;; the middleware should recurse on the cause and dispatch
+  ;; through the specific-exception branches. Here we wrap an
+  ;; IllegalArgumentException in a RuntimeException and verify
+  ;; it surfaces as :malformed-json.
+  (let [iae     (IllegalArgumentException. "No matching clause: 99")
+        wrapped (doto (RuntimeException. "wrapped")
+                  (.initCause iae))
+        handler (#'app.http.middleware/wrap-parse-request
+                 (fn [_] (throw wrapped)))
+        request (make-dummy-request
+                 {:method  :post
+                  :headers {"content-type" "application/json"}
+                  :body-bytes (.getBytes "{}" "UTF-8")})
+        ex      (try
+                  (handler request)
+                  (catch clojure.lang.ExceptionInfo e e))]
+    (t/is (instance? clojure.lang.ExceptionInfo ex))
+    (t/is (= :validation (-> ex ex-data :type)))
+    (t/is (= :malformed-json (-> ex ex-data :code)))))
+
+(t/deftest parse-request-runtime-exception-without-cause
+  ;; When a bare RuntimeException (no ex-cause) is raised, the
+  ;; middleware should fall through to errors/handle's :default
+  ;; path and return a 500 with :type :server-error :code
+  ;; :unexpected. This is the "true internal error" path.
+  (let [handler  (#'app.http.middleware/wrap-parse-request
+                  (fn [_] (throw (RuntimeException. "boom"))))
+        request  (make-dummy-request
+                  {:method  :post
+                   :headers {"content-type" "application/json"}
+                   :body-bytes (.getBytes "{}" "UTF-8")})
+        response (handler request)
+        body     (::yres/body response)]
+    (t/is (= 500 (::yres/status response)))
+    (t/is (= :server-error (:type body)))
+    (t/is (= :unexpected (:code body)))
+    (t/is (= "boom" (:hint body)))))
+
+(t/deftest parse-request-non-runtime-throwable
+  ;; When a non-RuntimeException Throwable is raised (e.g. an
+  ;; Error subclass or a non-RuntimeException checked-style
+  ;; exception), the middleware should fall through to the
+  ;; :else branch and call errors/handle. java.io.IOException
+  ;; has a dedicated handle-exception method that returns 500
+  ;; with :code :io-exception.
+  (let [handler  (#'app.http.middleware/wrap-parse-request
+                  (fn [_] (throw (java.io.IOException. "network gone"))))
+        request  (make-dummy-request
+                  {:method  :post
+                   :headers {"content-type" "application/json"}
+                   :body-bytes (.getBytes "{}" "UTF-8")})
+        response (handler request)
+        body     (::yres/body response)]
+    (t/is (= 500 (::yres/status response)))
+    (t/is (= :server-error (:type body)))
+    (t/is (= :io-exception (:code body)))
+    (t/is (= "network gone" (:hint body)))))
diff --git a/backend/test/backend_tests/media_remote_test.clj b/backend/test/backend_tests/media_remote_test.clj
new file mode 100644
index 0000000000..dfa8b16d05
--- /dev/null
+++ b/backend/test/backend_tests/media_remote_test.clj
@@ -0,0 +1,593 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.media-remote-test
+  (:require
+   [app.common.exceptions :as ex]
+   [app.config :as cf]
+   [app.media.remote :as media.remote]
+   [app.setup :as-alias setup]
+   [app.util.json :as json]
+   [backend-tests.helpers :as th]
+   [clojure.test :as t]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io]
+   [mockery.core :refer [with-mocks]])
+  (:import
+   java.io.ByteArrayInputStream))
+
+(defn- mk-system
+  "Minimal system map for media.remote/process tests."
+  []
+  {::setup/shared-keys {:media-processor "test-shared-key"}})
+
+(defn- json-stream
+  "Create an InputStream from a Clojure data structure (JSON-encoded)."
+  [data]
+  (ByteArrayInputStream.
+   (json/encode data)))
+
+(def config-mock
+  "Standard config mock for media-processor service."
+  {:media-processing-service-uri "http://localhost:6065"
+   :media-processing-service-timeout 5000})
+
+(defn- write-font-tmp
+  "Write font bytes to a tempfile and return the Path. Caller is responsible for cleanup."
+  [bytes suffix]
+  (let [tmp (fs/create-tempfile :prefix "penpot-test-font-" :suffix suffix)]
+    (io/write* tmp bytes)
+    tmp))
+
+;; ---------------------------------------------------------------------------
+;; :info
+;; ---------------------------------------------------------------------------
+
+(t/deftest info-happy-path
+  (t/testing "info returns dimensions and merges into input"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (json-stream {:width 800 :height 600 :mtype "image/jpeg" :size 12345 :orientation 1})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path   (th/tempfile "backend_tests/test_files/sample.jpg")
+              result (media.remote/process (mk-system)
+                                           {:cmd   :info
+                                            :input {:path path :mtype "image/jpeg"}})]
+          (t/is (= 800 (:width result)))
+          (t/is (= 600 (:height result)))
+          (t/is (= (fs/size path) (:size result)))
+          (t/is (some? (:ts result)))
+          (t/is (= path (:path result)))
+          (t/is (= "image/jpeg" (:mtype result)))
+          (t/is (= 1 (:call-count @mock))))))))
+
+(t/deftest info-verifies-request-params
+  (t/testing "info sends correct endpoint, method, and x-shared-key header"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (json-stream {:width 100 :height 100 :mtype "image/jpeg" :size 1 :orientation 1})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")]
+          (media.remote/process (mk-system)
+                                {:cmd :info :input {:path path :mtype "image/jpeg"}})
+          (let [[system req-map] (:call-args @mock)]
+            ;; System passed through
+            (t/is (some? (::setup/shared-keys system)))
+            ;; Request structure
+            (t/is (= :post (:method req-map)))
+            (t/is (str/includes? (str (:uri req-map)) "api/image/info"))
+            (t/is (= "test-shared-key" (get-in req-map [:headers "x-shared-key"])))
+            (t/is (str/starts-with?
+                   (get-in req-map [:headers "Content-Type"])
+                   "multipart/form-data"))))))))
+
+(t/deftest info-no-content-length-header
+  (t/testing "info does not send Content-Length header (JDK uses chunked encoding)"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (json-stream {:width 100 :height 100 :mtype "image/jpeg" :size 1 :orientation 1})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")]
+          (media.remote/process (mk-system)
+                                {:cmd :info :input {:path path :mtype "image/jpeg"}})
+          (let [[_ req-map] (:call-args @mock)]
+            (t/is (nil? (get-in req-map [:headers "Content-Length"])))))))))
+
+(t/deftest info-service-uri-not-configured
+  (t/testing "info throws when service URI is not configured"
+    (with-redefs [cf/get (constantly nil)]
+      (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+            err  (ex/try! (media.remote/process (mk-system)
+                                                {:cmd :info :input {:path path :mtype "image/jpeg"}}))]
+        (t/is (ex/error? err))
+        (t/is (= :internal (:type (ex-data err))))
+        (t/is (= :media-processor-not-configured (:code (ex-data err))))))))
+
+(t/deftest info-service-unavailable
+  (t/testing "info throws when service-request raises unavailable"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :throw (ex-info "Cannot connect to media-processor service"
+                                       {:type :internal
+                                        :code :media-processor-unavailable})}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+              err  (ex/try! (media.remote/process (mk-system)
+                                                  {:cmd :info :input {:path path :mtype "image/jpeg"}}))]
+          (t/is (ex/error? err))
+          (t/is (= :internal (:type (ex-data err))))
+          (t/is (= :media-processor-unavailable (:code (ex-data err)))))))))
+
+(t/deftest info-service-timeout
+  (t/testing "info throws when service-request raises timeout"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :throw (ex-info "media-processor service request timed out"
+                                       {:type :internal
+                                        :code :media-processor-timeout})}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+              err  (ex/try! (media.remote/process (mk-system)
+                                                  {:cmd :info :input {:path path :mtype "image/jpeg"}}))]
+          (t/is (ex/error? err))
+          (t/is (= :internal (:type (ex-data err))))
+          (t/is (= :media-processor-timeout (:code (ex-data err)))))))))
+
+(t/deftest info-mtype-mismatch
+  (t/testing "info raises :media-type-mismatch when detected mtype differs from declared"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (json-stream {:width 100 :height 100 :size 100
+                                                    :mtype "image/png"})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+              err  (ex/try! (media.remote/process (mk-system)
+                                                  {:cmd   :info
+                                                   :input {:path path :mtype "image/jpeg"}}))]
+          (t/is (ex/error? err))
+          (t/is (= :validation (:type (ex-data err))))
+          (t/is (= :media-type-mismatch (:code (ex-data err)))))))))
+
+;; ---------------------------------------------------------------------------
+;; :generic-thumbnail
+;; ---------------------------------------------------------------------------
+
+(t/deftest generic-thumbnail-happy-path
+  (t/testing "generic-thumbnail returns tempfile with correct format"
+    (let [thumb-bytes (.getBytes "fake-jpeg-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. thumb-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (let [path   (th/tempfile "backend_tests/test_files/sample.jpg")
+                result (media.remote/process (mk-system)
+                                             {:cmd    :generic-thumbnail
+                                              :input  {:path path :mtype "image/jpeg"}
+                                              :format :jpeg
+                                              :quality 80
+                                              :width  200
+                                              :height 200})]
+            (t/is (= :jpeg (:format result)))
+            (t/is (= "image/jpeg" (:mtype result)))
+            (t/is (pos? (:size result)))
+            (t/is (fs/exists? (:data result)))))))))
+
+(t/deftest generic-thumbnail-verifies-query-params
+  (t/testing "generic-thumbnail sends correct query params with mode=fit"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (ByteArrayInputStream. (.getBytes "data" "UTF-8"))}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")]
+          (media.remote/process (mk-system)
+                                {:cmd    :generic-thumbnail
+                                 :input  {:path path :mtype "image/jpeg"}
+                                 :format :jpeg
+                                 :quality 85
+                                 :width  300
+                                 :height 400})
+          (let [[_ req-map] (:call-args @mock)]
+            (t/is (str/includes? (str (:uri req-map)) "width=300"))
+            (t/is (str/includes? (str (:uri req-map)) "height=400"))
+            (t/is (str/includes? (str (:uri req-map)) "quality=85"))
+            (t/is (str/includes? (str (:uri req-map)) "format=jpeg"))
+            (t/is (str/includes? (str (:uri req-map)) "mode=fit"))))))))
+
+(t/deftest generic-thumbnail-service-unavailable
+  (t/testing "generic-thumbnail throws on service error"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :throw (ex-info "Cannot connect to media-processor service"
+                                       {:type :internal
+                                        :code :media-processor-unavailable})}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+              err  (ex/try! (media.remote/process (mk-system)
+                                                  {:cmd    :generic-thumbnail
+                                                   :input  {:path path :mtype "image/jpeg"}
+                                                   :format :jpeg
+                                                   :quality 85
+                                                   :width  200
+                                                   :height 200}))]
+          (t/is (ex/error? err))
+          (t/is (= :media-processor-unavailable (:code (ex-data err)))))))))
+
+;; ---------------------------------------------------------------------------
+;; :profile-thumbnail
+;; ---------------------------------------------------------------------------
+
+(t/deftest profile-thumbnail-happy-path
+  (t/testing "profile-thumbnail returns tempfile and uses mode=crop"
+    (let [thumb-bytes (.getBytes "fake-png-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. thumb-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (let [path   (th/tempfile "backend_tests/test_files/sample.jpg")
+                result (media.remote/process (mk-system)
+                                             {:cmd    :profile-thumbnail
+                                              :input  {:path path :mtype "image/jpeg"}
+                                              :format :jpeg
+                                              :quality 85
+                                              :width  128
+                                              :height 128})]
+            (t/is (some? (:data result)))
+            (t/is (fs/exists? (:data result)))
+            ;; Verify mode=crop in URI
+            (let [[_ req-map] (:call-args @mock)]
+              (t/is (str/includes? (str (:uri req-map)) "mode=crop")))))))))
+
+(t/deftest profile-thumbnail-service-unavailable
+  (t/testing "profile-thumbnail throws on service error"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :throw (ex-info "Cannot connect to media-processor service"
+                                       {:type :internal
+                                        :code :media-processor-unavailable})}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [path (th/tempfile "backend_tests/test_files/sample.jpg")
+              err  (ex/try! (media.remote/process (mk-system)
+                                                  {:cmd    :profile-thumbnail
+                                                   :input  {:path path :mtype "image/jpeg"}
+                                                   :format :jpeg
+                                                   :quality 85
+                                                   :width  128
+                                                   :height 128}))]
+          (t/is (ex/error? err))
+          (t/is (= :media-processor-unavailable (:code (ex-data err)))))))))
+
+;; ---------------------------------------------------------------------------
+;; :generate-fonts
+;; ---------------------------------------------------------------------------
+
+(t/deftest generate-fonts-ttf-happy-path
+  (t/testing "generate-fonts with TTF path makes per-variant calls"
+    (let [ttfbytes   (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+          ttfpath    (write-font-tmp ttfbytes ".ttf")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [result (media.remote/process (mk-system)
+                                               {:cmd   :generate-fonts
+                                                :input {"font/ttf" ttfpath}})]
+              ;; Original path preserved
+              (t/is (= ttfpath (get result "font/ttf")))
+              ;; Variants written to tempfiles
+              (t/is (fs/exists? (get result "font/otf")))
+              (t/is (fs/exists? (get result "font/woff")))
+              ;; Two calls: one for otf, one for woff
+              (t/is (= 2 (:call-count @mock))))
+            (finally
+              (fs/delete ttfpath))))))))
+
+(t/deftest generate-fonts-ttf-as-path
+  (t/testing "generate-fonts with TTF as tempfile Path works"
+    (let [ttfbytes   (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+          tmp-path   (write-font-tmp ttfbytes ".ttf")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [result (media.remote/process (mk-system)
+                                               {:cmd   :generate-fonts
+                                                :input {"font/ttf" tmp-path}})]
+              ;; Path preserved
+              (t/is (= tmp-path (get result "font/ttf")))
+              ;; Variant written
+              (t/is (fs/exists? (get result "font/otf"))))
+            (finally
+              (fs/delete tmp-path))))))))
+
+(t/deftest generate-fonts-otf-happy-path
+  (t/testing "generate-fonts with OTF path"
+    (let [otfbytes   (io/read* (io/resource "backend_tests/test_files/font-1.otf"))
+          otfpath    (write-font-tmp otfbytes ".otf")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [result (media.remote/process (mk-system)
+                                               {:cmd   :generate-fonts
+                                                :input {"font/otf" otfpath}})]
+              (t/is (= otfpath (get result "font/otf")))
+              (t/is (fs/exists? (get result "font/ttf")))
+              (t/is (fs/exists? (get result "font/woff")))
+              ;; Two calls: one for ttf, one for woff
+              (t/is (= 2 (:call-count @mock))))
+            (finally
+              (fs/delete otfpath))))))))
+
+(t/deftest generate-fonts-woff-happy-path
+  (t/testing "generate-fonts with WOFF path"
+    (let [woffbytes  (io/read* (io/resource "backend_tests/test_files/font-1.woff"))
+          woffpath   (write-font-tmp woffbytes ".woff")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [result (media.remote/process (mk-system)
+                                               {:cmd   :generate-fonts
+                                                :input {"font/woff" woffpath}})]
+              (t/is (= woffpath (get result "font/woff")))
+              (t/is (fs/exists? (get result "font/ttf")))
+              (t/is (fs/exists? (get result "font/otf")))
+              ;; Two calls: one for ttf, one for otf
+              (t/is (= 2 (:call-count @mock))))
+            (finally
+              (fs/delete woffpath)))))))
+
+  (t/deftest generate-fonts-woff2-happy-path
+    (t/testing "generate-fonts with WOFF2 path"
+      (let [woff2bytes (io/read* (io/resource "backend_tests/test_files/font-1.woff2"))
+            woff2path  (write-font-tmp woff2bytes ".woff2")
+            fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+        (with-mocks [mock {:target 'app.media.remote/service-request
+                           :return {:status 200
+                                    :body (ByteArrayInputStream. fake-bytes)}}]
+          (with-redefs [cf/get (th/config-get-mock config-mock)]
+            (try
+              (let [result (media.remote/process (mk-system)
+                                                 {:cmd   :generate-fonts
+                                                  :input {"font/woff2" woff2path}})]
+                (t/is (= woff2path (get result "font/woff2")))
+                (t/is (fs/exists? (get result "font/ttf")))
+                (t/is (fs/exists? (get result "font/otf")))
+                (t/is (fs/exists? (get result "font/woff")))
+                ;; Three calls: one for ttf, one for otf, one for woff
+                (t/is (= 3 (:call-count @mock))))
+              (finally
+                (fs/delete woff2path)))))))))
+
+(t/deftest generate-fonts-verifies-query-params
+  (t/testing "generate-fonts sends target-type query param with 180s timeout"
+    (let [ttfbytes  (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+          ttfpath   (write-font-tmp ttfbytes ".ttf")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (media.remote/process (mk-system)
+                                  {:cmd :generate-fonts :input {"font/ttf" ttfpath}})
+            (let [[_ req-map] (:call-args @mock)]
+              (t/is (str/includes? (str (:uri req-map)) "target-type="))
+              (t/is (= 180000 (:timeout req-map))))
+            (finally
+              (fs/delete ttfpath))))))))
+
+(t/deftest generate-fonts-woff-verifies-target-types
+  (t/testing "generate-fonts with WOFF sends target-type query param"
+    (let [woffbytes  (io/read* (io/resource "backend_tests/test_files/font-1.woff"))
+          woffpath   (write-font-tmp woffbytes ".woff")
+          fake-bytes (.getBytes "fake-font-data" "UTF-8")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body (ByteArrayInputStream. fake-bytes)}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (media.remote/process (mk-system)
+                                  {:cmd :generate-fonts :input {"font/woff" woffpath}})
+            (let [[_ req-map] (:call-args @mock)]
+              (t/is (str/includes? (str (:uri req-map)) "target-type=")))
+            (finally
+              (fs/delete woffpath))))))))
+
+(t/deftest generate-fonts-no-recognized-variant
+  (t/testing "generate-fonts throws when no recognized font variant"
+    (with-redefs [cf/get (th/config-get-mock config-mock)]
+      (let [err (ex/try! (media.remote/process (mk-system)
+                                               {:cmd   :generate-fonts
+                                                :input {"font/unknown" (.getBytes "data" "UTF-8")}}))]
+        (t/is (ex/error? err))
+        (t/is (= :validation (:type (ex-data err))))
+        (t/is (= :invalid-font (:code (ex-data err))))))))
+
+(t/deftest generate-fonts-connection-error
+  (t/testing "generate-fonts throws on service error"
+    (let [ttfbytes (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+          ttfpath  (write-font-tmp ttfbytes ".ttf")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :throw (ex-info "Cannot connect to media-processor service"
+                                         {:type :internal
+                                          :code :media-processor-unavailable})}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [err (ex/try! (media.remote/process (mk-system)
+                                                     {:cmd :generate-fonts :input {"font/ttf" ttfpath}}))]
+              (t/is (ex/error? err))
+              (t/is (= :media-processor-unavailable (:code (ex-data err)))))
+            (finally
+              (fs/delete ttfpath))))))))
+
+(t/deftest generate-fonts-timeout-error
+  (t/testing "generate-fonts throws on service timeout"
+    (let [ttfbytes (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+          ttfpath  (write-font-tmp ttfbytes ".ttf")]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :throw (ex-info "media-processor service request timed out"
+                                         {:type :internal
+                                          :code :media-processor-timeout})}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (try
+            (let [err (ex/try! (media.remote/process (mk-system)
+                                                     {:cmd :generate-fonts :input {"font/ttf" ttfpath}}))]
+              (t/is (ex/error? err))
+              (t/is (= :media-processor-timeout (:code (ex-data err)))))
+            (finally
+              (fs/delete ttfpath))))))))
+
+;; ---------------------------------------------------------------------------
+;; Status code handling (service-request)
+;; ---------------------------------------------------------------------------
+
+(t/deftest service-request-raises-on-400
+  (t/testing "service-request raises :validation on status 400"
+    (with-mocks [mock {:target 'app.http.client/req
+                       :return {:status 400
+                                :body (json-stream {:type "validation"
+                                                    :code "invalid-image"
+                                                    :hint "bad input"})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [err (ex/try! (media.remote/service-request
+                            (mk-system)
+                            {:method :post
+                             :uri "http://localhost:6065/api/image/info"
+                             :body nil
+                             :headers {}}))]
+          (t/is (ex/error? err))
+          (t/is (= :validation (:type (ex-data err))))
+          (t/is (= :invalid-image (:code (ex-data err)))))))))
+
+(t/deftest service-request-raises-on-500
+  (t/testing "service-request raises :internal on status 500"
+    (with-mocks [mock {:target 'app.http.client/req
+                       :return {:status 500
+                                :body (json-stream {:type "internal"
+                                                    :code "processing-error"
+                                                    :hint "Internal server error"})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [err (ex/try! (media.remote/service-request
+                            (mk-system)
+                            {:method :post
+                             :uri "http://localhost:6065/api/image/info"
+                             :body nil
+                             :headers {}}))]
+          (t/is (ex/error? err))
+          (t/is (= :internal (:type (ex-data err))))
+          (t/is (= :processing-error (:code (ex-data err)))))))))
+
+(t/deftest service-request-passes-on-200
+  (t/testing "service-request returns response on status 200"
+    (with-mocks [mock {:target 'app.http.client/req
+                       :return {:status 200
+                                :body (json-stream {:width 100 :height 100})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [resp (media.remote/service-request
+                    (mk-system)
+                    {:method :post
+                     :uri "http://localhost:6065/api/image/info"
+                     :body nil
+                     :headers {}})]
+          (t/is (= 200 (:status resp))))))))
+
+;; ---------------------------------------------------------------------------
+;; Shared key
+;; ---------------------------------------------------------------------------
+
+(t/deftest shared-key-sent-correctly
+  (t/testing "x-shared-key header matches the system's shared key"
+    (with-mocks [mock {:target 'app.media.remote/service-request
+                       :return {:status 200
+                                :body (json-stream {:width 1 :height 1 :mtype "image/jpeg" :size 1 :orientation 1})}}]
+      (with-redefs [cf/get (th/config-get-mock config-mock)]
+        (let [system {::setup/shared-keys {:media-processor "my-secret-key-123"}}]
+          (media.remote/process system
+                                {:cmd   :info
+                                 :input {:path (th/tempfile "backend_tests/test_files/sample.jpg")
+                                         :mtype "image/jpeg"}})
+          (let [[system-arg _] (:call-args @mock)]
+            ;; System passed through correctly
+            (t/is (= "my-secret-key-123"
+                     (-> system-arg ::setup/shared-keys :media-processor)))))))))
+
+;; ---------------------------------------------------------------------------
+;; Stream closure
+;; ---------------------------------------------------------------------------
+
+(defn- tracking-stream
+  "Create an InputStream that tracks whether it was closed.
+   Returns a map with :stream (the InputStream) and :closed (an atom)."
+  [^bytes data]
+  (let [closed (atom false)
+        delegate (ByteArrayInputStream. data)
+        stream (proxy [java.io.InputStream] []
+                 (read
+                   ([] (.read delegate))
+                   ([^bytes b] (.read delegate b))
+                   ([^bytes b off len] (.read delegate b off len)))
+                 (close []
+                   (reset! closed true)
+                   (.close delegate)))]
+    {:stream stream :closed closed}))
+
+(t/deftest info-closes-response-stream
+  (t/testing "info closes the response stream after parsing JSON"
+    (let [json-str "{\"width\":100,\"height\":100,\"mtype\":\"image/jpeg\",\"size\":1,\"orientation\":1}"
+          json-data (.getBytes json-str "UTF-8")
+          {:keys [stream closed]} (tracking-stream json-data)]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body stream}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (let [path (th/tempfile "backend_tests/test_files/sample.jpg")]
+            (media.remote/process (mk-system)
+                                  {:cmd   :info
+                                   :input {:path path :mtype "image/jpeg"}})
+            ;; Stream should be closed after processing
+            (t/is @closed)))))))
+
+(t/deftest font-convert-closes-response-stream
+  (t/testing "font-convert closes the response stream after writing"
+    (let [{:keys [stream closed]} (tracking-stream (.getBytes "fake-font-data" "UTF-8"))]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body stream}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (let [ttfbytes (io/read* (io/resource "backend_tests/test_files/font-1.ttf"))
+                ttfpath  (write-font-tmp ttfbytes ".ttf")]
+            (try
+              (media.remote/process (mk-system)
+                                    {:cmd   :generate-fonts
+                                     :input {"font/ttf" ttfpath}})
+              ;; Stream should be closed after processing
+              (t/is @closed)
+              (finally
+                (fs/delete ttfpath)))))))))
+
+(t/deftest thumbnail-closes-response-stream
+  (t/testing "thumbnail closes the response stream after writing"
+    (let [{:keys [stream closed]} (tracking-stream (.getBytes "fake-thumbnail-data" "UTF-8"))]
+      (with-mocks [mock {:target 'app.media.remote/service-request
+                         :return {:status 200
+                                  :body stream}}]
+        (with-redefs [cf/get (th/config-get-mock config-mock)]
+          (let [path (th/tempfile "backend_tests/test_files/sample.jpg")]
+            (media.remote/process (mk-system)
+                                  {:cmd    :generic-thumbnail
+                                   :input  {:path path :mtype "image/jpeg"}
+                                   :format :jpeg
+                                   :quality 85
+                                   :width  200
+                                   :height 200})
+            ;; Stream should be closed after processing
+            (t/is @closed)))))))
diff --git a/backend/test/backend_tests/media_test.clj b/backend/test/backend_tests/media_test.clj
index f4d6d78e81..eb2f2517c7 100644
--- a/backend/test/backend_tests/media_test.clj
+++ b/backend/test/backend_tests/media_test.clj
@@ -8,6 +8,7 @@
   (:require
    [app.common.exceptions :as ex]
    [app.media :as media]
+   [app.media.svg :as svg]
    [backend-tests.helpers :as th]
    [clojure.test :as t]
    [datoteka.fs :as fs]))
@@ -55,6 +56,87 @@
       (t/is (pos? (:width info)))
       (t/is (pos? (:height info))))))
 
+(t/deftest sanitize-svg-script-tag
+  (t/testing "sanitize-svg removes script tags"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><script>alert('xss')</script><rect width=\"50\" height=\"50\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "<script>")))
+      (t/is (not (clojure.string/includes? result "alert")))
+      (t/is (clojure.string/includes? result "<rect")))))
+
+(t/deftest sanitize-svg-event-handlers
+  (t/testing "sanitize-svg removes event handler attributes"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\" onload=\"alert('xss')\"><rect width=\"50\" height=\"50\" onmouseover=\"alert('xss')\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "onload")))
+      (t/is (not (clojure.string/includes? result "onmouseover")))
+      (t/is (not (clojure.string/includes? result "alert")))
+      (t/is (clojure.string/includes? result "<rect")))))
+
+(t/deftest sanitize-svg-javascript-href
+  (t/testing "sanitize-svg removes javascript: URLs from href attributes"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"100\" height=\"100\"><a xlink:href=\"javascript:alert('xss')\"><rect width=\"50\" height=\"50\"/></a></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "javascript:")))
+      (t/is (not (clojure.string/includes? result "alert")))
+      (t/is (clojure.string/includes? result "<a")))))
+
+(t/deftest sanitize-svg-foreign-object
+  (t/testing "sanitize-svg removes foreignObject elements"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><foreignObject width=\"100\" height=\"100\"><body xmlns=\"http://www.w3.org/1999/xhtml\"><script>alert('xss')</script></body></foreignObject><rect width=\"50\" height=\"50\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "foreignObject")))
+      (t/is (not (clojure.string/includes? result "<script>")))
+      (t/is (clojure.string/includes? result "<rect")))))
+
+(t/deftest sanitize-svg-clean-content
+  (t/testing "sanitize-svg preserves clean SVG content"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><rect width=\"50\" height=\"50\" fill=\"red\"/><circle cx=\"75\" cy=\"75\" r=\"20\" fill=\"blue\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (clojure.string/includes? result "<rect"))
+      (t/is (clojure.string/includes? result "<circle"))
+      (t/is (or (clojure.string/includes? result "fill=\"red\"")
+                (clojure.string/includes? result "fill='red'")))
+      (t/is (or (clojure.string/includes? result "fill=\"blue\"")
+                (clojure.string/includes? result "fill='blue'"))))))
+
+(t/deftest sanitize-svg-invalid-svg-rejected
+  (t/testing "sanitize-svg rejects malformed SVG input"
+    (let [svg "<svg><not-closed>"]
+      (t/is (thrown-with-msg? Exception #"SVG parsing failed during sanitization"
+                              (svg/sanitize-svg svg))))))
+
+(t/deftest sanitize-svg-preserves-xlink
+  (t/testing "sanitize-svg preserves legitimate xlink:href attributes"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"100\" height=\"100\"><use xlink:href=\"#icon\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (clojure.string/includes? result "xlink:href"))
+      (t/is (clojure.string/includes? result "#icon")))))
+
+(t/deftest sanitize-svg-javascript-href-whitespace
+  (t/testing "sanitize-svg catches javascript: URLs with leading whitespace"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><a href=\" javascript:alert('xss')\"><rect width=\"50\" height=\"50\"/></a></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "javascript:")))
+      (t/is (not (clojure.string/includes? result "alert")))
+      (t/is (clojure.string/includes? result "<a")))))
+
+(t/deftest sanitize-svg-nested-script
+  (t/testing "sanitize-svg removes script tags from nested elements"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><g><script>alert('xss')</script></g></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "<script")))
+      (t/is (not (clojure.string/includes? result "alert")))
+      (t/is (clojure.string/includes? result "<g")))))
+
+(t/deftest sanitize-svg-smil-bypass
+  (t/testing "sanitize-svg removes SMIL animation elements that can set on* attrs"
+    (let [svg "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"100\" height=\"100\"><rect width=\"100\" height=\"100\" id=\"r\"/><set attributeName=\"onmouseover\" to=\"alert('xss')\" xlink:href=\"#r\" begin=\"0s\"/></svg>"
+          result (svg/sanitize-svg svg)]
+      (t/is (not (clojure.string/includes? result "<set")))
+      (t/is (not (clojure.string/includes? result "onmouseover")))
+      (t/is (clojure.string/includes? result "<rect")))))
+
 (t/deftest info-invalid-image
   (t/testing "info on invalid image raises error"
     (let [path (fs/create-tempfile :prefix "penpot-test-" :suffix ".jpg")]
diff --git a/backend/test/backend_tests/rpc_access_tokens_test.clj b/backend/test/backend_tests/rpc_access_tokens_test.clj
index 5554633b72..bdb2f20887 100644
--- a/backend/test/backend_tests/rpc_access_tokens_test.clj
+++ b/backend/test/backend_tests/rpc_access_tokens_test.clj
@@ -9,6 +9,7 @@
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
+   [app.http.access-token :as actoken]
    [app.rpc :as-alias rpc]
    [app.storage :as sto]
    [backend-tests.helpers :as th]
@@ -29,8 +30,7 @@
     (t/testing "create access token without expiration date"
       (let [params {::th/type :create-access-token
                     ::rpc/profile-id (:id prof)
-                    :name "token 1"
-                    :perms ["get-profile"]}
+                    :name "token 1"}
             out    (th/command! params)]
         ;; (th/print-result! out)
         (t/is (nil? (:error out)))
@@ -40,13 +40,25 @@
           (t/is (contains? result :id))
           (t/is (contains? result :created-at))
           (t/is (contains? result :updated-at))
-          (t/is (contains? result :token)))))
+          (t/is (contains? result :token))
+          (t/is (not (contains? result :perms))))))
+
+    (t/testing "create access token ignores client-supplied perms"
+      (let [params {::th/type :create-access-token
+                    ::rpc/profile-id (:id prof)
+                    :name "token ignored-perms"
+                    :perms ["error-reports:read"]}
+            out    (th/command! params)]
+        (t/is (nil? (:error out)))
+        (let [result (:result out)
+              row    (th/db-get :access-token {:id (:id result)})]
+          (t/is (not (contains? result :perms)))
+          (t/is (= [] (db/decode-pgarray (:perms row) []))))))
 
     (t/testing "create access token with expiration date in the future"
       (let [params {::th/type :create-access-token
                     ::rpc/profile-id (:id prof)
                     :name "token 1"
-                    :perms ["get-profile"]
                     :expiration "130h"}
             out    (th/command! params)]
         ;; (th/print-result! out)
@@ -64,7 +76,6 @@
       (let [params {::th/type :create-access-token
                     ::rpc/profile-id (:id prof)
                     :name "token 1"
-                    :perms ["get-profile"]
                     :expiration "-130h"}
             out    (th/command! params)]
         ;; (th/print-result! out)
@@ -85,11 +96,12 @@
         ;; (th/print-result! out)
         (t/is (nil? (:error out)))
         (let [[result :as results] (:result out)]
-          (t/is (= 3 (count results)))
+          (t/is (= 4 (count results)))
           (t/is (contains? result :id))
           (t/is (contains? result :created-at))
           (t/is (contains? result :updated-at))
-          (t/is (not (contains? result :token))))))
+          (t/is (not (contains? result :token)))
+          (t/is (not (contains? result :perms))))))
 
     (t/testing "delete access token"
       (let [params {::th/type :delete-access-token
@@ -107,14 +119,13 @@
         ;; (th/print-result! out)
         (t/is (nil? (:error out)))
         (let [results (:result out)]
-          (t/is (= 2 (count results))))))
+          (t/is (= 3 (count results))))))
 
     (t/testing "get mcp token"
       (let [_ (th/command! {::th/type :create-access-token
                             ::rpc/profile-id (:id prof)
                             :type "mcp"
-                            :name "token 1"
-                            :perms ["get-profile"]})
+                            :name "token 1"})
             {:keys [error result]}
             (th/command! {::th/type :get-current-mcp-token
                           ::rpc/profile-id (:id prof)})]
@@ -126,16 +137,14 @@
       (let [;; Create a regular token
             regular-out (th/command! {::th/type :create-access-token
                                       ::rpc/profile-id (:id prof)
-                                      :name "regular token"
-                                      :perms ["get-profile"]})
+                                      :name "regular token"})
             regular-token (:result regular-out)
 
             ;; Create an MCP token
             mcp-out (th/command! {::th/type :create-access-token
                                   ::rpc/profile-id (:id prof)
                                   :type "mcp"
-                                  :name "mcp token"
-                                  :perms []})
+                                  :name "mcp token"})
             mcp-token (:result mcp-out)
 
             ;; Fetch all tokens
@@ -163,24 +172,21 @@
             first-out (th/command! {::th/type :create-access-token
                                     ::rpc/profile-id (:id prof)
                                     :type "mcp"
-                                    :name "first mcp"
-                                    :perms []})
+                                    :name "first mcp"})
             first-mcp (:result first-out)
 
             ;; Create second MCP token
             second-out (th/command! {::th/type :create-access-token
                                      ::rpc/profile-id (:id prof)
                                      :type "mcp"
-                                     :name "second mcp"
-                                     :perms []})
+                                     :name "second mcp"})
             second-mcp (:result second-out)
 
             ;; Create third MCP token
             third-out (th/command! {::th/type :create-access-token
                                     ::rpc/profile-id (:id prof)
                                     :type "mcp"
-                                    :name "third mcp"
-                                    :perms []})
+                                    :name "third mcp"})
             third-mcp (:result third-out)
 
             ;; Fetch all tokens
@@ -200,3 +206,29 @@
           (t/is (not (contains? all-ids (:id first-mcp))))
           (t/is (not (contains? all-ids (:id second-mcp))))
           (t/is (contains? all-ids (:id third-mcp))))))))
+
+(t/deftest mcp-tokens-cannot-be-used-as-access-tokens
+  (let [prof (th/create-profile* 1 {:is-active true})
+        cfg  th/*system*]
+
+    (t/testing "MCP tokens use different issuer claim"
+      (let [{:keys [result]} (th/command! {::th/type :create-access-token
+                                           ::rpc/profile-id (:id prof)
+                                           :type "mcp"
+                                           :name "mcp token"})
+            mcp-token (:token result)
+
+            ;; Try to decode as access token (should fail)
+            decoded (actoken/decode-token cfg mcp-token)]
+        (t/is (nil? decoded))))
+
+    (t/testing "Regular access tokens use access-token issuer claim"
+      (let [{:keys [result]} (th/command! {::th/type :create-access-token
+                                           ::rpc/profile-id (:id prof)
+                                           :name "regular token"})
+            access-token (:token result)
+
+            ;; Should decode successfully
+            decoded (actoken/decode-token cfg access-token)]
+        (t/is (some? decoded))
+        (t/is (= (:id prof) (:uid decoded)))))))
diff --git a/backend/test/backend_tests/rpc_audit_test.clj b/backend/test/backend_tests/rpc_audit_test.clj
index 9b6c0181a4..f4cb76f2a3 100644
--- a/backend/test/backend_tests/rpc_audit_test.clj
+++ b/backend/test/backend_tests/rpc_audit_test.clj
@@ -13,6 +13,7 @@
    [app.db :as db]
    [app.loggers.audit :as audit]
    [app.rpc :as-alias rpc]
+   [app.util.services :as sv]
    [backend-tests.helpers :as th]
    [clojure.test :as t]
    [yetti.request]))
@@ -498,3 +499,47 @@
       (t/is (some? (:tracked-at row)))
       (t/is (= {} (:props row)))
       (t/is (= {} (:context row))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; PREPARE-RPC-EVENT PROFILE-ID CONVERSION
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(t/deftest prepare-rpc-event-converts-string-profile-id-to-uuid
+  ;; When result contains a string :profile-id (e.g. from error reports),
+  ;; prepare-rpc-event must convert it to a UUID for audit schema compliance.
+  (let [prof       (th/create-profile* 1 {:is-active true})
+        string-pid "33601240-a00b-11ea-ba1b-c554cc60e361"
+        expected   #uuid "33601240-a00b-11ea-ba1b-c554cc60e361"
+        mdata      {::sv/name "test-cmd"}
+        params     {::rpc/profile-id (:id prof)
+                    ::rpc/request-id (uuid/next)
+                    ::rpc/request-at (ct/now)}
+        mock-req   (reify
+                     yetti.request/IRequest
+                     (get-header [_ _] nil)
+                     (remote-addr [_] "127.0.0.1"))
+        params     (with-meta params {:app.http/request mock-req})
+        result     {:profile-id string-pid :some-data "value"}
+        event      (audit/prepare-rpc-event th/*system* mdata params result)]
+    ;; profile-id must be a UUID, not a string
+    (t/is (uuid? (:profile-id event)))
+    (t/is (= expected (:profile-id event)))))
+
+(t/deftest prepare-rpc-event-handles-invalid-string-profile-id
+  ;; When result contains an invalid string :profile-id, it should fall back
+  ;; to the RPC params profile-id (which is always a valid UUID).
+  (let [prof   (th/create-profile* 1 {:is-active true})
+        mdata  {::sv/name "test-cmd"}
+        params {::rpc/profile-id (:id prof)
+                ::rpc/request-id (uuid/next)
+                ::rpc/request-at (ct/now)}
+        mock-req (reify
+                   yetti.request/IRequest
+                   (get-header [_ _] nil)
+                   (remote-addr [_] "127.0.0.1"))
+        params (with-meta params {:app.http/request mock-req})
+        result {:profile-id "not-a-valid-uuid"}
+        event  (audit/prepare-rpc-event th/*system* mdata params result)]
+    ;; profile-id must fall back to the RPC params profile-id
+    (t/is (uuid? (:profile-id event)))
+    (t/is (= (:id prof) (:profile-id event)))))
diff --git a/backend/test/backend_tests/rpc_binfile_test.clj b/backend/test/backend_tests/rpc_binfile_test.clj
new file mode 100644
index 0000000000..536a980339
--- /dev/null
+++ b/backend/test/backend_tests/rpc_binfile_test.clj
@@ -0,0 +1,34 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.rpc-binfile-test
+  (:require
+   [app.common.schema :as sm]
+   [app.common.uuid :as uuid]
+   [app.rpc :as-alias rpc]
+   [app.rpc.commands.binfile :as binfile]
+   [backend-tests.helpers :as th]
+   [clojure.test :as t]
+   [datoteka.fs :as fs]))
+
+(t/use-fixtures :once th/state-init)
+(t/use-fixtures :each th/database-reset)
+
+(t/deftest import-binfile-schema-omits-file-id
+  ;; N1-06: file-id parameter must be removed from schema for security
+  (let [schema @#'binfile/schema:import-binfile
+        validator (sm/lazy-validator schema)
+
+        valid-params {:name "test"
+                      :project-id (uuid/random)
+                      :version 3
+                      :upload-id (uuid/random)}]
+
+    (t/is (true? (validator valid-params))
+          "params without file-id should be valid")
+
+    (t/is (not (contains? (sm/keys (second schema)) :file-id))
+          "file-id should not be a declared parameter")))
diff --git a/backend/test/backend_tests/rpc_commands_error_reports_test.clj b/backend/test/backend_tests/rpc_commands_error_reports_test.clj
new file mode 100644
index 0000000000..c317fe0cbd
--- /dev/null
+++ b/backend/test/backend_tests/rpc_commands_error_reports_test.clj
@@ -0,0 +1,288 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en Espana SL
+
+(ns backend-tests.rpc-commands-error-reports-test
+  (:require
+   [app.common.time :as ct]
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.db :as db]
+   [app.loggers.audit :as audit]
+   [app.rpc :as-alias rpc]
+   [app.util.services :as sv]
+   [backend-tests.helpers :as th]
+   [clojure.test :as t]
+   [cuerdas.core :as str]
+   [yetti.request]))
+
+(t/use-fixtures :once th/state-init)
+(t/use-fixtures :each th/database-reset)
+
+(def ^:private error-reports-read #{"error-reports:read"})
+
+(defn- insert-report!
+  "Insert a raw error report row. content is a plain map (will be tjson-encoded)."
+  [sys {:keys [id source content created-at]
+        :or {created-at (ct/now)}}]
+  (th/db-insert! :server-error-report
+                 {:id (or id (uuid/next))
+                  :source source
+                  :created-at created-at
+                  :content (db/tjson content)}))
+
+(defn- token-cmd
+  "Invoke an RPC method as an access token with the given perms."
+  [profile params & {:keys [perms] :or {perms error-reports-read}}]
+  (th/command! (assoc params
+                      ::rpc/profile-id (:id profile)
+                      ::rpc/auth-type :token
+                      ::rpc/token-perms perms)))
+
+(defn- session-cmd
+  "Invoke an RPC method as a session-authenticated profile."
+  [profile params]
+  (th/command! (assoc params
+                      ::rpc/profile-id (:id profile)
+                      ::rpc/auth-type :session)))
+
+;; --- Auth tests
+
+(t/deftest get-error-reports-requires-authentication
+  (let [out (th/command! {::th/type :get-error-reports})]
+    (t/is (not (th/success? out)))
+    (t/is (= :authentication (th/ex-type (:error out))))
+    (t/is (= :authentication-required (th/ex-code (:error out))))))
+
+(t/deftest get-error-reports-requires-token-auth
+  (let [profile (th/create-profile* 1 {:is-active true})
+        out     (session-cmd profile {::th/type :get-error-reports})]
+    (t/is (not (th/success? out)))
+    (t/is (= :authorization (th/ex-type (:error out))))
+    (t/is (= :token-auth-required (th/ex-code (:error out))))))
+
+(t/deftest get-error-reports-requires-perm
+  (let [profile (th/create-profile* 1 {:is-active true})
+        out     (token-cmd profile {::th/type :get-error-reports} :perms #{})]
+    (t/is (not (th/success? out)))
+    (t/is (= :authorization (th/ex-type (:error out))))
+    (t/is (= :missing-perms (th/ex-code (:error out))))))
+
+(t/deftest get-error-reports-allows-token-with-perm
+  (let [profile (th/create-profile* 1 {:is-active true})
+        out     (token-cmd profile {::th/type :get-error-reports})]
+    (t/is (th/success? out))
+    (t/is (vector? (:items (:result out))))
+    (t/is (zero? (count (:items (:result out)))))))
+
+;; --- List shape
+
+(t/deftest get-error-reports-returns-summary-shape
+  (let [id      (uuid/next)
+        profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system*
+                    {:id id
+                     :source 3
+                     :content {:hint "test error"
+                               :tenant "devenv"
+                               :version "2.20.0-devenv"}})
+    (let [out    (token-cmd profile {::th/type :get-error-reports})
+          result (:result out)]
+      (t/is (th/success? out))
+      (t/is (vector? (:items result)))
+      (t/is (= 1 (count (:items result))))
+      (let [item (first (:items result))]
+        (t/is (= id (:id item)))
+        (t/is (= "logging" (:source item)))
+        (t/is (= "test error" (:hint item)))
+        (t/is (= "devenv" (:tenant item)))
+        (t/is (= "2.20.0-devenv" (:version item)))
+        (t/is (nil? (:content item)))
+        (t/is (nil? (:kind item)))))))
+
+;; --- Filters
+
+(t/deftest get-error-reports-filter-by-source
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "backend error"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 4 :content {:hint "frontend error"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 5 :content {:hint "rlimit error"}})
+    (let [out (token-cmd profile {::th/type :get-error-reports :source "audit-log"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (= "audit-log" (:source (first (:items (:result out)))))))))
+
+(t/deftest get-error-reports-filter-by-kind
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system* {:id (uuid/next) :source 4 :content {:hint "page err" :kind "exception-page"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 4 :content {:hint "unhandled" :kind "unhandled-exception"}})
+    (let [out (token-cmd profile {::th/type :get-error-reports :kind "exception-page"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (= "exception-page" (:kind (first (:items (:result out)))))))))
+
+(t/deftest get-error-reports-filter-by-tenant
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "a" :tenant "tenant-a"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "b" :tenant "tenant-b"}})
+    (let [out (token-cmd profile {::th/type :get-error-reports :tenant "tenant-a"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (= "tenant-a" (:tenant (first (:items (:result out)))))))))
+
+(t/deftest get-error-reports-filter-by-hint-ilike
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "NullPointerException in render"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "Timeout connecting to DB"}})
+    (let [out (token-cmd profile {::th/type :get-error-reports :hint "null"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (str/includes? (:hint (first (:items (:result out)))) "Null")))))
+
+;; --- Kind normalization (old ~:origin vs new ~:kind)
+
+(t/deftest get-error-reports-kind-normalization
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (insert-report! th/*system* {:id (uuid/next) :source 4 :content {:hint "old shape" :origin "old-origin"}})
+    (insert-report! th/*system* {:id (uuid/next) :source 4 :content {:hint "new shape" :kind "new-kind"}})
+    ;; Both should appear in unfiltered list
+    (let [out (token-cmd profile {::th/type :get-error-reports})]
+      (t/is (th/success? out))
+      (t/is (= 2 (count (:items (:result out))))))
+    ;; Filtering by kind should match old ~:origin
+    (let [out (token-cmd profile {::th/type :get-error-reports :kind "old-origin"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (= "old shape" (:hint (first (:items (:result out)))))))
+    ;; Filtering by kind should match new ~:kind
+    (let [out (token-cmd profile {::th/type :get-error-reports :kind "new-kind"})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (:items (:result out)))))
+      (t/is (= "new shape" (:hint (first (:items (:result out)))))))))
+
+;; --- Pagination
+
+(t/deftest get-error-reports-pagination
+  (let [profile (th/create-profile* 1 {:is-active true})
+        t1 (ct/in-past "10m")
+        t2 (ct/in-past "9m")
+        t3 (ct/in-past "8m")
+        t4 (ct/in-past "7m")]
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "1"} :created-at t1})
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "2"} :created-at t2})
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "3"} :created-at t3})
+    (insert-report! th/*system* {:id (uuid/next) :source 3 :content {:hint "4"} :created-at t4})
+    ;; Page 1: oldest 2 (ASC order)
+    (let [out (token-cmd profile {::th/type :get-error-reports :limit 2})]
+      (t/is (th/success? out))
+      (let [{:keys [items next-since next-id]} (:result out)]
+        (t/is (= 2 (count items)))
+        (t/is (some? next-since))
+        (t/is (some? next-id))
+        (t/is (= "1" (:hint (first items))))
+        (t/is (= "2" (:hint (second items))))
+        ;; Page 2: next 2, using since and since-id from page 1
+        (let [out2 (token-cmd profile {::th/type :get-error-reports :limit 2 :since next-since :since-id next-id})]
+          (t/is (th/success? out2))
+          (let [{:keys [items next-since]} (:result out2)]
+            (t/is (= 2 (count items)))
+            (t/is (nil? next-since))
+            (t/is (= "3" (:hint (first items))))
+            (t/is (= "4" (:hint (second items))))))))))
+
+(t/deftest get-error-reports-pagination-same-timestamp
+  (let [profile (th/create-profile* 1 {:is-active true})
+        t (ct/in-past "5m")
+        id1 (uuid/next)
+        id2 (uuid/next)
+        id3 (uuid/next)]
+    (insert-report! th/*system* {:id id1 :source 3 :content {:hint "1"} :created-at t})
+    (insert-report! th/*system* {:id id2 :source 3 :content {:hint "2"} :created-at t})
+    (insert-report! th/*system* {:id id3 :source 3 :content {:hint "3"} :created-at t})
+    ;; Page 1: first 2 of the 3 same-timestamp rows
+    (let [out (token-cmd profile {::th/type :get-error-reports :limit 2})]
+      (t/is (th/success? out))
+      (let [{:keys [items next-since next-id]} (:result out)]
+        (t/is (= 2 (count items)))
+        (t/is (some? next-since))
+        (t/is (some? next-id))
+        ;; Page 2: should return the remaining row, not skip it
+        (let [out2 (token-cmd profile {::th/type :get-error-reports :limit 2 :since next-since :since-id next-id})]
+          (t/is (th/success? out2))
+          (let [{:keys [items next-since]} (:result out2)]
+            (t/is (= 1 (count items)))
+            (t/is (nil? next-since))))))))
+
+;; --- Single fetch
+
+(t/deftest get-error-report-requires-token-auth
+  (let [profile (th/create-profile* 1 {:is-active true})
+        id (uuid/next)]
+    (insert-report! th/*system* {:id id :source 3 :content {:hint "single report" :tenant "devenv"}})
+    (let [out (session-cmd profile {::th/type :get-error-report :id id})]
+      (t/is (not (th/success? out)))
+      (t/is (= :authorization (th/ex-type (:error out))))
+      (t/is (= :token-auth-required (th/ex-code (:error out)))))))
+
+(t/deftest get-error-report-requires-perm
+  (let [profile (th/create-profile* 1 {:is-active true})
+        id (uuid/next)]
+    (insert-report! th/*system* {:id id :source 3 :content {:hint "single report"}})
+    (let [out (token-cmd profile {::th/type :get-error-report :id id} :perms #{})]
+      (t/is (not (th/success? out)))
+      (t/is (= :authorization (th/ex-type (:error out))))
+      (t/is (= :missing-perms (th/ex-code (:error out)))))))
+
+(t/deftest get-error-report-success
+  (let [profile (th/create-profile* 1 {:is-active true})
+        id (uuid/next)]
+    (insert-report! th/*system* {:id id :source 3 :content {:hint "single report" :tenant "devenv"}})
+    (let [out (token-cmd profile {::th/type :get-error-report :id id})]
+      (t/is (th/success? out))
+      (let [result (:result out)]
+        (t/is (= id (:id result)))
+        (t/is (= "logging" (:source result)))
+        (t/is (= "single report" (:hint result)))
+        (t/is (= "devenv" (:tenant result)))))))
+
+(t/deftest get-error-report-not-found
+  (let [profile (th/create-profile* 1 {:is-active true})
+        out     (token-cmd profile {::th/type :get-error-report :id (uuid/next)})]
+    (t/is (not (th/success? out)))
+    (t/is (= :not-found (th/ex-type (:error out))))
+    (t/is (= :report-not-found (th/ex-code (:error out))))))
+
+;; --- Audit event tests
+
+(t/deftest get-error-report-audit-event-has-uuid-profile-id
+  ;; When get-error-report returns a report with string profile-id in content,
+  ;; the audit event must have a proper UUID profile-id (not a string).
+  ;; This tests the prepare-rpc-event function directly since the test RPC
+  ;; flow doesn't include the audit middleware wrapper.
+  (let [profile  (th/create-profile* 1 {:is-active true})
+        id       (uuid/next)
+        orig-pid "33601240-a00b-11ea-ba1b-c554cc60e361"
+        ;; Simulate the result from get-error-report with string profile-id
+        result   {:id id
+                  :source "logging"
+                  :hint "test error"
+                  :profile-id orig-pid}
+        mdata    {::sv/name "get-error-report"}
+        params   {::rpc/profile-id (:id profile)
+                  ::rpc/request-id (uuid/next)
+                  ::rpc/request-at (ct/now)}
+        mock-req (reify yetti.request/IRequest
+                   (get-header [_ _] nil)
+                   (remote-addr [_] "127.0.0.1"))
+        params   (with-meta params {:app.http/request mock-req})
+        event    (audit/prepare-rpc-event th/*system* mdata params result)]
+    ;; profile-id must be a UUID, not a string
+    (t/is (uuid? (:profile-id event)))
+    (t/is (= #uuid "33601240-a00b-11ea-ba1b-c554cc60e361" (:profile-id event)))))
+
+;; Note: The integration of access token middleware with audit context is tested
+;; via unit tests in rpc_audit_test.clj and http_middleware_test.clj.
+;; The middleware sets ::id and ::type on the request, and prepare-context-from-request
+;; reads these values to populate :access-token-id and :access-token-type in the context.
diff --git a/backend/test/backend_tests/rpc_feedback_test.clj b/backend/test/backend_tests/rpc_feedback_test.clj
new file mode 100644
index 0000000000..13231db61b
--- /dev/null
+++ b/backend/test/backend_tests/rpc_feedback_test.clj
@@ -0,0 +1,39 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.rpc-feedback-test
+  (:require
+   [app.common.schema :as sm]
+   [app.rpc.commands.feedback :as feedback]
+   [clojure.test :as t]))
+
+(t/deftest send-user-feedback-schema-validation
+  (let [schema feedback/schema:send-user-feedback]
+
+    (t/testing "accepts valid feedback with all fields"
+      (let [params {:subject "Test subject"
+                    :content "Test content"
+                    :type "bug"
+                    :error-href "https://example.com/error"
+                    :error-report "Error details here"}]
+        (t/is (sm/valid? schema params))))
+
+    (t/testing "accepts feedback without optional fields"
+      (let [params {:subject "Test subject"
+                    :content "Test content"}]
+        (t/is (sm/valid? schema params))))
+
+    (t/testing "accepts error-report up to 1MiB"
+      (let [params {:subject "Test subject"
+                    :content "Test content"
+                    :error-report (apply str (repeat 1048576 "x"))}]
+        (t/is (sm/valid? schema params))))
+
+    (t/testing "rejects error-report exceeding 1MiB"
+      (let [params {:subject "Test subject"
+                    :content "Test content"
+                    :error-report (apply str (repeat 1048577 "x"))}]
+        (t/is (not (sm/valid? schema params)))))))
diff --git a/backend/test/backend_tests/rpc_file_test.clj b/backend/test/backend_tests/rpc_file_test.clj
index 5460b4143f..cb0997576d 100644
--- a/backend/test/backend_tests/rpc_file_test.clj
+++ b/backend/test/backend_tests/rpc_file_test.clj
@@ -141,6 +141,31 @@
         (let [result (:result out)]
           (t/is (= 0 (count result))))))))
 
+(t/deftest create-file-with-duplicate-id
+  (let [prof    (th/create-profile* 1 {:is-active true})
+        proj-id (:default-project-id prof)
+        file-id (uuid/next)]
+
+    (t/testing "create file with specific id"
+      (let [data {::th/type :create-file
+                  ::rpc/profile-id (:id prof)
+                  :project-id proj-id
+                  :id file-id
+                  :name "first-file"}
+            out  (th/command! data)]
+        (t/is (nil? (:error out)))))
+
+    (t/testing "create file with duplicate id returns normalized error"
+      (let [data {::th/type :create-file
+                  ::rpc/profile-id (:id prof)
+                  :project-id proj-id
+                  :id file-id
+                  :name "duplicate-file"}
+            out  (th/command! data)
+            err  (:error out)]
+        (t/is (th/ex-info? err))
+        (t/is (th/ex-of-type? err :not-found))))))
+
 (t/deftest file-gc-with-fragments
   (let [profile (th/create-profile* 1)
         file    (th/create-file* 1 {:profile-id (:id profile)
@@ -983,6 +1008,38 @@
     (t/is (some? sync))
     (t/is (some? (:synced-at sync)))))
 
+(t/deftest link-file-to-library-rejects-cross-team
+  ;; N1-08: A file in team2 must not be linked to a library in team1,
+  ;; even when the user has edit permissions on both (BOLA / CWE-639).
+  (let [prof1  (th/create-profile* 1)
+        prof2  (th/create-profile* 2)
+        team1  (th/create-team* 1 {:profile-id (:id prof1)})
+        team2  (th/create-team* 2 {:profile-id (:id prof2)})
+        proj1  (th/create-project* 1 {:profile-id (:id prof1)
+                                      :team-id (:id team1)})
+        proj2  (th/create-project* 2 {:profile-id (:id prof2)
+                                      :team-id (:id team2)})
+        lib    (th/create-file* 1 {:project-id (:id proj1)
+                                   :profile-id (:id prof1)
+                                   :is-shared true})
+        file2  (th/create-file* 2 {:project-id (:id proj2)
+                                   :profile-id (:id prof2)})]
+
+    ;; Add prof2 as editor to team1 so they have edit access to the library
+    (th/db-insert! :team-profile-rel {:team-id (:id team1)
+                                      :profile-id (:id prof2)
+                                      :is-owner false
+                                      :is-admin false
+                                      :can-edit true})
+
+    ;; prof2 tries to link file2 (team2) to lib (team1) — must fail
+    (let [data {::th/type :link-file-to-library
+                ::rpc/profile-id (:id prof2)
+                :file-id (:id file2)
+                :library-id (:id lib)}
+          out  (th/command! data)]
+      (t/is (some? (:error out))))))
+
 (t/deftest update-file-library-sync-status-updates-sync-row
   (let [profile  (th/create-profile* 1)
         file1    (th/create-file* 1 {:project-id (:default-project-id profile)
@@ -2319,3 +2376,75 @@
     (t/is (not (nil? (:error out))))
     (let [edata (-> out :error ex-data)]
       (t/is (= :not-found (:type edata))))))
+
+;; --- Security Fix Tests ---
+
+(t/deftest link-file-to-library-circular-reference
+  (let [profile (th/create-profile* 1)
+        file1   (th/create-file* 1 {:profile-id (:id profile)
+                                    :project-id (:default-project-id profile)
+                                    :is-shared true})
+        file2   (th/create-file* 2 {:profile-id (:id profile)
+                                    :project-id (:default-project-id profile)
+                                    :is-shared true})
+        file3   (th/create-file* 3 {:profile-id (:id profile)
+                                    :project-id (:default-project-id profile)
+                                    :is-shared false})]
+    (th/link-file-to-library* {:file-id (:id file3) :library-id (:id file2)})
+    (th/link-file-to-library* {:file-id (:id file2) :library-id (:id file1)})
+    (let [data {::th/type :link-file-to-library
+                ::rpc/profile-id (:id profile)
+                :file-id (:id file1)
+                :library-id (:id file3)}
+          out  (th/command! data)]
+      (t/is (th/ex-info? (:error out)))
+      (t/is (th/ex-of-type? (:error out) :validation))
+      (let [edata (-> out :error ex-data)]
+        (t/is (= :circular-library-reference (:code edata)))))))
+
+(t/deftest get-file-etag-includes-deleted-at
+  (let [profile-id (uuid/random)
+        file1      {:modified-at (ct/now)
+                    :revn 1
+                    :vern 0
+                    :deleted-at nil
+                    :permissions {:can-edit true}}
+        file2      (assoc file1 :deleted-at (ct/now))]
+    (t/is (not= (files/get-file-etag {::rpc/profile-id profile-id} file1)
+                (files/get-file-etag {::rpc/profile-id profile-id} file2)))))
+
+(t/deftest search-files-with-permission
+  (let [profile (th/create-profile* 1)
+        _       (th/create-file* 1 {:profile-id (:id profile)
+                                    :project-id (:default-project-id profile)
+                                    :is-shared false})
+        data    {::th/type :search-files
+                 ::rpc/profile-id (:id profile)
+                 :team-id (:default-team-id profile)
+                 :search-term "test"}
+        out     (th/command! data)]
+    (t/is (nil? (:error out)))
+    (t/is (vector? (:result out)))))
+
+(t/deftest search-files-forbidden
+  (let [profile (th/create-profile* 1)
+        other   (th/create-profile* 2)
+        data    {::th/type :search-files
+                 ::rpc/profile-id (:id other)
+                 :team-id (:default-team-id profile)
+                 :search-term "test"}
+        out     (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (let [edata (-> out :error ex-data)]
+      (t/is (= :not-found (:type edata))))))
+
+(t/deftest search-files-term-too-long
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :search-files
+                 ::rpc/profile-id (:id profile)
+                 :team-id (:default-team-id profile)
+                 :search-term (apply str (repeat 300 "x"))}
+        out     (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (let [edata (-> out :error ex-data)]
+      (t/is (= :validation (:type edata))))))
diff --git a/backend/test/backend_tests/rpc_font_test.clj b/backend/test/backend_tests/rpc_font_test.clj
index 234bcba89e..d7b326e5ed 100644
--- a/backend/test/backend_tests/rpc_font_test.clj
+++ b/backend/test/backend_tests/rpc_font_test.clj
@@ -24,312 +24,6 @@
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
-(t/deftest ttf-font-upload-1
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof    (th/create-profile* 1 {:is-active true})
-          team-id (:default-team-id prof)
-          proj-id (:default-project-id prof)
-          font-id (uuid/custom 10 1)
-
-          ttfdata (-> (io/resource "backend_tests/test_files/font-1.ttf")
-                      (io/read*))
-
-          params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id font-id
-                   :font-family "somefont"
-                   :font-weight 400
-                   :font-style "normal"
-                   :data {"font/ttf" ttfdata}}
-          out     (th/command! params)]
-
-      (t/is (= 1 (:call-count @mock)))
-
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out)))
-      (let [result (:result out)]
-        (t/is (uuid? (:id result)))
-        (t/is (uuid? (:ttf-file-id result)))
-        (t/is (uuid? (:otf-file-id result)))
-        (t/is (uuid? (:woff1-file-id result)))
-        (t/are [k] (= (get params k)
-                      (get result k))
-          :team-id
-          :font-id
-          :font-family
-          :font-weight
-          :font-style)))))
-
-(t/deftest ttf-font-upload-2
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-
-        data    (-> (io/resource "backend_tests/test_files/font-1.woff")
-                    (io/read*))
-
-        params  {::th/type :create-font-variant
-                 ::rpc/profile-id (:id prof)
-                 :team-id team-id
-                 :font-id font-id
-                 :font-family "somefont"
-                 :font-weight 400
-                 :font-style "normal"
-                 :data {"font/woff" data}}
-        out     (th/command! params)]
-
-    ;; (th/print-result! out)
-    (t/is (nil? (:error out)))
-    (let [result (:result out)]
-      (t/is (uuid? (:id result)))
-      (t/is (uuid? (:ttf-file-id result)))
-      (t/is (uuid? (:otf-file-id result)))
-      (t/is (uuid? (:woff1-file-id result)))
-      (t/are [k] (= (get params k)
-                    (get result k))
-        :team-id
-        :font-id
-        :font-family
-        :font-weight
-        :font-style))))
-
-(t/deftest woff2-font-upload-1
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-
-        data    (-> (io/resource "backend_tests/test_files/font-1.woff2")
-                    (io/read*))
-
-        params  {::th/type :create-font-variant
-                 ::rpc/profile-id (:id prof)
-                 :team-id team-id
-                 :font-id font-id
-                 :font-family "somefont"
-                 :font-weight 400
-                 :font-style "normal"
-                 :data {"font/woff2" data}}
-        out     (th/command! params)]
-
-    ;; (th/print-result! out)
-    (t/is (nil? (:error out)))
-    (let [result (:result out)]
-      (t/is (uuid? (:id result)))
-      (t/is (uuid? (:ttf-file-id result)))
-      (t/is (uuid? (:otf-file-id result)))
-      (t/is (uuid? (:woff1-file-id result)))
-      (t/is (uuid? (:woff2-file-id result)))
-      (t/are [k] (= (get params k)
-                    (get result k))
-        :team-id
-        :font-id
-        :font-family
-        :font-weight
-        :font-style))))
-
-(t/deftest font-deletion-1
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-
-        data1   (-> (io/resource "backend_tests/test_files/font-1.woff")
-                    (io/read*))
-
-        data2   (-> (io/resource "backend_tests/test_files/font-2.woff")
-                    (io/read*))]
-
-    ;; Create front variant
-    (let [params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id font-id
-                   :font-family "somefont"
-                   :font-weight 400
-                   :font-style "normal"
-                   :data {"font/woff" data1}}
-          out     (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out))))
-
-    (let [params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id font-id
-                   :font-family "somefont"
-                   :font-weight 500
-                   :font-style "normal"
-                   :data {"font/woff" data2}}
-          out     (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out))))
-
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 6 (:freeze res))))
-
-    (let [params {::th/type :delete-font
-                  ::rpc/profile-id (:id prof)
-                  :team-id team-id
-                  :id font-id}
-          out    (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out)))
-      (t/is (nil? (:result out))))
-
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 0 (:freeze res)))
-      (t/is (= 0 (:delete res))))
-
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
-      (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 2 (:processed res)))))
-
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
-      (let [res (th/run-task! :storage-gc-touched {})]
-        (t/is (= 0 (:freeze res)))
-        (t/is (= 6 (:delete res)))))))
-
-(t/deftest font-deletion-2
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-
-        data1   (-> (io/resource "backend_tests/test_files/font-1.woff")
-                    (io/read*))
-
-        data2   (-> (io/resource "backend_tests/test_files/font-2.woff")
-                    (io/read*))]
-
-    ;; Create front variant
-    (let [params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id font-id
-                   :font-family "somefont"
-                   :font-weight 400
-                   :font-style "normal"
-                   :data {"font/woff" data1}}
-          out     (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out))))
-
-    (let [params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id (uuid/custom 10 2)
-                   :font-family "somefont"
-                   :font-weight 400
-                   :font-style "normal"
-                   :data {"font/woff" data2}}
-          out     (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out))))
-
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 6 (:freeze res))))
-
-    (let [params {::th/type :delete-font
-                  ::rpc/profile-id (:id prof)
-                  :team-id team-id
-                  :id font-id}
-          out    (th/command! params)]
-      ;; (th/print-result! out)
-      (t/is (nil? (:error out)))
-      (t/is (nil? (:result out))))
-
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 0 (:freeze res)))
-      (t/is (= 0 (:delete res))))
-
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
-      (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 1 (:processed res)))))
-
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
-      (let [res (th/run-task! :storage-gc-touched {})]
-        (t/is (= 0 (:freeze res)))
-        (t/is (= 3 (:delete res)))))))
-
-(t/deftest font-deletion-3
-  (let [prof    (th/create-profile* 1 {:is-active true})
-        team-id (:default-team-id prof)
-        proj-id (:default-project-id prof)
-        font-id (uuid/custom 10 1)
-        data1   (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
-        data2   (-> (io/resource "backend_tests/test_files/font-2.woff") (io/read*))
-        params1 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
-                 :team-id team-id :font-id font-id :font-family "somefont"
-                 :font-weight 400 :font-style "normal" :data {"font/woff" data1}}
-        params2 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
-                 :team-id team-id :font-id font-id :font-family "somefont"
-                 :font-weight 500 :font-style "normal" :data {"font/woff" data2}}
-        out1    (th/command! params1)
-        out2    (th/command! params2)]
-    (t/is (nil? (:error out1)))
-    (t/is (nil? (:error out2)))
-
-    ;; freeze with hours 3 clock
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 6 (:freeze res))))
-
-    (let [params {::th/type :delete-font-variant ::rpc/profile-id (:id prof)
-                  :team-id team-id :id (-> out1 :result :id)}
-          out    (th/command! params)]
-      (t/is (nil? (:error out)))
-      (t/is (nil? (:result out))))
-
-    ;; no-op with hours 3 clock (nothing touched yet)
-    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
-                (th/run-task! :storage-gc-touched {}))]
-      (t/is (= 0 (:freeze res)))
-      (t/is (= 0 (:delete res))))
-
-    ;; objects-gc at days 8, then storage-gc-touched at days 8 + 3h
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
-      (let [res (th/run-task! :objects-gc {})]
-        (t/is (= 1 (:processed res)))))
-
-    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
-      (let [res (th/run-task! :storage-gc-touched {})]
-        (t/is (= 0 (:freeze res)))
-        (t/is (= 3 (:delete res)))))))
-
-(t/deftest input-sanitization-1
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof    (th/create-profile* 1 {:is-active true})
-          team-id (:default-team-id prof)
-          proj-id (:default-project-id prof)
-          font-id (uuid/custom 10 1)
-
-          ttfdata (-> (io/resource "backend_tests/test_files/font-1.ttf")
-                      (io/read*))
-
-          params  {::th/type :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id team-id
-                   :font-id font-id
-                   :font-family "somefont"
-                   :font-weight 400
-                   :font-style "normal"
-                   :data {"font/ttf" "/etc/passwd"}}
-          out     (th/command! params)]
-
-      (t/is (= 0 (:call-count @mock)))
-      ;; (th/print-result! out)
-
-      (let [error      (:error out)
-            error-data (ex-data error)]
-        (t/is (th/ex-info? error))))))
-
 ;; -----------------------------------------------------------------------
 ;; Helpers for chunked-upload font tests
 ;; -----------------------------------------------------------------------
@@ -399,119 +93,211 @@
     :font-weight
     :font-style))
 
-;; -----------------------------------------------------------------------
-;; Path 1 – Normal (direct :data bytes)
-;; -----------------------------------------------------------------------
+(t/deftest font-deletion-1
+  (let [prof    (th/create-profile* 1 {:is-active true})
+        team-id (:default-team-id prof)
+        proj-id (:default-project-id prof)
+        font-id (uuid/custom 10 1)
 
-(t/deftest create-font-variant-normal-ttf
+        data1   (-> (io/resource "backend_tests/test_files/font-1.woff")
+                    (io/read*))
+
+        data2   (-> (io/resource "backend_tests/test_files/font-2.woff")
+                    (io/read*))]
+
+    ;; Create font variant
+    (let [session-id (upload-font-chunked! prof data1 "font/woff" (* 4 1024 1024))
+          params  {::th/type :create-font-variant
+                   ::rpc/profile-id (:id prof)
+                   :team-id team-id
+                   :font-id font-id
+                   :font-family "somefont"
+                   :font-weight 400
+                   :font-style "normal"
+                   :uploads {"font/woff" session-id}}
+          out     (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out))))
+
+    (let [session-id (upload-font-chunked! prof data2 "font/woff" (* 4 1024 1024))
+          params  {::th/type :create-font-variant
+                   ::rpc/profile-id (:id prof)
+                   :team-id team-id
+                   :font-id font-id
+                   :font-family "somefont"
+                   :font-weight 500
+                   :font-style "normal"
+                   :uploads {"font/woff" session-id}}
+          out     (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out))))
+
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 6 (:freeze res))))
+
+    (let [params {::th/type :delete-font
+                  ::rpc/profile-id (:id prof)
+                  :team-id team-id
+                  :id font-id}
+          out    (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out)))
+      (t/is (nil? (:result out))))
+
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 0 (:freeze res)))
+      (t/is (= 0 (:delete res))))
+
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
+      (let [res (th/run-task! :objects-gc {})]
+        (t/is (= 2 (:processed res)))))
+
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
+        (t/is (= 0 (:freeze res)))
+        (t/is (= 6 (:delete res)))))))
+
+(t/deftest font-deletion-2
+  (let [prof    (th/create-profile* 1 {:is-active true})
+        team-id (:default-team-id prof)
+        proj-id (:default-project-id prof)
+        font-id (uuid/custom 10 1)
+
+        data1   (-> (io/resource "backend_tests/test_files/font-1.woff")
+                    (io/read*))
+
+        data2   (-> (io/resource "backend_tests/test_files/font-2.woff")
+                    (io/read*))]
+
+    ;; Create font variant
+    (let [session-id (upload-font-chunked! prof data1 "font/woff" (* 4 1024 1024))
+          params  {::th/type :create-font-variant
+                   ::rpc/profile-id (:id prof)
+                   :team-id team-id
+                   :font-id font-id
+                   :font-family "somefont"
+                   :font-weight 400
+                   :font-style "normal"
+                   :uploads {"font/woff" session-id}}
+          out     (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out))))
+
+    (let [session-id (upload-font-chunked! prof data2 "font/woff" (* 4 1024 1024))
+          params  {::th/type :create-font-variant
+                   ::rpc/profile-id (:id prof)
+                   :team-id team-id
+                   :font-id (uuid/custom 10 2)
+                   :font-family "somefont"
+                   :font-weight 400
+                   :font-style "normal"
+                   :uploads {"font/woff" session-id}}
+          out     (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out))))
+
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 6 (:freeze res))))
+
+    (let [params {::th/type :delete-font
+                  ::rpc/profile-id (:id prof)
+                  :team-id team-id
+                  :id font-id}
+          out    (th/command! params)]
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out)))
+      (t/is (nil? (:result out))))
+
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 0 (:freeze res)))
+      (t/is (= 0 (:delete res))))
+
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
+      (let [res (th/run-task! :objects-gc {})]
+        (t/is (= 1 (:processed res)))))
+
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
+        (t/is (= 0 (:freeze res)))
+        (t/is (= 3 (:delete res)))))))
+
+(t/deftest font-deletion-3
+  (let [prof    (th/create-profile* 1 {:is-active true})
+        team-id (:default-team-id prof)
+        proj-id (:default-project-id prof)
+        font-id (uuid/custom 10 1)
+        data1   (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
+        data2   (-> (io/resource "backend_tests/test_files/font-2.woff") (io/read*))
+        sid1    (upload-font-chunked! prof data1 "font/woff" (* 4 1024 1024))
+        sid2    (upload-font-chunked! prof data2 "font/woff" (* 4 1024 1024))
+        params1 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
+                 :team-id team-id :font-id font-id :font-family "somefont"
+                 :font-weight 400 :font-style "normal" :uploads {"font/woff" sid1}}
+        params2 {::th/type :create-font-variant ::rpc/profile-id (:id prof)
+                 :team-id team-id :font-id font-id :font-family "somefont"
+                 :font-weight 500 :font-style "normal" :uploads {"font/woff" sid2}}
+        out1    (th/command! params1)
+        out2    (th/command! params2)]
+    (t/is (nil? (:error out1)))
+    (t/is (nil? (:error out2)))
+
+    ;; freeze with hours 3 clock
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 6 (:freeze res))))
+
+    (let [params {::th/type :delete-font-variant ::rpc/profile-id (:id prof)
+                  :team-id team-id :id (-> out1 :result :id)}
+          out    (th/command! params)]
+      (t/is (nil? (:error out)))
+      (t/is (nil? (:result out))))
+
+    ;; no-op with hours 3 clock (nothing touched yet)
+    (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
+                (th/run-task! :storage-gc-touched {}))]
+      (t/is (= 0 (:freeze res)))
+      (t/is (= 0 (:delete res))))
+
+    ;; objects-gc at days 8, then storage-gc-touched at days 8 + 3h
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8}))]
+      (let [res (th/run-task! :objects-gc {})]
+        (t/is (= 1 (:processed res)))))
+
+    (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:days 8 :hours 3}))]
+      (let [res (th/run-task! :storage-gc-touched {})]
+        (t/is (= 0 (:freeze res)))
+        (t/is (= 3 (:delete res)))))))
+
+(t/deftest input-sanitization-1
   (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
     (let [prof    (th/create-profile* 1 {:is-active true})
           team-id (:default-team-id prof)
-          font-id (uuid/custom 10 10)
-          data    (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))
-          params  {::th/type    :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id     team-id
-                   :font-id     font-id
-                   :font-family "chunked-test"
-                   :font-weight 400
-                   :font-style  "normal"
-                   :data        {"font/ttf" data}}
-          out     (th/command! params)]
-      (t/is (= 1 (:call-count @mock)))
-      (t/is (nil? (:error out)))
-      (assert-font-variant-result params (:result out)))))
+          proj-id (:default-project-id prof)
+          font-id (uuid/custom 10 1)
 
-(t/deftest create-font-variant-normal-otf
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof    (th/create-profile* 1 {:is-active true})
-          team-id (:default-team-id prof)
-          font-id (uuid/custom 10 11)
-          data    (-> (io/resource "backend_tests/test_files/font-1.otf") (io/read*))
-          params  {::th/type    :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id     team-id
-                   :font-id     font-id
-                   :font-family "chunked-test"
-                   :font-weight 400
-                   :font-style  "normal"
-                   :data        {"font/otf" data}}
-          out     (th/command! params)]
-      (t/is (= 1 (:call-count @mock)))
-      (t/is (nil? (:error out)))
-      (assert-font-variant-result params (:result out)))))
+          ttfdata (-> (io/resource "backend_tests/test_files/font-1.ttf")
+                      (io/read*))
 
-(t/deftest create-font-variant-normal-woff
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof    (th/create-profile* 1 {:is-active true})
-          team-id (:default-team-id prof)
-          font-id (uuid/custom 10 12)
-          data    (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
-          params  {::th/type    :create-font-variant
+          session-id (upload-font-chunked! prof ttfdata "font/ttf" (* 4 1024 1024))
+          params  {::th/type :create-font-variant
                    ::rpc/profile-id (:id prof)
-                   :team-id     team-id
-                   :font-id     font-id
-                   :font-family "chunked-test"
+                   :team-id team-id
+                   :font-id font-id
+                   :font-family "somefont"
                    :font-weight 400
-                   :font-style  "normal"
-                   :data        {"font/woff" data}}
+                   :font-style "normal"
+                   :uploads {"font/ttf" session-id}}
           out     (th/command! params)]
-      (t/is (= 1 (:call-count @mock)))
-      (t/is (nil? (:error out)))
-      (assert-font-variant-result params (:result out)))))
+
+      ;; (th/print-result! out)
+      (t/is (nil? (:error out))))))
 
 ;; -----------------------------------------------------------------------
-;; Path 2 – Legacy chunking (:data with vector of byte-arrays per mtype)
-;; -----------------------------------------------------------------------
-
-(t/deftest create-font-variant-legacy-chunked-ttf
-  "Upload a TTF via the legacy :data path where each mtype value is a
-   vector of byte-array chunks (4 MiB each) instead of a single byte-array."
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof       (th/create-profile* 1 {:is-active true})
-          team-id    (:default-team-id prof)
-          font-id    (uuid/custom 10 20)
-          full-bytes (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))
-          ;; Simulate 4 MiB legacy chunks – font is small so a single chunk suffices
-          chunks     (split-bytes-into-chunks full-bytes (* 4 1024 1024))
-          params     {::th/type    :create-font-variant
-                      ::rpc/profile-id (:id prof)
-                      :team-id     team-id
-                      :font-id     font-id
-                      :font-family "legacy-chunked"
-                      :font-weight 700
-                      :font-style  "italic"
-                      :data        {"font/ttf" (vec chunks)}}
-          out        (th/command! params)]
-      (t/is (= 1 (:call-count @mock)))
-      (t/is (nil? (:error out)))
-      (assert-font-variant-result params (:result out)))))
-
-(t/deftest create-font-variant-legacy-chunked-woff
-  "Upload a WOFF via the legacy :data path with multiple sub-4 KiB chunks
-   to exercise the SequenceInputStream concatenation path."
-  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof       (th/create-profile* 1 {:is-active true})
-          team-id    (:default-team-id prof)
-          font-id    (uuid/custom 10 21)
-          full-bytes (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
-          ;; Split into small chunks to exercise the SequenceInputStream path
-          chunks     (split-bytes-into-chunks full-bytes 512)
-          params     {::th/type    :create-font-variant
-                      ::rpc/profile-id (:id prof)
-                      :team-id     team-id
-                      :font-id     font-id
-                      :font-family "legacy-chunked-woff"
-                      :font-weight 400
-                      :font-style  "normal"
-                      :data        {"font/woff" (vec chunks)}}
-          out        (th/command! params)]
-      (t/is (= 1 (:call-count @mock)))
-      (t/is (nil? (:error out)))
-      (assert-font-variant-result params (:result out)))))
-
-;; -----------------------------------------------------------------------
-;; Path 3 – New standardized chunked upload (:uploads map)
+;; Chunked upload (:uploads map)
 ;; -----------------------------------------------------------------------
 
 (t/deftest create-font-variant-chunked-upload-ttf
@@ -606,8 +392,8 @@
 ;; Error cases
 ;; -----------------------------------------------------------------------
 
-(t/deftest create-font-variant-missing-data-and-uploads
-  "Neither :data nor :uploads is present — schema validation must reject it."
+(t/deftest create-font-variant-missing-uploads
+  "Missing :uploads — schema validation must reject it."
   (let [prof    (th/create-profile* 1 {:is-active true})
         team-id (:default-team-id prof)
         font-id (uuid/custom 10 40)
@@ -674,49 +460,6 @@
 ;; Font size validation tests
 ;; -----------------------------------------------------------------------
 
-(t/deftest create-font-variant-size-exceeded-normal
-  "Direct :data upload exceeding font-max-file-size must be rejected."
-  (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
-    (with-redefs [app.config/config (assoc app.config/config :font-max-file-size 1)]
-      (let [prof    (th/create-profile* 1 {:is-active true})
-            team-id (:default-team-id prof)
-            font-id (uuid/custom 10 50)
-            data    (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))
-            params  {::th/type    :create-font-variant
-                     ::rpc/profile-id (:id prof)
-                     :team-id     team-id
-                     :font-id     font-id
-                     :font-family "size-exceeded"
-                     :font-weight 400
-                     :font-style  "normal"
-                     :data        {"font/ttf" data}}
-            out     (th/command! params)]
-        (t/is (some? (:error out)))
-        (t/is (= :restriction (-> out :error ex-data :type)))
-        (t/is (= :font-max-file-size-reached (-> out :error ex-data :code)))))))
-
-(t/deftest create-font-variant-size-exceeded-legacy-chunked
-  "Legacy :data chunk-vector upload exceeding font-max-file-size must be rejected."
-  (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
-    (with-redefs [app.config/config (assoc app.config/config :font-max-file-size 1)]
-      (let [prof       (th/create-profile* 1 {:is-active true})
-            team-id    (:default-team-id prof)
-            font-id    (uuid/custom 10 51)
-            full-bytes (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
-            chunks     (split-bytes-into-chunks full-bytes (* 4 1024 1024))
-            params     {::th/type    :create-font-variant
-                        ::rpc/profile-id (:id prof)
-                        :team-id     team-id
-                        :font-id     font-id
-                        :font-family "size-exceeded-legacy"
-                        :font-weight 400
-                        :font-style  "normal"
-                        :data        {"font/woff" (vec chunks)}}
-            out        (th/command! params)]
-        (t/is (some? (:error out)))
-        (t/is (= :restriction (-> out :error ex-data :type)))
-        (t/is (= :font-max-file-size-reached (-> out :error ex-data :code)))))))
-
 (t/deftest create-font-variant-size-exceeded-chunked-upload
   "New :uploads path exceeding font-max-file-size must be rejected after assembly."
   (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
@@ -738,72 +481,10 @@
           (t/is (= :restriction (-> out :error ex-data :type)))
           (t/is (= :font-max-file-size-reached (-> out :error ex-data :code))))))))
 
-(t/deftest create-font-variant-size-within-limit
-  "Upload exactly at the limit must succeed."
-  (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof       (th/create-profile* 1 {:is-active true})
-          team-id    (:default-team-id prof)
-          font-id    (uuid/custom 10 53)
-          font-bytes (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))
-          font-size  (alength ^bytes font-bytes)]
-      (with-redefs [app.config/config (assoc app.config/config :font-max-file-size font-size)]
-        (let [params {::th/type    :create-font-variant
-                      ::rpc/profile-id (:id prof)
-                      :team-id     team-id
-                      :font-id     font-id
-                      :font-family "size-at-limit"
-                      :font-weight 400
-                      :font-style  "normal"
-                      :data        {"font/ttf" font-bytes}}
-              out    (th/command! params)]
-          (t/is (nil? (:error out)))
-          (assert-font-variant-result params (:result out)))))))
-
 ;; -----------------------------------------------------------------------
-;; Font media-type validation tests
+;; Font media-type validation
 ;; -----------------------------------------------------------------------
 
-(t/deftest create-font-variant-invalid-type-normal
-  "Direct :data upload with a disallowed mtype must be rejected."
-  (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof    (th/create-profile* 1 {:is-active true})
-          team-id (:default-team-id prof)
-          font-id (uuid/custom 10 60)
-          data    (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))
-          params  {::th/type    :create-font-variant
-                   ::rpc/profile-id (:id prof)
-                   :team-id     team-id
-                   :font-id     font-id
-                   :font-family "invalid-type"
-                   :font-weight 400
-                   :font-style  "normal"
-                   :data        {"application/octet-stream" data}}
-          out     (th/command! params)]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type)))
-      (t/is (= :media-type-not-allowed (-> out :error ex-data :code))))))
-
-(t/deftest create-font-variant-invalid-type-legacy-chunked
-  "Legacy :data chunk-vector upload with a disallowed mtype must be rejected."
-  (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
-    (let [prof       (th/create-profile* 1 {:is-active true})
-          team-id    (:default-team-id prof)
-          font-id    (uuid/custom 10 61)
-          full-bytes (-> (io/resource "backend_tests/test_files/font-1.woff") (io/read*))
-          chunks     (split-bytes-into-chunks full-bytes (* 4 1024 1024))
-          params     {::th/type    :create-font-variant
-                      ::rpc/profile-id (:id prof)
-                      :team-id     team-id
-                      :font-id     font-id
-                      :font-family "invalid-type-legacy"
-                      :font-weight 400
-                      :font-style  "normal"
-                      :data        {"image/png" (vec chunks)}}
-          out        (th/command! params)]
-      (t/is (some? (:error out)))
-      (t/is (= :validation (-> out :error ex-data :type)))
-      (t/is (= :media-type-not-allowed (-> out :error ex-data :code))))))
-
 (t/deftest create-font-variant-invalid-type-chunked-upload
   "New :uploads path with a disallowed mtype must be rejected after assembly."
   (with-mocks [_mock {:target 'app.rpc.quotes/check! :return nil}]
@@ -836,46 +517,50 @@
           data    (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))]
 
       ;; name with < should fail
-      (let [params {::th/type :create-font-variant
+      (let [session-id (upload-font-chunked! prof data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
                     ::rpc/profile-id (:id prof)
                     :team-id team-id :font-id font-id
                     :font-family "evil<script>alert(1)</script>"
                     :font-weight 400 :font-style "normal"
-                    :data {"font/ttf" data}}
+                    :uploads {"font/ttf" session-id}}
             out    (th/command! params)]
         (t/is (not (th/success? out)))
         (t/is (th/ex-of-type? (:error out) :validation))
         (t/is (th/ex-of-code? (:error out) :params-validation)))
 
       ;; name with ' should fail
-      (let [params {::th/type :create-font-variant
+      (let [session-id (upload-font-chunked! prof data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
                     ::rpc/profile-id (:id prof)
                     :team-id team-id :font-id font-id
                     :font-family "evil'name"
                     :font-weight 400 :font-style "normal"
-                    :data {"font/ttf" data}}
+                    :uploads {"font/ttf" session-id}}
             out    (th/command! params)]
         (t/is (not (th/success? out)))
         (t/is (th/ex-of-type? (:error out) :validation)))
 
       ;; name with } should fail
-      (let [params {::th/type :create-font-variant
+      (let [session-id (upload-font-chunked! prof data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
                     ::rpc/profile-id (:id prof)
                     :team-id team-id :font-id font-id
                     :font-family "evil}name"
                     :font-weight 400 :font-style "normal"
-                    :data {"font/ttf" data}}
+                    :uploads {"font/ttf" session-id}}
             out    (th/command! params)]
         (t/is (not (th/success? out)))
         (t/is (th/ex-of-type? (:error out) :validation)))
 
       ;; valid name should succeed
-      (let [params {::th/type :create-font-variant
+      (let [session-id (upload-font-chunked! prof data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
                     ::rpc/profile-id (:id prof)
                     :team-id team-id :font-id (uuid/custom 10 101)
                     :font-family "Source Sans Pro"
                     :font-weight 400 :font-style "normal"
-                    :data {"font/ttf" data}}
+                    :uploads {"font/ttf" session-id}}
             out    (th/command! params)]
         (t/is (th/success? out))))))
 
@@ -887,12 +572,13 @@
           data    (-> (io/resource "backend_tests/test_files/font-1.ttf") (io/read*))]
 
       ;; Create a valid font first
-      (let [params {::th/type :create-font-variant
+      (let [session-id (upload-font-chunked! prof data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
                     ::rpc/profile-id (:id prof)
                     :team-id team-id :font-id font-id
                     :font-family "ValidFont"
                     :font-weight 400 :font-style "normal"
-                    :data {"font/ttf" data}}
+                    :uploads {"font/ttf" session-id}}
             out    (th/command! params)]
         (t/is (th/success? out)))
 
@@ -922,3 +608,45 @@
                     :name "Valid Font Name"}
             out    (th/command! params)]
         (t/is (th/success? out))))))
+
+(t/deftest create-font-variant-rejects-foreign-font-id
+  ;; N2-07: A user with edit permissions on their own team must not be
+  ;; able to create a font variant using a font-id that already belongs
+  ;; to another team (BOLA / CWE-639).
+  (with-mocks [mock {:target 'app.rpc.quotes/check! :return nil}]
+    (let [prof1   (th/create-profile* 1 {:is-active true})
+          prof2   (th/create-profile* 2 {:is-active true})
+          team1   (:default-team-id prof1)
+          team2   (:default-team-id prof2)
+          font-id (uuid/custom 10 999)
+          data    (-> (io/resource "backend_tests/test_files/font-1.ttf")
+                      (io/read*))]
+
+      ;; prof1 creates a font variant in team1 with font-id
+      (let [session-id (upload-font-chunked! prof1 data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
+                    ::rpc/profile-id (:id prof1)
+                    :team-id     team1
+                    :font-id     font-id
+                    :font-family "SharedFont"
+                    :font-weight 400
+                    :font-style  "normal"
+                    :uploads     {"font/ttf" session-id}}
+            out    (th/command! params)]
+        (t/is (nil? (:error out))))
+
+      ;; prof2 tries to create a variant using the same font-id but
+      ;; in team2, which must be rejected because font-id belongs to team1
+      (let [session-id (upload-font-chunked! prof2 data "font/ttf" (* 4 1024 1024))
+            params {::th/type :create-font-variant
+                    ::rpc/profile-id (:id prof2)
+                    :team-id     team2
+                    :font-id     font-id
+                    :font-family "SharedFont"
+                    :font-weight 700
+                    :font-style  "normal"
+                    :uploads     {"font/ttf" session-id}}
+            out    (th/command! params)]
+        (t/is (some? (:error out)))
+        (t/is (= :not-found (-> out :error ex-data :type)))
+        (t/is (= :object-not-found (-> out :error ex-data :code)))))))
diff --git a/backend/test/backend_tests/rpc_management_nitrate_test.clj b/backend/test/backend_tests/rpc_management_nitrate_test.clj
index 8ca30ccfce..769b5ec535 100644
--- a/backend/test/backend_tests/rpc_management_nitrate_test.clj
+++ b/backend/test/backend_tests/rpc_management_nitrate_test.clj
@@ -11,8 +11,9 @@
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
    [app.config :as cf]
-   [app.db :as-alias db]
+   [app.db :as db]
    [app.email :as eml]
+   [app.http :as-alias http]
    [app.msgbus :as mbus]
    [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
@@ -20,34 +21,77 @@
    [backend-tests.helpers :as th]
    [clojure.set :as set]
    [clojure.test :as t]
-   [cuerdas.core :as str]))
+   [cuerdas.core :as str]
+   [mockery.core :refer [with-mocks]]))
+
+(t/use-fixtures :once (t/compose-fixtures
+                       (partial th/init-config [:enable-admin-console])
+                       th/init-system))
 
-(t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
-(defn- management-command-with-nitrate!
-  [data]
-  (th/management-command! data [:nitrate]))
-
 (t/deftest authenticate-success
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Nitrate User"})
-        out     (management-command-with-nitrate! {::th/type :authenticate
-                                                   ::rpc/profile-id (:id profile)})]
-    (t/is (th/success? out))
-    (t/is (= (:id profile) (-> out :result :id)))
-    (t/is (= "Nitrate User" (-> out :result :name)))
-    (t/is (= (:email profile) (-> out :result :email)))
-    (t/is (nil? (-> out :result :photo-url)))))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [profile (th/create-profile* 1 {:is-active true
+                                         :fullname "Nitrate User"})
+          out     (th/management-command! {::th/type :authenticate
+                                           ::rpc/profile-id (:id profile)})]
+      (t/is (th/success? out))
+      (t/is (= (:id profile) (-> out :result :id)))
+      (t/is (= "Nitrate User" (-> out :result :name)))
+      (t/is (= (:email profile) (-> out :result :email)))
+      (t/is (= (:created-at profile) (-> out :result :created-at)))
+      (t/is (nil? (-> out :result :photo-url))))))
 
 (t/deftest authenticate-requires-authentication
-  (let [out (management-command-with-nitrate! {::th/type :authenticate})]
+  (let [out (th/management-command! {::th/type :authenticate})]
     (t/is (not (th/success? out)))
     (t/is (= :authentication (th/ex-type (:error out))))
     (t/is (= :authentication-required (th/ex-code (:error out))))))
 
+(t/deftest create-and-update-organization-invitations-audit-props
+  (with-mocks [email-mock {:target 'app.email/send! :return nil}
+               audit-mock {:target 'app.loggers.audit/submit :return nil}
+               nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (binding [cf/flags (conj cf/flags :email-verification)]
+      (let [owner        (th/create-profile* 101 {:is-active true})
+            invitee      (th/create-profile* 102 {:is-active true})
+            organization {:id (uuid/random)
+                          :name "Acme"
+                          :initials "AC"
+                          :logo nil
+                          :avatar-bg-url nil}
+            params       {::th/type :invite-to-organization
+                          ::rpc/profile-id (:id owner)
+                          :email (:email invitee)
+                          :organization organization}
+            create-out   (th/management-command! params)
+            update-out   (th/management-command! params)
+            external-out (th/management-command! (assoc params :email "external@example.com"))
+            events       (mapv second (:call-args-list @audit-mock))
+            create-event (first (filter #(= "create-organization-invitation" (:name %)) events))
+            update-event (first (filter #(= "update-organization-invitation" (:name %)) events))
+            external-event
+            (first (filter #(= "external@example.com" (get-in % [:props :member-email])) events))]
+        (t/is (th/success? create-out))
+        (t/is (th/success? update-out))
+        (t/is (th/success? external-out))
+
+        (doseq [event [create-event update-event]]
+          (t/is (not (contains? (:props event) :event-origin)))
+          (t/is (= (str (:id owner))
+                   (get-in event [:props :user-who-send-invitation])))
+          (t/is (= (:id organization)
+                   (get-in event [:props :organization-id])))
+          (t/is (= (:email invitee)
+                   (get-in event [:props :member-email])))
+          (t/is (= (:id invitee)
+                   (get-in event [:props :member-id]))))
+
+        (t/is (not (contains? (:props external-event) :member-id)))))))
+
 (t/deftest get-penpot-version
-  (let [out     (management-command-with-nitrate! {::th/type :get-penpot-version})
+  (let [out     (th/management-command! {::th/type :get-penpot-version})
         version (-> out :result :version)]
     (t/is (th/success? out))
     (t/is (= #{:full :branch :base :main :major :minor :patch :modifier :commit :commit-hash}
@@ -58,24 +102,25 @@
     (t/is (= cf/version version))))
 
 (t/deftest get-teams-returns-only-owned-non-default-non-deleted
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        other        (th/create-profile* 2 {:is-active true})
-        owned-team   (th/create-team* 1 {:profile-id (:id profile)})
-        deleted-team (th/create-team* 2 {:profile-id (:id profile)})
-        _            (th/db-update! :team
-                                    {:deleted-at (ct/now)}
-                                    {:id (:id deleted-team)})
-        other-team   (th/create-team* 3 {:profile-id (:id other)})
-        _            (th/create-team-role* {:team-id (:id other-team)
-                                            :profile-id (:id profile)
-                                            :role :editor})
-        out          (management-command-with-nitrate! {::th/type :get-teams
-                                                        ::rpc/profile-id (:id profile)})]
-    (t/is (th/success? out))
-    (t/is (= #{(:id owned-team)}
-             (->> out :result (map :id) set)))
-    (t/is (= #{(:name owned-team)}
-             (->> out :result (map :name) set)))))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [profile      (th/create-profile* 1 {:is-active true})
+          other        (th/create-profile* 2 {:is-active true})
+          owned-team   (th/create-team* 1 {:profile-id (:id profile)})
+          deleted-team (th/create-team* 2 {:profile-id (:id profile)})
+          _            (th/db-update! :team
+                                      {:deleted-at (ct/now)}
+                                      {:id (:id deleted-team)})
+          other-team   (th/create-team* 3 {:profile-id (:id other)})
+          _            (th/create-team-role* {:team-id (:id other-team)
+                                              :profile-id (:id profile)
+                                              :role :editor})
+          out          (th/management-command! {::th/type :get-teams
+                                                ::rpc/profile-id (:id profile)})]
+      (t/is (th/success? out))
+      (t/is (= #{(:id owned-team)}
+               (->> out :result (map :id) set)))
+      (t/is (= #{(:name owned-team)}
+               (->> out :result (map :name) set))))))
 
 (t/deftest notify-team-change-publishes-event
   (let [team-id          (uuid/random)
@@ -89,15 +134,15 @@
         out              (with-redefs [mbus/pub! (fn [_cfg & {:keys [topic message]}]
                                                    (swap! calls conj {:topic topic
                                                                       :message message}))]
-                           (management-command-with-nitrate! {::th/type :notify-team-change
-                                                              :id team-id
-                                                              :is-your-penpot false
-                                                              :organization organization}))]
+                           (th/management-command! {::th/type :notify-team-change
+                                                    :id team-id
+                                                    :is-your-penpot false
+                                                    :organization organization}))]
     (t/is (th/success? out))
     (t/is (= 1 (count @calls)))
     (t/is (= uuid/zero (-> @calls first :topic)))
     (let [msg (-> @calls first :message)]
-      (t/is (= :team-org-change (:type msg)))
+      (t/is (= :team-organization-change (:type msg)))
       (t/is (= nil (:notification msg)))
       (t/is (= team-id (-> msg :team :id)))
       (t/is (= false (-> msg :team :is-your-penpot)))
@@ -107,1248 +152,1570 @@
       (t/is (= (:owner-id organization) (-> msg :team :organization :owner-id)))
       (t/is (= (:avatar-bg-url organization) (str (-> msg :team :organization :avatar-bg-url)))))))
 
-(t/deftest notify-user-added-to-organization-creates-default-org-team
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        before-teams (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
-                                                          :is-owner true})
-                          (map :team-id)
-                          set)
-        out          (management-command-with-nitrate! {::th/type :notify-user-added-to-organization
-                                                        :profile-id (:id profile)
-                                                        :organization-id (uuid/random)
-                                                        :role "owner"})
-        after-teams  (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
-                                                          :is-owner true})
-                          (map :team-id)
-                          set)
-        new-team-id  (first (set/difference after-teams before-teams))
-        new-team     (th/db-get :team {:id new-team-id})]
-    (t/is (th/success? out))
-    (t/is (= 1 (count (set/difference after-teams before-teams))))
-    (t/is (= "Your Penpot" (:name new-team)))
-    (t/is (true? (:is-default new-team)))))
+(t/deftest notify-user-added-to-organization-creates-default-organization-team
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call
+                             :return (fn [_ m _]
+                                       (case m
+                                         :set-team-organization {:success true}
+                                         nil))}]
+    (let [profile      (th/create-profile* 1 {:is-active true})
+          before-teams (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
+                                                            :is-owner true})
+                            (map :team-id)
+                            set)
+          out          (th/management-command! {::th/type :notify-user-added-to-organization
+                                                :profile-id (:id profile)
+                                                :organization-id (uuid/random)
+                                                :role "owner"})
+          after-teams  (->> (th/db-query :team-profile-rel {:profile-id (:id profile)
+                                                            :is-owner true})
+                            (map :team-id)
+                            set)
+          new-team-id  (first (set/difference after-teams before-teams))
+          new-team     (th/db-get :team {:id new-team-id})]
+      (t/is (th/success? out))
+      (t/is (= 1 (count (set/difference after-teams before-teams))))
+      (t/is (= "Your Penpot" (:name new-team)))
+      (t/is (true? (:is-default new-team))))))
 
 (t/deftest get-managed-profiles-returns-unique-members-for-owned-teams
-  (let [owner     (th/create-profile* 1 {:is-active true})
-        member1   (th/create-profile* 2 {:is-active true})
-        member2   (th/create-profile* 3 {:is-active true})
-        team1     (th/create-team* 1 {:profile-id (:id owner)})
-        team2     (th/create-team* 2 {:profile-id (:id owner)})
-        _         (th/create-team-role* {:team-id (:id team1)
-                                         :profile-id (:id member1)
-                                         :role :editor})
-        _         (th/create-team-role* {:team-id (:id team1)
-                                         :profile-id (:id member2)
-                                         :role :editor})
-        _         (th/create-team-role* {:team-id (:id team2)
-                                         :profile-id (:id member1)
-                                         :role :editor})
-        out       (management-command-with-nitrate! {::th/type :get-managed-profiles
-                                                     ::rpc/profile-id (:id owner)})]
-    (t/is (th/success? out))
-    (t/is (= #{(:id member1) (:id member2)}
-             (->> out :result (map :id) set)))
-    (t/is (= #{(:email member1) (:email member2)}
-             (->> out :result (map :email) set)))))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [owner     (th/create-profile* 1 {:is-active true})
+          member1   (th/create-profile* 2 {:is-active true})
+          member2   (th/create-profile* 3 {:is-active true})
+          team1     (th/create-team* 1 {:profile-id (:id owner)})
+          team2     (th/create-team* 2 {:profile-id (:id owner)})
+          _         (th/create-team-role* {:team-id (:id team1)
+                                           :profile-id (:id member1)
+                                           :role :editor})
+          _         (th/create-team-role* {:team-id (:id team1)
+                                           :profile-id (:id member2)
+                                           :role :editor})
+          _         (th/create-team-role* {:team-id (:id team2)
+                                           :profile-id (:id member1)
+                                           :role :editor})
+          out       (th/management-command! {::th/type :get-managed-profiles
+                                             ::rpc/profile-id (:id owner)})]
+      (t/is (th/success? out))
+      (t/is (= #{(:id member1) (:id member2)}
+               (->> out :result (map :id) set)))
+      (t/is (= #{(:email member1) (:email member2)}
+               (->> out :result (map :email) set))))))
 
 (t/deftest get-teams-summary-returns-teams-and-files-count
-  (let [profile (th/create-profile* 1 {:is-active true})
-        team1   (th/create-team* 1 {:profile-id (:id profile)})
-        team2   (th/create-team* 2 {:profile-id (:id profile)})
-        proj1   (th/create-project* 1 {:profile-id (:id profile)
-                                       :team-id (:id team1)})
-        proj2   (th/create-project* 2 {:profile-id (:id profile)
-                                       :team-id (:id team2)})
-        _       (th/create-file* 1 {:profile-id (:id profile)
-                                    :project-id (:id proj1)})
-        _       (th/create-file* 2 {:profile-id (:id profile)
-                                    :project-id (:id proj2)})
-        out     (management-command-with-nitrate! {::th/type :get-teams-summary
-                                                   ::rpc/profile-id (:id profile)
-                                                   :ids [(:id team1) (:id team2)]})]
-    (t/is (th/success? out))
-    (t/is (= 2 (-> out :result :num-files)))
-    (t/is (= #{(:id team1) (:id team2)}
-             (->> out :result :teams (map :id) set)))))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [profile (th/create-profile* 1 {:is-active true})
+          team1   (th/create-team* 1 {:profile-id (:id profile)})
+          team2   (th/create-team* 2 {:profile-id (:id profile)})
+          proj1   (th/create-project* 1 {:profile-id (:id profile)
+                                         :team-id (:id team1)})
+          proj2   (th/create-project* 2 {:profile-id (:id profile)
+                                         :team-id (:id team2)})
+          _       (th/create-file* 1 {:profile-id (:id profile)
+                                      :project-id (:id proj1)})
+          _       (th/create-file* 2 {:profile-id (:id profile)
+                                      :project-id (:id proj2)})
+          out     (th/management-command! {::th/type :get-teams-summary
+                                           ::rpc/profile-id (:id profile)
+                                           :ids [(:id team1) (:id team2)]})]
+      (t/is (th/success? out))
+      (t/is (= 2 (-> out :result :num-files)))
+      (t/is (= #{(:id team1) (:id team2)}
+               (->> out :result :teams (map :id) set))))))
 
 (t/deftest get-teams-detail-last-activity-reflects-file-modifications
-  (let [profile       (th/create-profile* 1 {:is-active true})
-        team          (th/create-team* 1 {:profile-id (:id profile)})
-        organization-id (uuid/random)
-        org-summary   {:id organization-id
-                       :teams [{:id (:id team)}]}
-        params        {::th/type :get-teams-detail
-                       ::rpc/profile-id (:id profile)
-                       :organization-id organization-id}
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks [nitrate-mock {:target 'app.nitrate/call
+                               :return (fn [_cfg method _params]
+                                         (case method
+                                           :get-organization-summary @organization-summary-ref
+                                           nil))}]
+      (let [profile                  (th/create-profile* 1 {:is-active true})
+            team                     (th/create-team* 1 {:profile-id (:id profile)})
+            organization-id          (uuid/random)
+            organization-summary              {:id organization-id
+                                               :teams [{:id (:id team)}]}
+            _                        (reset! organization-summary-ref organization-summary)
+            params                   {::th/type :get-teams-detail
+                                      ::rpc/profile-id (:id profile)
+                                      :organization-id organization-id}
+            call!                    (fn [] (th/management-command! params))
 
-        call!         (fn []
-                        (with-redefs [nitrate/call (fn [_cfg method _params]
-                                                     (case method
-                                                       :get-org-summary org-summary
-                                                       nil))]
-                          (management-command-with-nitrate! params)))
+            empty-out                (call!)
+            empty-team               (-> empty-out :result first)
 
-        empty-out     (call!)
-        empty-team    (-> empty-out :result first)
+            project                  (th/create-project* 1 {:profile-id (:id profile)
+                                                            :team-id (:id team)})
+            file                     (th/create-file* 1 {:profile-id (:id profile)
+                                                         :project-id (:id project)})
+            file-after-create        (th/db-get :file {:id (:id file)})
+            project-after-create     (th/db-get :project {:id (:id project)})
+            expected-activity-create (if (.isAfter (:modified-at file-after-create)
+                                                   (:modified-at project-after-create))
+                                       (:modified-at file-after-create)
+                                       (:modified-at project-after-create))
 
-        project       (th/create-project* 1 {:profile-id (:id profile)
-                                             :team-id (:id team)})
-        file          (th/create-file* 1 {:profile-id (:id profile)
-                                          :project-id (:id project)})
-        file-after-create (th/db-get :file {:id (:id file)})
-        project-after-create (th/db-get :project {:id (:id project)})
-        expected-activity-create (if (.isAfter (:modified-at file-after-create)
-                                               (:modified-at project-after-create))
-                                   (:modified-at file-after-create)
-                                   (:modified-at project-after-create))
+            with-file-out            (call!)
+            with-file                (-> with-file-out :result first)
 
-        with-file-out (call!)
-        with-file     (-> with-file-out :result first)
+            new-activity             (ct/in-future "1h")
+            _                        (th/db-update! :file
+                                                    {:modified-at new-activity}
+                                                    {:id (:id file)})
+            file-after-update        (th/db-get :file {:id (:id file)})
 
-        new-activity  (ct/in-future "1h")
-        _             (th/db-update! :file
-                                     {:modified-at new-activity}
-                                     {:id (:id file)})
-        file-after-update (th/db-get :file {:id (:id file)})
+            updated-out              (call!)
+            updated-team             (-> updated-out :result first)]
 
-        updated-out   (call!)
-        updated-team  (-> updated-out :result first)]
+        (t/is (th/success? empty-out))
+        (t/is (= (:id team) (:id empty-team)))
+        (t/is (nil? (:last-activity-at empty-team)))
 
-    (t/is (th/success? empty-out))
-    (t/is (= (:id team) (:id empty-team)))
-    (t/is (nil? (:last-activity-at empty-team)))
+        (t/is (th/success? with-file-out))
+        (t/is (= (:id team) (:id with-file)))
+        (t/is (= expected-activity-create (:last-activity-at with-file)))
 
-    (t/is (th/success? with-file-out))
-    (t/is (= (:id team) (:id with-file)))
-    (t/is (= expected-activity-create (:last-activity-at with-file)))
+        (t/is (th/success? updated-out))
+        (t/is (= (:id team) (:id updated-team)))
+        (t/is (= (:modified-at file-after-update) (:last-activity-at updated-team)))
+        (t/is (not= (:last-activity-at with-file) (:last-activity-at updated-team)))))))
 
-    (t/is (th/success? updated-out))
-    (t/is (= (:id team) (:id updated-team)))
-    (t/is (= (:modified-at file-after-update) (:last-activity-at updated-team)))
-    (t/is (not= (:last-activity-at with-file) (:last-activity-at updated-team)))))
+(t/deftest notify-organization-deletion-prefixes-teams-and-publishes-organization-deleted-event
+  ;; --- Deferred organization-summary: nil during setup, filled before RPC ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: return nil during profile/team creation,
+       ;; then serve the computed organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method params]
+                               (if @organization-summary-ref
+                                 @organization-summary-ref
+                                 nil))}
+       ;; --- Worker mock: capture delete-task submission ---
+       wrk-mock    {:target 'app.worker/submit! :return nil}
+       ;; --- Message bus mock: capture published events ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
 
-(t/deftest notify-organization-deletion-prefixes-teams-and-publishes-org-deleted-event
-  (let [profile           (th/create-profile* 1 {:is-active true})
-        ;; One team will have files -> it will be kept and renamed.
-        team-with-files   (th/db-get :team {:id (:default-team-id profile)})
-        project           (th/create-project* 1 {:profile-id (:id profile)
-                                                 :team-id (:id team-with-files)})
-        _                 (th/create-file* 1 {:profile-id (:id profile)
-                                              :project-id (:id project)})
+      ;; --- Setup: create a profile with two teams ---
+      (let [profile           (th/create-profile* 1 {:is-active true})
+            ;; --- Team with files: should be kept and renamed ---
+            team-with-files   (th/db-get :team {:id (:default-team-id profile)})
+            project           (th/create-project* 1 {:profile-id (:id profile)
+                                                     :team-id (:id team-with-files)})
+            _                 (th/create-file* 1 {:profile-id (:id profile)
+                                                  :project-id (:id project)})
+            ;; --- Empty team: should be soft-deleted ---
+            empty-team        (th/create-team* 1 {:profile-id (:id profile)})
 
-        ;; One team will be empty -> it will be soft-deleted.
-        empty-team        (th/create-team* 1 {:profile-id (:id profile)})
+            ;; --- Data needed by the RPC call ---
+            organization-id   (uuid/random)
+            organization-name "Acme / Design"
+            expected-start    (str "[" (d/sanitize-string organization-name) "] ")
+            ;; --- Org-summary that nitrate would return ---
+            organization-summary       {:id organization-id
+                                        :name organization-name
+                                        :teams [{:id (:id team-with-files)
+                                                 :is-your-penpot true}
+                                                {:id (:id empty-team)
+                                                 :is-your-penpot true}]}
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                 (reset! organization-summary-ref organization-summary)
 
-        organization-id   (uuid/random)
-        organization-name "Acme / Design"
-        expected-start    (str "[" (d/sanitize-string organization-name) "] ")
-        org-summary       {:id organization-id
-                           :name organization-name
-                           :teams [{:id (:id team-with-files)
-                                    :is-your-penpot true}
-                                   {:id (:id empty-team)
-                                    :is-your-penpot true}]}
-        calls             (atom [])
-        submitted         (atom [])
-        out               (with-redefs [nitrate/call (fn [_cfg method params]
-                                                       (t/is (= :get-org-summary method))
-                                                       (t/is (= {:organization-id organization-id} params))
-                                                       org-summary)
-                                        wrk/submit! (fn [task]
-                                                      (swap! submitted conj task)
-                                                      nil)
-                                        mbus/pub! (fn [_cfg & {:keys [topic message]}]
-                                                    (swap! calls conj {:topic topic
-                                                                       :message message}))]
-                            (management-command-with-nitrate! {::th/type :notify-organization-deletion
-                                                               ::rpc/profile-id (:id profile)
-                                                               :organization-id organization-id}))
-        updated-with-files (th/db-get :team {:id (:id team-with-files)} {::db/remove-deleted false})
-        updated-empty      (th/db-get :team {:id (:id empty-team)} {::db/remove-deleted false})]
-    (t/is (th/success? out))
-    (t/is (nil? (:result out)))
+            ;; --- Exercise: notify Penpot that an organization is deleted ---
+            out               (th/management-command! {::th/type :notify-organization-deletion
+                                                       ::rpc/profile-id (:id profile)
+                                                       :organization-id organization-id})
 
-    ;; Team with files is kept, unset as default, and renamed with org prefix.
-    (t/is (false? (:is-default updated-with-files)))
-    (t/is (str/starts-with? (:name updated-with-files) expected-start))
-    (t/is (nil? (:deleted-at updated-with-files)))
+            ;; --- Fetch teams post-deletion to verify mutations ---
+            updated-with-files (th/db-get :team {:id (:id team-with-files)} {::db/remove-deleted false})
+            updated-empty      (th/db-get :team {:id (:id empty-team)} {::db/remove-deleted false})]
 
-    ;; Empty team is soft-deleted and a delete task is submitted.
-    (t/is (some? (:deleted-at updated-empty)))
-    (t/is (= 1 (count @submitted)))
+        ;; --- Verify: nitrate was queried for the organization summary ---
+        (let [[_ method params] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params)))
 
-    ;; A single organization-deleted event is published.
-    (t/is (= 1 (count @calls)))
-    (let [{:keys [topic message]} (first @calls)]
-      (t/is (= uuid/zero topic))
-      (t/is (= :organization-deleted (:type message)))
-      (t/is (= organization-id (:organization-id message)))
-      (t/is (= organization-name (:organization-name message)))
-      (t/is (= #{(:id team-with-files) (:id empty-team)}
-               (set (:teams message))))
-      (t/is (= #{(:id empty-team)}
-               (set (:deleted-teams message)))))))
+        ;; --- Verify: RPC returns success with no result payload ---
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
 
-(t/deftest notify-user-organizations-deletion-renames-or-deletes-teams-and-publishes-per-org-events
-  (let [profile            (th/create-profile* 1 {:is-active true})
-        ;; org-1: one team with files, one empty
-        org-1-team-files   (th/db-get :team {:id (:default-team-id profile)})
-        org-1-proj         (th/create-project* 1 {:profile-id (:id profile)
-                                                  :team-id (:id org-1-team-files)})
-        _                  (th/create-file* 1 {:profile-id (:id profile)
-                                               :project-id (:id org-1-proj)})
-        org-1-team-empty   (th/create-team* 1 {:profile-id (:id profile)})
+        ;; --- Verify: team with files is kept, default flag removed, name prefixed ---
+        (t/is (false? (:is-default updated-with-files)))
+        (t/is (str/starts-with? (:name updated-with-files) expected-start))
+        (t/is (nil? (:deleted-at updated-with-files)))
 
-        ;; org-2: one team with files, one empty
-        org-2-team-files   (th/create-team* 2 {:profile-id (:id profile)})
-        org-2-proj         (th/create-project* 2 {:profile-id (:id profile)
-                                                  :team-id (:id org-2-team-files)})
-        _                  (th/create-file* 2 {:profile-id (:id profile)
-                                               :project-id (:id org-2-proj)})
-        org-2-team-empty   (th/create-team* 3 {:profile-id (:id profile)})
+        ;; --- Verify: empty team is soft-deleted and a background delete task is enqueued ---
+        (t/is (some? (:deleted-at updated-empty)))
+        (t/is (:called? @wrk-mock))
+        (t/is (= 1 (:call-count @wrk-mock)))
 
-        org-1-id           (uuid/random)
-        org-2-id           (uuid/random)
-        org-1-name         "Org One / Design"
-        org-2-name         "Org Two"
-        org-1-prefix       (str "[" (d/sanitize-string org-1-name) "] ")
-        org-2-prefix       (str "[" (d/sanitize-string org-2-name) "] ")
-        owned-orgs         [{:id org-1-id
-                             :name org-1-name
-                             :teams [{:id (:id org-1-team-files)
-                                      :is-your-penpot true}
-                                     {:id (:id org-1-team-empty)
-                                      :is-your-penpot true}]}
-                            {:id org-2-id
-                             :name org-2-name
-                             :teams [{:id (:id org-2-team-files)
-                                      :is-your-penpot true}
-                                     {:id (:id org-2-team-empty)
-                                      :is-your-penpot true}]}]
-        calls              (atom [])
-        submitted          (atom [])
-        out                (with-redefs [nitrate/call (fn [_cfg method params]
-                                                        (case method
-                                                          :get-owned-orgs
-                                                          (do
-                                                            (t/is (= {:profile-id (:id profile)} params))
-                                                            owned-orgs)
-                                                          nil))
-                                         wrk/submit! (fn [task]
-                                                       (swap! submitted conj task)
-                                                       nil)
-                                         mbus/pub! (fn [_cfg & {:keys [topic message]}]
-                                                     (swap! calls conj {:topic topic
-                                                                        :message message}))]
-                             (management-command-with-nitrate! {::th/type :notify-user-organizations-deletion
-                                                                ::rpc/profile-id (:id profile)
-                                                                :profile-id (:id profile)}))
-        org-1-updated-files (th/db-get :team {:id (:id org-1-team-files)} {::db/remove-deleted false})
-        org-1-updated-empty (th/db-get :team {:id (:id org-1-team-empty)} {::db/remove-deleted false})
-        org-2-updated-files (th/db-get :team {:id (:id org-2-team-files)} {::db/remove-deleted false})
-        org-2-updated-empty (th/db-get :team {:id (:id org-2-team-empty)} {::db/remove-deleted false})
-        msgs               (->> @calls (map :message) vec)
-        org-msg            (fn [org-name]
-                             (first (filter #(= org-name (:organization-name %)) msgs)))]
-    (t/is (th/success? out))
-    (t/is (nil? (:result out)))
+        ;; --- Verify: exactly one organization-deleted event is published on the message bus ---
+        (t/is (:called? @mbus-mock))
+        (let [msg (apply hash-map (rest (:call-args @mbus-mock)))]
+          (t/is (= uuid/zero (:topic msg)))
+          (t/is (= :organization-deleted (:type (:message msg))))
+          (t/is (= organization-id (:organization-id (:message msg))))
+          (t/is (= organization-name (:organization-name (:message msg))))
+          (t/is (= #{(:id team-with-files) (:id empty-team)}
+                   (set (:teams (:message msg)))))
+          (t/is (= #{(:id empty-team)}
+                   (set (:deleted-teams (:message msg))))))))))
 
-    ;; org-1: team with files renamed; empty team deleted
-    (t/is (false? (:is-default org-1-updated-files)))
-    (t/is (str/starts-with? (:name org-1-updated-files) org-1-prefix))
-    (t/is (nil? (:deleted-at org-1-updated-files)))
-    (t/is (some? (:deleted-at org-1-updated-empty)))
+(t/deftest notify-user-organizations-deletion-renames-or-deletes-teams-and-publishes-per-organization-events
+  ;; --- Deferred owned-organizations: nil during setup, filled before RPC ---
+  (let [owned-organizations-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: return nil during profile/team creation,
+       ;; then serve the computed owned-organizations once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-owned-organizations @owned-organizations-ref
+                                 nil))}
+       ;; --- Worker mock: capture delete-task submissions ---
+       wrk-mock    {:target 'app.worker/submit! :return nil}
+       ;; --- Message bus mock: capture published events ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
 
-    ;; org-2: team with files renamed; empty team deleted
-    (t/is (false? (:is-default org-2-updated-files)))
-    (t/is (str/starts-with? (:name org-2-updated-files) org-2-prefix))
-    (t/is (nil? (:deleted-at org-2-updated-files)))
-    (t/is (some? (:deleted-at org-2-updated-empty)))
+      ;; --- Setup: create a profile with teams across two organizations ---
+      (let [profile            (th/create-profile* 1 {:is-active true})
+            ;; --- Org-1: team with files: kept and renamed ---
+            organization-1-team-files   (th/db-get :team {:id (:default-team-id profile)})
+            organization-1-proj         (th/create-project* 1 {:profile-id (:id profile)
+                                                               :team-id (:id organization-1-team-files)})
+            _                  (th/create-file* 1 {:profile-id (:id profile)
+                                                   :project-id (:id organization-1-proj)})
+            ;; --- Org-1: empty team: soft-deleted ---
+            organization-1-team-empty   (th/create-team* 1 {:profile-id (:id profile)})
 
-    ;; two delete tasks (one per empty team)
-    (t/is (= 2 (count @submitted)))
+            ;; --- Org-2: team with files: kept and renamed ---
+            organization-2-team-files   (th/create-team* 2 {:profile-id (:id profile)})
+            organization-2-proj         (th/create-project* 2 {:profile-id (:id profile)
+                                                               :team-id (:id organization-2-team-files)})
+            _                  (th/create-file* 2 {:profile-id (:id profile)
+                                                   :project-id (:id organization-2-proj)})
+            ;; --- Org-2: empty team: soft-deleted ---
+            organization-2-team-empty   (th/create-team* 3 {:profile-id (:id profile)})
 
-    ;; one organization-deleted event per org
-    (t/is (= 2 (count @calls)))
-    (t/is (every? #(= uuid/zero (:topic %)) @calls))
-    (t/is (= #{:organization-deleted}
-             (set (map (comp :type :message) @calls))))
+            ;; --- Data needed by the RPC call ---
+            organization-1-id           (uuid/random)
+            organization-2-id           (uuid/random)
+            organization-1-name         "Org One / Design"
+            organization-2-name         "Org Two"
+            organization-1-prefix       (str "[" (d/sanitize-string organization-1-name) "] ")
+            organization-2-prefix       (str "[" (d/sanitize-string organization-2-name) "] ")
+            ;; --- Owned-organizations that nitrate would return ---
+            owned-organizations         [{:id organization-1-id
+                                          :name organization-1-name
+                                          :teams [{:id (:id organization-1-team-files)
+                                                   :is-your-penpot true}
+                                                  {:id (:id organization-1-team-empty)
+                                                   :is-your-penpot true}]}
+                                         {:id organization-2-id
+                                          :name organization-2-name
+                                          :teams [{:id (:id organization-2-team-files)
+                                                   :is-your-penpot true}
+                                                  {:id (:id organization-2-team-empty)
+                                                   :is-your-penpot true}]}]
+            ;; --- Publish owned-organizations so the mock can serve it ---
+            _                  (reset! owned-organizations-ref owned-organizations)
 
-    (let [m1 (org-msg org-1-name)
-          m2 (org-msg org-2-name)]
-      (t/is (some? m1))
-      (t/is (some? m2))
-      (t/is (= org-1-id (:organization-id m1)))
-      (t/is (= org-2-id (:organization-id m2)))
-      (t/is (= #{(:id org-1-team-files) (:id org-1-team-empty)}
-               (set (:teams m1))))
-      (t/is (= #{(:id org-1-team-empty)}
-               (set (:deleted-teams m1))))
-      (t/is (= #{(:id org-2-team-files) (:id org-2-team-empty)}
-               (set (:teams m2))))
-      (t/is (= #{(:id org-2-team-empty)}
-               (set (:deleted-teams m2)))))))
+            ;; --- Exercise: notify Penpot that the user's organizations are deleted ---
+            out                (th/management-command! {::th/type :notify-user-organizations-deletion
+                                                        ::rpc/profile-id (:id profile)
+                                                        :profile-id (:id profile)})
+
+            ;; --- Fetch teams post-deletion to verify mutations ---
+            organization-1-updated-files (th/db-get :team {:id (:id organization-1-team-files)} {::db/remove-deleted false})
+            organization-1-updated-empty (th/db-get :team {:id (:id organization-1-team-empty)} {::db/remove-deleted false})
+            organization-2-updated-files (th/db-get :team {:id (:id organization-2-team-files)} {::db/remove-deleted false})
+            organization-2-updated-empty (th/db-get :team {:id (:id organization-2-team-empty)} {::db/remove-deleted false})
+
+            ;; --- Extract published messages from the message bus mock ---
+            msgs              (->> (:call-args-list @mbus-mock)
+                                   (map #(apply hash-map (rest %)))
+                                   (map :message)
+                                   vec)
+            organization-msg           (fn [organization-name]
+                                         (first (filter #(= organization-name (:organization-name %)) msgs)))]
+
+        ;; --- Verify: nitrate was queried for owned organizations with correct params ---
+        (let [[_ method params] (:call-args @nitrate-mock)]
+          (t/is (= :get-owned-organizations method))
+          (t/is (= {:profile-id (:id profile)} params)))
+
+        ;; --- Verify: RPC returns success with no result payload ---
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
+
+        ;; --- Verify: organization-1 team with files kept, renamed, default flag removed ---
+        (t/is (false? (:is-default organization-1-updated-files)))
+        (t/is (str/starts-with? (:name organization-1-updated-files) organization-1-prefix))
+        (t/is (nil? (:deleted-at organization-1-updated-files)))
+        ;; --- Verify: organization-1 empty team soft-deleted ---
+        (t/is (some? (:deleted-at organization-1-updated-empty)))
+
+        ;; --- Verify: organization-2 team with files kept, renamed, default flag removed ---
+        (t/is (false? (:is-default organization-2-updated-files)))
+        (t/is (str/starts-with? (:name organization-2-updated-files) organization-2-prefix))
+        (t/is (nil? (:deleted-at organization-2-updated-files)))
+        ;; --- Verify: organization-2 empty team soft-deleted ---
+        (t/is (some? (:deleted-at organization-2-updated-empty)))
+
+        ;; --- Verify: two delete tasks submitted (one per empty team) ---
+        (t/is (:called? @wrk-mock))
+        (t/is (= 2 (:call-count @wrk-mock)))
+
+        ;; --- Verify: one organization-deleted event per organization, all on correct topic ---
+        (t/is (= 2 (count msgs)))
+        (t/is (every? #(= uuid/zero (:topic %))
+                      (->> (:call-args-list @mbus-mock)
+                           (map #(apply hash-map (rest %))))))
+        (t/is (= #{:organization-deleted} (set (map :type msgs))))
+
+        ;; --- Verify: each organization-deleted event has correct organization-specific payload ---
+        (let [m1 (organization-msg organization-1-name)
+              m2 (organization-msg organization-2-name)]
+          (t/is (some? m1))
+          (t/is (some? m2))
+          (t/is (= organization-1-id (:organization-id m1)))
+          (t/is (= organization-2-id (:organization-id m2)))
+          (t/is (= #{(:id organization-1-team-files) (:id organization-1-team-empty)}
+                   (set (:teams m1))))
+          (t/is (= #{(:id organization-1-team-empty)}
+                   (set (:deleted-teams m1))))
+          (t/is (= #{(:id organization-2-team-files) (:id organization-2-team-empty)}
+                   (set (:teams m2))))
+          (t/is (= #{(:id organization-2-team-empty)}
+                   (set (:deleted-teams m2)))))))))
 
 (t/deftest get-profile-by-email-success-and-not-found
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Lookup by Email"})
-        ok-out  (management-command-with-nitrate! {::th/type :get-profile-by-email
-                                                   ::rpc/profile-id (:id profile)
-                                                   :email (:email profile)})
-        ko-out  (management-command-with-nitrate! {::th/type :get-profile-by-email
-                                                   ::rpc/profile-id (:id profile)
-                                                   :email "not-found@example.com"})]
-    (t/is (th/success? ok-out))
-    (t/is (= (:id profile) (-> ok-out :result :id)))
-    (t/is (= "Lookup by Email" (-> ok-out :result :name)))
-    (t/is (nil? (-> ok-out :result :photo-url)))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [profile (th/create-profile* 1 {:is-active true
+                                         :fullname "Lookup by Email"})
+          ok-out  (th/management-command! {::th/type :get-profile-by-email
+                                           ::rpc/profile-id (:id profile)
+                                           :email (:email profile)})
+          ko-out  (th/management-command! {::th/type :get-profile-by-email
+                                           ::rpc/profile-id (:id profile)
+                                           :email "not-found@example.com"})]
+      (t/is (th/success? ok-out))
+      (t/is (= (:id profile) (-> ok-out :result :id)))
+      (t/is (= "Lookup by Email" (-> ok-out :result :name)))
+      (t/is (nil? (-> ok-out :result :photo-url)))
 
-    (t/is (not (th/success? ko-out)))
-    (t/is (= :not-found (th/ex-type (:error ko-out))))
-    (t/is (= :profile-not-found (th/ex-code (:error ko-out))))))
+      (t/is (not (th/success? ko-out)))
+      (t/is (= :not-found (th/ex-type (:error ko-out))))
+      (t/is (= :profile-not-found (th/ex-code (:error ko-out)))))))
 
 (t/deftest get-profile-by-id-success-and-not-found
-  (let [profile (th/create-profile* 1 {:is-active true
-                                       :fullname "Lookup by Id"})
-        ok-out  (management-command-with-nitrate! {::th/type :get-profile-by-id
-                                                   ::rpc/profile-id (:id profile)
-                                                   :id (:id profile)})
-        ko-out  (management-command-with-nitrate! {::th/type :get-profile-by-id
-                                                   ::rpc/profile-id (:id profile)
-                                                   :id (uuid/random)})]
-    (t/is (th/success? ok-out))
-    (t/is (= (:id profile) (-> ok-out :result :id)))
-    (t/is (= "Lookup by Id" (-> ok-out :result :name)))
-    (t/is (nil? (-> ok-out :result :photo-url)))
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [profile (th/create-profile* 1 {:is-active true
+                                         :fullname "Lookup by Id"})
+          ok-out  (th/management-command! {::th/type :get-profile-by-id
+                                           ::rpc/profile-id (:id profile)
+                                           :id (:id profile)})
+          ko-out  (th/management-command! {::th/type :get-profile-by-id
+                                           ::rpc/profile-id (:id profile)
+                                           :id (uuid/random)})]
+      (t/is (th/success? ok-out))
+      (t/is (= (:id profile) (-> ok-out :result :id)))
+      (t/is (= "Lookup by Id" (-> ok-out :result :name)))
+      (t/is (nil? (-> ok-out :result :photo-url)))
 
-    (t/is (not (th/success? ko-out)))
-    (t/is (= :not-found (th/ex-type (:error ko-out))))
-    (t/is (= :profile-not-found (th/ex-code (:error ko-out))))))
+      (t/is (not (th/success? ko-out)))
+      (t/is (= :not-found (th/ex-type (:error ko-out))))
+      (t/is (= :profile-not-found (th/ex-code (:error ko-out)))))))
 
 (t/deftest get-organization-invitations-returns-valid-deduped-by-email
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams [{:id (:id team-1)}
-                              {:id (:id team-2)}]}
+  ;; --- Deferred organization-summary: nil during setup, filled before RPC ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: return nil during profile/team creation,
+       ;; then serve the computed organization-summary when the handler queries it ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-organization-summary @organization-summary-ref
+                                 nil))}]
+
+      ;; --- Setup: create profile, teams, and invitation data ---
+      (let [profile      (th/create-profile* 1 {:is-active true})
+            team-1       (th/create-team* 1 {:profile-id (:id profile)})
+            team-2       (th/create-team* 2 {:profile-id (:id profile)})
+
+            ;; --- Data needed by the RPC call ---
+            organization-id       (uuid/random)
+            organization-summary  {:id organization-id
+                                   :teams [{:id (:id team-1)}
+                                           {:id (:id team-2)}]}
+            params       {::th/type :get-organization-invitations
+                          ::rpc/profile-id (:id profile)
+                          :organization-id organization-id}
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _            (reset! organization-summary-ref organization-summary)
+
+            ;; --- Insert invitation records ---
+            ;; Same email appears in organization and team invitations; only one should be returned.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :org-id organization-id
+                                         :team-id nil
+                                         :email-to "dup@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-1)
+                                         :org-id nil
+                                         :email-to "dup@example.com"
+                                         :created-by (:id profile)
+                                         :role "admin"
+                                         :valid-until (ct/in-future "72h")})
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-2)
+                                         :org-id nil
+                                         :email-to "valid@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "48h")})
+            ;; Expired invitation should be ignored.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :org-id organization-id
+                                         :team-id nil
+                                         :email-to "expired@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-past "1h")})
+
+            ;; --- Exercise: query organization invitations ---
+            out          (th/management-command! params)
+
+            ;; --- Extract results ---
+            result       (:result out)
+            emails       (->> result (map :email) set)
+            dedup        (->> result
+                              (filter #(= "dup@example.com" (:email %)))
+                              first)]
+
+        ;; --- Verify: nitrate was queried for the organization summary ---
+        (let [[_ method params'] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params')))
+
+        ;; --- Verify: RPC returns success with deduplicated invitations ---
+        (t/is (th/success? out))
+        (t/is (= #{"dup@example.com" "valid@example.com"} emails))
+        (t/is (= 2 (count result)))
+        ;; --- Verify: deduplicated invitation has id/sent-at but no team-specific fields ---
+        (t/is (some? (:id dedup)))
+        (t/is (some? (:sent-at dedup)))
+        (t/is (nil? (:organization-id dedup)))
+        (t/is (nil? (:team-id dedup)))
+        (t/is (nil? (:role dedup)))
+        (t/is (nil? (:valid-until dedup)))))))
+
+(t/deftest get-organization-invitations-includes-organization-level-invitations-when-no-teams
+  ;; --- Org-summary has no teams — computable before with-mocks, no deferral needed ---
+  (let [organization-id       (uuid/random)
+        organization-summary  {:id organization-id :teams []}
         params       {::th/type :get-organization-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
+                      :organization-id organization-id}]
+    (with-mocks
+      [;; --- Nitrate mock: return the organization-summary when the handler queries it ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-organization-summary organization-summary
+                                 nil))}]
 
-    ;; Same email appears in org and team invitations; only one should be returned.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "dup@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; --- Setup: create profile and insert an organization-level invitation ---
+      (let [profile (th/create-profile* 1 {:is-active true})
+            _       (th/db-insert! :team-invitation
+                                   {:id (uuid/random)
+                                    :org-id organization-id
+                                    :team-id nil
+                                    :email-to "organization-only@example.com"
+                                    :created-by (:id profile)
+                                    :role "editor"
+                                    :valid-until (ct/in-future "24h")})
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "dup@example.com"
-                    :created-by (:id profile)
-                    :role "admin"
-                    :valid-until (ct/in-future "72h")})
+            ;; --- Exercise: query organization invitations ---
+            out    (th/management-command! (assoc params ::rpc/profile-id (:id profile)))
+            result (:result out)]
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "valid@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "48h")})
+        ;; --- Verify: nitrate was queried for the organization summary ---
+        (let [[_ method params'] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params')))
 
-    ;; Expired invitation should be ignored.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "expired@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          result (:result out)
-          emails (->> result (map :email) set)
-          dedup  (->> result
-                      (filter #(= "dup@example.com" (:email %)))
-                      first)]
-      (t/is (th/success? out))
-      (t/is (= #{"dup@example.com" "valid@example.com"} emails))
-      (t/is (= 2 (count result)))
-      (t/is (some? (:id dedup)))
-      (t/is (some? (:sent-at dedup)))
-      (t/is (nil? (:organization-id dedup)))
-      (t/is (nil? (:team-id dedup)))
-      (t/is (nil? (:role dedup)))
-      (t/is (nil? (:valid-until dedup))))))
-
-(t/deftest get-organization-invitations-includes-org-level-invitations-when-no-teams
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams []}
-        params       {::th/type :get-organization-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
-
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "org-only@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          result (:result out)]
-      (t/is (th/success? out))
-      (t/is (= 1 (count result)))
-      (t/is (= "org-only@example.com" (-> result first :email)))
-      (t/is (some? (-> result first :sent-at))))))
+        ;; --- Verify: the organization-level invitation is returned ---
+        (t/is (th/success? out))
+        (t/is (= 1 (count result)))
+        (t/is (= "organization-only@example.com" (-> result first :email)))
+        (t/is (some? (-> result first :sent-at)))))))
 
 (t/deftest get-organization-invitations-returns-existing-profile-data
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        invited      (th/create-profile* 2 {:is-active true
-                                            :fullname "Invited User"})
-        photo-id     (uuid/random)
-        _            (th/db-insert! :storage-object {:id photo-id
-                                                     :backend "assets-fs"})
-        _            (th/db-update! :profile {:photo-id photo-id} {:id (:id invited)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams []}
-        params       {::th/type :get-organization-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id}]
+  ;; --- Org-summary has no teams — computable before with-mocks, no deferral needed ---
+  (let [organization-id      (uuid/random)
+        organization-summary {:id organization-id :teams []}]
+    (with-mocks
+      [;; --- Nitrate mock: return the organization-summary when the handler queries it ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-organization-summary organization-summary
+                                 nil))}]
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to (:email invited)
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; --- Setup: create profiles, set photo on invited user, insert invitation ---
+      (let [profile     (th/create-profile* 1 {:is-active true})
+            invited     (th/create-profile* 2 {:is-active true
+                                               :fullname "Invited User"})
+            photo-id    (uuid/random)
+            _           (th/db-insert! :storage-object {:id photo-id
+                                                        :backend "assets-fs"})
+            _           (th/db-update! :profile {:photo-id photo-id} {:id (:id invited)})
+            _           (th/db-insert! :team-invitation
+                                       {:id (uuid/random)
+                                        :org-id organization-id
+                                        :team-id nil
+                                        :email-to (:email invited)
+                                        :created-by (:id profile)
+                                        :role "editor"
+                                        :valid-until (ct/in-future "24h")})
 
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          invitation (-> out :result first)]
-      (t/is (th/success? out))
-      (t/is (= "Invited User" (:name invitation)))
-      (t/is (some? (:sent-at invitation)))
-      (t/is (str/ends-with? (:photo-url invitation)
-                            (str "/assets/by-id/" photo-id))))))
+            ;; --- Exercise: query organization invitations ---
+            out        (th/management-command! {::th/type :get-organization-invitations
+                                                ::rpc/profile-id (:id profile)
+                                                :organization-id organization-id})
+            invitation (-> out :result first)]
 
-(t/deftest delete-organization-invitations-removes-org-and-org-team-invitations-for-email
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        outside-team (th/create-team* 3 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams [{:id (:id team-1)}
-                              {:id (:id team-2)}]}
-        target-email "target@example.com"
-        params       {::th/type :delete-organization-invitations
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id
-                      :email "TARGET@example.com"}]
+        ;; --- Verify: nitrate was queried for the organization summary ---
+        (let [[_ method params'] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params')))
 
-    ;; Should be deleted: org-level invitation for same org+email.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+        ;; --- Verify: invitation includes the invited user's existing profile data ---
+        (t/is (th/success? out))
+        (t/is (= "Invited User" (:name invitation)))
+        (t/is (some? (:sent-at invitation)))
+        (t/is (str/ends-with? (:photo-url invitation)
+                              (str "/assets/by-id/" photo-id)))))))
 
-    ;; Should be deleted: team-level invitation for teams belonging to org summary.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
+(t/deftest delete-organization-invitations-removes-organization-and-organization-team-invitations-for-email
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)
+        target-email    "target@example.com"]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary when handler queries it ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-organization-summary @organization-summary-ref
+                                 nil))}]
 
-    ;; Should remain: different email.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "other@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; --- Setup: create profile, teams, and invitation data ---
+      (let [profile      (th/create-profile* 1 {:is-active true})
+            team-1       (th/create-team* 1 {:profile-id (:id profile)})
+            team-2       (th/create-team* 2 {:profile-id (:id profile)})
+            outside-team (th/create-team* 3 {:profile-id (:id profile)})
+            organization-id       (uuid/random)
+            organization-summary  {:id organization-id
+                                   :teams [{:id (:id team-1)}
+                                           {:id (:id team-2)}]}
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _            (reset! organization-summary-ref organization-summary)
 
-    ;; Should remain: same email but outside org scope.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id outside-team)
-                    :org-id nil
-                    :email-to target-email
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+            ;; --- Insert invitation records ---
+            ;; Should be deleted: organization-level invitation for same organization+email.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :org-id organization-id
+                                         :team-id nil
+                                         :email-to target-email
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
+            ;; Should be deleted: team-level invitation for teams in organization summary.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-1)
+                                         :org-id nil
+                                         :email-to target-email
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-past "1h")})
+            ;; Should remain: different email.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-2)
+                                         :org-id nil
+                                         :email-to "other@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
+            ;; Should remain: same email but outside organization scope.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id outside-team)
+                                         :org-id nil
+                                         :email-to target-email
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
 
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary org-summary
-                                             nil))]
-                (management-command-with-nitrate! params))
-          remaining-target (th/db-query :team-invitation {:email-to target-email})
-          remaining-other  (th/db-query :team-invitation {:email-to "other@example.com"})]
-      (t/is (th/success? out))
-      (t/is (nil? (:result out)))
-      (t/is (= 1 (count remaining-target)))
-      (t/is (= (:id outside-team) (:team-id (first remaining-target))))
-      (t/is (= 1 (count remaining-other))))))
+            ;; --- Exercise: delete organization invitations for target email ---
+            out               (th/management-command! {::th/type :delete-organization-invitations
+                                                       ::rpc/profile-id (:id profile)
+                                                       :organization-id organization-id
+                                                       :email "TARGET@example.com"})
+            remaining-target  (th/db-query :team-invitation {:email-to target-email})
+            remaining-other   (th/db-query :team-invitation {:email-to "other@example.com"})]
 
-(t/deftest delete-all-organization-invitations-removes-org-and-org-team-invitations
-  (let [profile      (th/create-profile* 1 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        outside-team (th/create-team* 3 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        org-summary  {:id org-id
-                      :teams [{:id (:id team-1)}
-                              {:id (:id team-2)}]}
-        params       {::th/type :delete-all-organization-invitations
-                      :organization-id org-id}]
+        ;; --- Verify: nitrate was queried for the organization summary ---
+        (let [[_ method params'] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params')))
 
-    ;; Should be deleted: org-level invitation.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "alice@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+        ;; --- Verify: RPC returns success with no result payload ---
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
+        ;; --- Verify: only the outside-team invitation remains for target email ---
+        (t/is (= 1 (count remaining-target)))
+        (t/is (= (:id outside-team) (:team-id (first remaining-target))))
+        ;; --- Verify: other-email invitation is untouched ---
+        (t/is (= 1 (count remaining-other)))))))
 
-    ;; Should be deleted: team-level invitation in team-1 (belongs to org).
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "bob@example.com"
-                    :created-by (:id profile)
-                    :role "admin"
-                    :valid-until (ct/in-future "48h")})
+(t/deftest delete-all-organization-invitations-removes-organization-and-organization-team-invitations
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary when handler queries it ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (case method
+                                 :get-organization-summary @organization-summary-ref
+                                 nil))}]
 
-    ;; Should be deleted: team-level invitation in team-2 (belongs to org),
-    ;; even if expired.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "carol@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
+      ;; --- Setup: create profile, teams, and invitation data ---
+      (let [profile      (th/create-profile* 1 {:is-active true})
+            team-1       (th/create-team* 1 {:profile-id (:id profile)})
+            team-2       (th/create-team* 2 {:profile-id (:id profile)})
+            outside-team (th/create-team* 3 {:profile-id (:id profile)})
+            organization-id       (uuid/random)
+            organization-summary  {:id organization-id
+                                   :teams [{:id (:id team-1)}
+                                           {:id (:id team-2)}]}
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _            (reset! organization-summary-ref organization-summary)
 
-    ;; Should remain: invitation to a team outside the org.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id outside-team)
-                    :org-id nil
-                    :email-to "dan@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+            ;; --- Insert invitation records ---
+            ;; Should be deleted: organization-level invitation.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :org-id organization-id
+                                         :team-id nil
+                                         :email-to "alice@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
+            ;; Should be deleted: team-level invitation in team-1 (belongs to organization).
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-1)
+                                         :org-id nil
+                                         :email-to "bob@example.com"
+                                         :created-by (:id profile)
+                                         :role "admin"
+                                         :valid-until (ct/in-future "48h")})
+            ;; Should be deleted: team-level invitation in team-2 (belongs to organization),
+            ;; even if expired.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id team-2)
+                                         :org-id nil
+                                         :email-to "carol@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-past "1h")})
+            ;; Should remain: invitation to a team outside the org.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :team-id (:id outside-team)
+                                         :org-id nil
+                                         :email-to "dan@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
+            ;; Should remain: invitation to a different organization.
+            _            (th/db-insert! :team-invitation
+                                        {:id (uuid/random)
+                                         :org-id (uuid/random)
+                                         :team-id nil
+                                         :email-to "erin@example.com"
+                                         :created-by (:id profile)
+                                         :role "editor"
+                                         :valid-until (ct/in-future "24h")})
 
-    ;; Should remain: invitation to a different organization.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id (uuid/random)
-                    :team-id nil
-                    :email-to "erin@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+            ;; --- Exercise: delete all invitations in the organization ---
+            out          (th/management-command! {::th/type :delete-all-organization-invitations
+                                                  ::rpc/profile-id (:id profile)
+                                                  :organization-id organization-id})
+            present?     (fn [email] (seq (th/db-query :team-invitation {:email-to email})))]
 
-    (let [calls    (atom [])
-          out      (with-redefs [nitrate/call (fn [_cfg method params]
-                                                (swap! calls conj {:method method :params params})
-                                                (case method
-                                                  :get-org-summary org-summary
-                                                  nil))]
-                     (management-command-with-nitrate! params))
-          present? (fn [email] (seq (th/db-query :team-invitation {:email-to email})))]
-      (t/is (th/success? out))
-      (t/is (nil? (:result out)))
+        ;; --- Verify: the handler's nitrate call was :get-organization-summary with correct params ---
+        ;; (The mock also recorded setup-phase calls from add-profile-to-team!,
+        ;;  so :call-args reflects the LAST call — which is the handler's.)
+        (let [[_ method params'] (:call-args @nitrate-mock)]
+          (t/is (= :get-organization-summary method))
+          (t/is (= {:organization-id organization-id} params')))
 
-      ;; get-org-summary was called with the right organization-id.
-      (t/is (= 1 (count @calls)))
-      (t/is (= :get-org-summary (-> @calls first :method)))
-      (t/is (= {:organization-id org-id} (-> @calls first :params)))
+        ;; --- Verify: RPC returns success with no result payload ---
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
 
-      ;; Org-level + team-in-org invitations are deleted.
-      (t/is (not (present? "alice@example.com")))
-      (t/is (not (present? "bob@example.com")))
-      (t/is (not (present? "carol@example.com")))
+        ;; --- Verify: organization-level + team-in-organization invitations are deleted ---
+        (t/is (not (present? "alice@example.com")))
+        (t/is (not (present? "bob@example.com")))
+        (t/is (not (present? "carol@example.com")))
 
-      ;; Invitations outside the org survive.
-      (t/is (present? "dan@example.com"))
-      (t/is (present? "erin@example.com")))))
+        ;; --- Verify: invitations outside the organization survive ---
+        (t/is (present? "dan@example.com"))
+        (t/is (present? "erin@example.com"))))))
 
-(t/deftest delete-all-organization-invitations-handles-org-with-no-teams
-  (let [profile (th/create-profile* 1 {:is-active true})
-        org-id  (uuid/random)
+(t/deftest delete-all-organization-invitations-handles-organization-with-no-teams
+  (let [organization-id  (uuid/random)
         params  {::th/type :delete-all-organization-invitations
-                 :organization-id org-id}]
+                 :organization-id organization-id}]
+    (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}
+                 nitrate-fn {:target 'app.nitrate/call
+                             :return (fn [_cfg method _params]
+                                       (case method
+                                         :get-organization-summary {:id organization-id :teams []}
+                                         nil))}]
+      (let [profile (th/create-profile* 1 {:is-active true})]
 
-    ;; Org-level invitation should still be deleted.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "alice@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
 
-    (let [out (with-redefs [nitrate/call (fn [_cfg method _params]
-                                           (case method
-                                             :get-org-summary {:id org-id :teams []}
-                                             nil))]
-                (management-command-with-nitrate! params))
-          remaining (th/db-query :team-invitation {:org-id org-id})]
-      (t/is (th/success? out))
-      (t/is (nil? (:result out)))
-      (t/is (empty? remaining)))))
+        ;; Org-level invitation should still be deleted.
+        (th/db-insert! :team-invitation
+                       {:id (uuid/random)
+                        :org-id organization-id
+                        :team-id nil
+                        :email-to "alice@example.com"
+                        :created-by (:id profile)
+                        :role "editor"
+                        :valid-until (ct/in-future "24h")})
+
+        (let [out       (th/management-command! params)
+              remaining (th/db-query :team-invitation {:org-id organization-id})]
+          (t/is (th/success? out))
+          (t/is (nil? (:result out)))
+          (t/is (empty? remaining)))))))
 
 (t/deftest exists-organization-team-invitations-for-non-members-reports-invitations-to-delete
-  (let [member1      (th/create-profile* 1 {:is-active true :email "member1@example.com"})
-        profile      (th/create-profile* 4 {:is-active true})
-        team-1       (th/create-team* 1 {:profile-id (:id profile)})
-        team-2       (th/create-team* 2 {:profile-id (:id profile)})
-        outside-team (th/create-team* 3 {:profile-id (:id profile)})
-        org-id       (uuid/random)
-        base-params  {::th/type :exists-organization-team-invitations-for-non-members
-                      ::rpc/profile-id (:id profile)
-                      :organization-id org-id
-                      :team-ids [(:id team-1) (:id team-2)]
-                      :member-ids [(:id member1)]}
-        exist!       (fn [] (-> (management-command-with-nitrate! base-params)
-                                :result
-                                :exists))]
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [member1      (th/create-profile* 1 {:is-active true :email "member1@example.com"})
+          profile      (th/create-profile* 4 {:is-active true})
+          team-1       (th/create-team* 1 {:profile-id (:id profile)})
+          team-2       (th/create-team* 2 {:profile-id (:id profile)})
+          outside-team (th/create-team* 3 {:profile-id (:id profile)})
+          organization-id       (uuid/random)
+          base-params  {::th/type :exists-organization-team-invitations-for-non-members
+                        ::rpc/profile-id (:id profile)
+                        :organization-id organization-id
+                        :team-ids [(:id team-1) (:id team-2)]
+                        :member-ids [(:id member1)]}
+          exist!       (fn [] (-> (th/management-command! base-params)
+                                  :result
+                                  :exists))]
 
-    (t/is (false? (exist!)))
+      (t/is (false? (exist!)))
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "member1@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-    (t/is (false? (exist!)))
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-1)
+                      :org-id nil
+                      :email-to "member1@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
+      (t/is (false? (exist!)))
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "pending@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-    (t/is (false? (exist!)))
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :org-id organization-id
+                      :team-id nil
+                      :email-to "pending@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
+      (t/is (false? (exist!)))
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id outside-team)
-                    :org-id nil
-                    :email-to "outsider@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-    (t/is (false? (exist!)))
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id outside-team)
+                      :org-id nil
+                      :email-to "outsider@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
+      (t/is (false? (exist!)))
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "orphan@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
-    (t/is (true? (exist!)))))
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-2)
+                      :org-id nil
+                      :email-to "orphan@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
+      (t/is (true? (exist!))))))
 
 (t/deftest delete-organization-team-invitations-for-non-members-removes-non-member-invitations
-  (let [member1     (th/create-profile* 1 {:is-active true :email "member1@example.com"})
-        profile     (th/create-profile* 4 {:is-active true})
-        team-1      (th/create-team* 1 {:profile-id (:id profile)})
-        team-2      (th/create-team* 2 {:profile-id (:id profile)})
-        outside-team (th/create-team* 3 {:profile-id (:id profile)})
-        org-id      (uuid/random)
-        params      {::th/type :delete-organization-team-invitations-for-non-members
-                     ::rpc/profile-id (:id profile)
-                     :organization-id org-id
-                     :team-ids [(:id team-1) (:id team-2)]
-                     :member-ids [(:id member1)]}]
+  (with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}]
+    (let [member1     (th/create-profile* 1 {:is-active true :email "member1@example.com"})
+          profile     (th/create-profile* 4 {:is-active true})
+          team-1      (th/create-team* 1 {:profile-id (:id profile)})
+          team-2      (th/create-team* 2 {:profile-id (:id profile)})
+          outside-team (th/create-team* 3 {:profile-id (:id profile)})
+          organization-id      (uuid/random)
+          params      {::th/type :delete-organization-team-invitations-for-non-members
+                       ::rpc/profile-id (:id profile)
+                       :organization-id organization-id
+                       :team-ids [(:id team-1) (:id team-2)]
+                       :member-ids [(:id member1)]}]
 
-    ;; Should remain: member1 is an org member.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "member1@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; Should remain: member1 is an organization member.
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-1)
+                      :org-id nil
+                      :email-to "member1@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
 
-    ;; Org-level invitation remains (out of team cleanup scope).
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to "pending@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; Org-level invitation remains (out of team cleanup scope).
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :org-id organization-id
+                      :team-id nil
+                      :email-to "pending@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
 
-    ;; Should be deleted: team invitation for non-member
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "pending@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; Should be deleted: team invitation for non-member
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-2)
+                      :org-id nil
+                      :email-to "pending@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
 
-    ;; Should be deleted: orphaned invitation
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-2)
-                    :org-id nil
-                    :email-to "orphan@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; Should be deleted: orphaned invitation
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-2)
+                      :org-id nil
+                      :email-to "orphan@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
 
-    ;; Should be deleted: expired invitation.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team-1)
-                    :org-id nil
-                    :email-to "expired@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-past "1h")})
+      ;; Should be deleted: expired invitation.
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id team-1)
+                      :org-id nil
+                      :email-to "expired@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-past "1h")})
 
-    ;; Should remain: outside org scope.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id outside-team)
-                    :org-id nil
-                    :email-to "outsider@example.com"
-                    :created-by (:id profile)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; Should remain: outside organization scope.
+      (th/db-insert! :team-invitation
+                     {:id (uuid/random)
+                      :team-id (:id outside-team)
+                      :org-id nil
+                      :email-to "outsider@example.com"
+                      :created-by (:id profile)
+                      :role "editor"
+                      :valid-until (ct/in-future "24h")})
 
-    (let [out     (management-command-with-nitrate! params)]
+      (let [out     (th/management-command! params)]
 
-      (t/is (th/success? out))
-      (t/is (nil? (:result out)))
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
 
-      ;; Verify remaining invitations.
-      (t/is (= 1 (count (th/db-query :team-invitation {:email-to "member1@example.com"}))))
-      (t/is (= 1 (count (th/db-query :team-invitation {:email-to "pending@example.com"}))))
-      (t/is (= 0 (count (th/db-query :team-invitation {:email-to "orphan@example.com"}))))
-      (t/is (= 0 (count (th/db-query :team-invitation {:email-to "expired@example.com"}))))
-      (t/is (= 1 (count (th/db-query :team-invitation {:email-to "outsider@example.com"})))))))
+        ;; Verify remaining invitations.
+        (t/is (= 1 (count (th/db-query :team-invitation {:email-to "member1@example.com"}))))
+        (t/is (= 1 (count (th/db-query :team-invitation {:email-to "pending@example.com"}))))
+        (t/is (= 0 (count (th/db-query :team-invitation {:email-to "orphan@example.com"}))))
+        (t/is (= 0 (count (th/db-query :team-invitation {:email-to "expired@example.com"}))))
+        (t/is (= 1 (count (th/db-query :team-invitation {:email-to "outsider@example.com"}))))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Tests: remove-from-organization
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn- make-org-summary
-  [& {:keys [organization-id organization-name owner-id your-penpot-teams org-teams]
-      :or   {your-penpot-teams [] org-teams []}}]
+(defn- make-organization-summary
+  [& {:keys [organization-id organization-name owner-id your-penpot-teams organization-teams]
+      :or   {your-penpot-teams [] organization-teams []}}]
   {:id       organization-id
    :name     organization-name
    :owner-id owner-id
    :teams    (into
               (mapv (fn [id] {:id id :is-your-penpot true}) your-penpot-teams)
-              (mapv (fn [id] {:id id :is-your-penpot false}) org-teams))})
+              (mapv (fn [id] {:id id :is-your-penpot false}) organization-teams))})
 
 (defn- nitrate-call-mock
-  [org-summary]
-  (fn [_cfg method _params]
-    (case method
-      :get-org-summary org-summary
-      :get-org-membership {:organization-id (:id org-summary)
-                           :is-member true}
-      :remove-profile-from-org nil
-      nil)))
+  ([organization-summary]
+   (nitrate-call-mock organization-summary nil))
+  ([organization-summary remove-profile-params]
+   (fn [_cfg method params]
+     (case method
+       :get-organization-summary organization-summary
+       :get-organization-membership {:organization-id (:id organization-summary)
+                                     :is-member true}
+       :remove-profile-from-organization (when remove-profile-params
+                                           (reset! remove-profile-params params))
+       nil))))
 
 (t/deftest remove-from-organization-happy-path-no-extra-teams
   ;; User is only in its default team (which has files); it should be
   ;; kept, renamed and unset as default.  A notification must be sent.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 1 {:profile-id (:id user)})
-        project     (th/create-project* 1 {:profile-id (:id user)
-                                           :team-id   (:id org-team)})
-        _           (th/create-file* 1 {:profile-id (:id user)
-                                        :project-id (:id project)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        calls       (atom [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [_bus & {:keys [topic message]}]
-                                              (swap! calls conj {:topic topic :message message}))]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (nil? (:result out)))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref      (atom nil)
+        remove-profile-params (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref remove-profile-params) args))}
+       ;; --- Message bus mock: capture published events ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
 
-    ;; default team preserved, renamed and unset as default
-    (let [team (th/db-get :team {:id (:id org-team)})]
-      (t/is (false? (:is-default team)))
-      (t/is (str/starts-with? (:name team) "[Acme Org] ")))
+      ;; --- Setup: create profiles, team with files, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            organization-team         (th/create-team* 1 {:profile-id (:id user)})
+            project          (th/create-project* 1 {:profile-id (:id user)
+                                                    :team-id (:id organization-team)})
+            _                (th/create-file* 1 {:profile-id (:id user)
+                                                 :project-id (:id project)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
 
-    ;; exactly one notification sent to the user
-    (t/is (= 1 (count @calls)))
-    (let [msg (-> @calls first :message)]
-      (t/is (= :user-org-change (:type msg)))
-      (t/is (= (:id user) (:topic msg)))
-      (t/is (= organization-id (:organization-id msg)))
-      (t/is (= "Acme Org" (:organization-name msg)))
-      (t/is (= "dashboard.user-no-longer-belong-org" (:notification msg))))))
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: nitrate was called (via nitrate-call-mock delegating) ---
+        (t/is (:called? @nitrate-mock))
+
+        ;; --- Verify: RPC returns success with no result payload ---
+        (t/is (th/success? out))
+        (t/is (nil? (:result out)))
+        (t/is (= (:id organization-owner)
+                 (:user-who-delete-member @remove-profile-params)))
+        (t/is (= "organization-owner"
+                 (:deleted-by-role @remove-profile-params)))
+
+        ;; --- Verify: default team preserved, renamed and unset as default ---
+        (let [team (th/db-get :team {:id (:id organization-team)})]
+          (t/is (false? (:is-default team)))
+          (t/is (str/starts-with? (:name team) "[Acme Org] ")))
+
+        ;; --- Verify: exactly one notification sent to the user ---
+        (t/is (:called? @mbus-mock))
+        (let [msg (apply hash-map (rest (:call-args @mbus-mock)))]
+          (t/is (= :user-organization-change (:type (:message msg))))
+          (t/is (= (:id user) (:topic msg)))
+          (t/is (= organization-id (:organization-id (:message msg))))
+          (t/is (= "Acme Org" (:organization-name (:message msg))))
+          (t/is (= "dashboard.user-no-longer-belong-organization" (:notification (:message msg)))))))))
 
 (t/deftest remove-from-organization-deletes-empty-default-team
   ;; When the default team has no files it should be soft-deleted.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 2 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (let [team (th/db-get :team {:id (:id org-team)} {::db/remove-deleted false})]
-      (t/is (some? (:deleted-at team))))))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref       (atom nil)
+        remove-profile-params (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref remove-profile-params) args))}
+       ;; --- Message bus mock: swallow notifications ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
+
+      ;; --- Setup: create profiles, empty default team, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            organization-team         (th/create-team* 2 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    uuid/zero
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success ---
+        (t/is (th/success? out))
+        (t/is (nil? (:user-who-delete-member @remove-profile-params)))
+        (t/is (nil? (:deleted-by-role @remove-profile-params)))
+        ;; --- Verify: empty default team is soft-deleted ---
+        (let [team (th/db-get :team {:id (:id organization-team)} {::db/remove-deleted false})]
+          (t/is (some? (:deleted-at team))))))))
 
 (t/deftest remove-from-organization-deletes-sole-owner-team
-  ;; When the user is the sole member of an org team it should be deleted.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 3 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (let [team (th/db-get :team {:id (:id extra-team)} {::db/remove-deleted false})]
-      (t/is (some? (:deleted-at team))))))
+  ;; When the user is the sole member of an organization team it should be deleted.
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}
+       ;; --- Message bus mock: swallow notifications ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 3 {:profile-id (:id user)})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success ---
+        (t/is (th/success? out))
+        ;; --- Verify: extra team (sole-owner team) is deleted ---
+        (let [team (th/db-get :team {:id (:id extra-team)} {::db/remove-deleted false})]
+          (t/is (some? (:deleted-at team))))))))
 
 (t/deftest remove-from-organization-transfers-ownership-of-multi-member-team
   ;; When the user owns a team that has another non-owner member, ownership
   ;; is transferred to that member by the endpoint automatically.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        candidate   (th/create-profile* 3 {:is-active true})
-        extra-team  (th/create-team* 4 {:profile-id (:id user)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id candidate)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    ;; user no longer in extra-team
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (nil? rel)))
-    ;; candidate promoted to owner
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id candidate)})]
-      (t/is (true? (:is-owner rel))))))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}
+       ;; --- Message bus mock: swallow notifications ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            candidate        (th/create-profile* 3 {:is-active true})
+            extra-team       (th/create-team* 4 {:profile-id (:id user)})
+            _                (th/create-team-role* {:team-id    (:id extra-team)
+                                                    :profile-id (:id candidate)
+                                                    :role       :editor})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success ---
+        (t/is (th/success? out))
+        ;; --- Verify: user no longer a member of extra-team ---
+        (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
+          (t/is (nil? rel)))
+        ;; --- Verify: candidate promoted to owner ---
+        (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id candidate)})]
+          (t/is (true? (:is-owner rel))))))))
 
 (t/deftest remove-from-organization-exits-non-owned-team
-  ;; When the user is a non-owner member of an org team, they simply leave.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 5 {:profile-id (:id org-owner)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id user)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    ;; user no longer a member of extra-team
-    (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (nil? rel)))
-    ;; team still exists for the owner
-    (let [team (th/db-get :team {:id (:id extra-team)})]
-      (t/is (some? team)))))
+  ;; When the user is a non-owner member of an organization team, they simply leave.
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}
+       ;; --- Message bus mock: swallow notifications ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 5 {:profile-id (:id organization-owner)})
+            _                (th/create-team-role* {:team-id    (:id extra-team)
+                                                    :profile-id (:id user)
+                                                    :role       :editor})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success ---
+        (t/is (th/success? out))
+        ;; --- Verify: user no longer a member of extra-team ---
+        (let [rel (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
+          (t/is (nil? rel)))
+        ;; --- Verify: team still exists for the owner ---
+        (let [team (th/db-get :team {:id (:id extra-team)})]
+          (t/is (some? team)))))))
 
 (t/deftest remove-from-organization-error-nobody-to-reassign
   ;; When the user owns a multi-member team but every other member is
   ;; also an owner, the auto-selection query finds nobody and raises.
-  (let [other-owner (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 6 {:profile-id (:id user)})
-        ;; add other-owner to the team and make them co-owner directly in DB
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id other-owner)
-                                           :role       :editor})
-        _           (th/db-update! :team-profile-rel
-                                   {:is-owner true :is-admin false}
-                                   {:team-id (:id extra-team) :profile-id (:id other-owner)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id other-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)
-                                  mbus/pub! (fn [& _] nil)]
-                      (management-command-with-nitrate!
-                       {::th/type        :remove-from-organization
-                        ::rpc/profile-id (:id other-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :organization-name        "Acme Org"
-                        :default-team-id (:id org-team)}))]
-    (t/is (not (th/success? out)))
-    (t/is (= :validation (th/ex-type (:error out))))
-    (t/is (= :nobody-to-reassign-team (th/ex-code (:error out))))))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}
+       ;; --- Message bus mock: swallow notifications ---
+       mbus-mock   {:target 'app.msgbus/pub! :return nil}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [other-owner      (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 6 {:profile-id (:id user)})
+            _                (th/create-team-role* {:team-id    (:id extra-team)
+                                                    :profile-id (:id other-owner)
+                                                    :role       :editor})
+            _                (th/db-update! :team-profile-rel
+                                            {:is-owner true :is-admin false}
+                                            {:team-id (:id extra-team) :profile-id (:id other-owner)})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id other-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: remove the user from the organization ---
+            out              (th/management-command!
+                              {::th/type           :remove-from-organization
+                               ::rpc/profile-id    (:id other-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :organization-name  "Acme Org"
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns error ---
+        (t/is (not (th/success? out)))
+        (t/is (= :validation (th/ex-type (:error out))))
+        (t/is (= :nobody-to-reassign-team (th/ex-code (:error out))))))))
 
 ;; Tests: get-remove-from-organization-summary
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (t/deftest get-remove-from-organization-summary-no-extra-teams
   ;; User only has a default team — nothing to delete/transfer/exit.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        org-team    (th/create-team* 1 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-organization-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 0
-              :teams-to-exit     0
-              :teams-to-detach   0}
-             (:result out)))))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}]
+
+      ;; --- Setup: create profiles, team, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            organization-team         (th/create-team* 1 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: get the summary ---
+            out              (th/management-command!
+                              {::th/type           :get-remove-from-organization-summary
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success with all-zero summary ---
+        (t/is (th/success? out))
+        (t/is (= {:teams-to-delete   0
+                  :teams-to-transfer 0
+                  :teams-to-exit     0
+                  :teams-to-detach   0}
+                 (:result out)))))))
 
 (t/deftest get-remove-from-organization-summary-with-teams-to-delete
-  ;; User owns a sole-member extra org team → 1 to delete.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 3 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-organization-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   1
-              :teams-to-transfer 0
-              :teams-to-exit     0
-              :teams-to-detach   0}
-             (:result out)))))
+  ;; User owns a sole-member extra organization team → 1 to delete.
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 3 {:profile-id (:id user)})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: get the summary ---
+            out              (th/management-command!
+                              {::th/type           :get-remove-from-organization-summary
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success with 1 team to delete ---
+        (t/is (th/success? out))
+        (t/is (= {:teams-to-delete   1
+                  :teams-to-transfer 0
+                  :teams-to-exit     0
+                  :teams-to-detach   0}
+                 (:result out)))))))
 
 (t/deftest get-remove-from-organization-summary-with-teams-to-transfer
-  ;; User owns a multi-member extra org team → 1 to transfer.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        candidate   (th/create-profile* 3 {:is-active true})
-        extra-team  (th/create-team* 4 {:profile-id (:id user)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id candidate)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-organization-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 1
-              :teams-to-exit     0
-              :teams-to-detach   0}
-             (:result out)))))
+  ;; User owns a multi-member extra organization team → 1 to transfer.
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            candidate        (th/create-profile* 3 {:is-active true})
+            extra-team       (th/create-team* 4 {:profile-id (:id user)})
+            _                (th/create-team-role* {:team-id    (:id extra-team)
+                                                    :profile-id (:id candidate)
+                                                    :role       :editor})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: get the summary ---
+            out              (th/management-command!
+                              {::th/type           :get-remove-from-organization-summary
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success with 1 team to transfer ---
+        (t/is (th/success? out))
+        (t/is (= {:teams-to-delete   0
+                  :teams-to-transfer 1
+                  :teams-to-exit     0
+                  :teams-to-detach   0}
+                 (:result out)))))))
 
 (t/deftest get-remove-from-organization-summary-with-teams-to-exit
-  ;; User is a non-owner member of an org team → 1 to exit.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 5 {:profile-id (:id org-owner)})
-        _           (th/create-team-role* {:team-id    (:id extra-team)
-                                           :profile-id (:id user)
-                                           :role       :editor})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        out         (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-organization-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    (t/is (th/success? out))
-    (t/is (= {:teams-to-delete   0
-              :teams-to-transfer 0
-              :teams-to-exit     1
-              :teams-to-detach   0}
-             (:result out)))))
+  ;; User is a non-owner member of an organization team → 1 to exit.
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 5 {:profile-id (:id organization-owner)})
+            _                (th/create-team-role* {:team-id    (:id extra-team)
+                                                    :profile-id (:id user)
+                                                    :role       :editor})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: get the summary ---
+            out              (th/management-command!
+                              {::th/type           :get-remove-from-organization-summary
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: RPC returns success with 1 team to exit ---
+        (t/is (th/success? out))
+        (t/is (= {:teams-to-delete   0
+                  :teams-to-transfer 0
+                  :teams-to-exit     1
+                  :teams-to-detach   0}
+                 (:result out)))))))
 
 (t/deftest get-remove-from-organization-summary-does-not-mutate
   ;; Calling the summary endpoint must not modify any teams.
-  (let [org-owner   (th/create-profile* 1 {:is-active true})
-        user        (th/create-profile* 2 {:is-active true})
-        extra-team  (th/create-team* 6 {:profile-id (:id user)})
-        org-team    (th/create-team* 99 {:profile-id (:id user)})
-        organization-id      (uuid/random)
-        org-summary (make-org-summary
-                     :organization-id            organization-id
-                     :organization-name          "Acme Org"
-                     :owner-id          (:id org-owner)
-                     :your-penpot-teams [(:id org-team)]
-                     :org-teams         [(:id extra-team)])
-        _           (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-                      (management-command-with-nitrate!
-                       {::th/type        :get-remove-from-organization-summary
-                        ::rpc/profile-id (:id org-owner)
-                        :profile-id      (:id user)
-                        :organization-id          organization-id
-                        :default-team-id (:id org-team)}))]
-    ;; Both teams must still exist and be undeleted
-    (let [t1 (th/db-get :team {:id (:id org-team)})]
-      (t/is (some? t1))
-      (t/is (nil? (:deleted-at t1))))
-    (let [t2 (th/db-get :team {:id (:id extra-team)})]
-      (t/is (some? t2))
-      (t/is (nil? (:deleted-at t2))))
-    ;; User must still be a member of both teams
-    (let [rel1 (th/db-get :team-profile-rel {:team-id (:id org-team) :profile-id (:id user)})]
-      (t/is (some? rel1)))
-    (let [rel2 (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
-      (t/is (some? rel2)))))
+  ;; --- Deferred organization-summary: depends on team IDs from setup ---
+  (let [organization-summary-ref (atom nil)]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve organization-summary once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [& args]
+                               (apply (nitrate-call-mock @organization-summary-ref) args))}]
+
+      ;; --- Setup: create profiles, teams, organization-summary ---
+      (let [organization-owner        (th/create-profile* 1 {:is-active true})
+            user             (th/create-profile* 2 {:is-active true})
+            extra-team       (th/create-team* 6 {:profile-id (:id user)})
+            organization-team         (th/create-team* 99 {:profile-id (:id user)})
+            organization-id  (uuid/random)
+            organization-summary      (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Acme Org"
+                                       :owner-id          (:id organization-owner)
+                                       :your-penpot-teams [(:id organization-team)]
+                                       :organization-teams         [(:id extra-team)])
+            ;; --- Publish organization-summary so the mock can serve it ---
+            _                (reset! organization-summary-ref organization-summary)
+
+            ;; --- Exercise: call the summary endpoint ---
+            _                (th/management-command!
+                              {::th/type           :get-remove-from-organization-summary
+                               ::rpc/profile-id    (:id organization-owner)
+                               :profile-id         (:id user)
+                               :organization-id    organization-id
+                               :default-team-id    (:id organization-team)})]
+
+        ;; --- Verify: both teams still exist and are undeleted ---
+        (let [t1 (th/db-get :team {:id (:id organization-team)})]
+          (t/is (some? t1))
+          (t/is (nil? (:deleted-at t1))))
+        (let [t2 (th/db-get :team {:id (:id extra-team)})]
+          (t/is (some? t2))
+          (t/is (nil? (:deleted-at t2))))
+        ;; --- Verify: user is still a member of both teams ---
+        (let [rel1 (th/db-get :team-profile-rel {:team-id (:id organization-team) :profile-id (:id user)})]
+          (t/is (some? rel1)))
+        (let [rel2 (th/db-get :team-profile-rel {:team-id (:id extra-team) :profile-id (:id user)})]
+          (t/is (some? rel2)))))))
 
 (t/deftest notify-organization-sso-change-sends-setup-sso-email-once-per-recipient
-  (let [owner       (th/create-profile* 1 {:is-active true :fullname "Owner"})
-        member      (th/create-profile* 2 {:is-active true
-                                           :fullname "Member"
-                                           :email "member@example.com"})
-        invited     (th/create-profile* 3 {:is-active true
-                                           :fullname "Invited User"
-                                           :email "invited@example.com"})
-        org-id      (uuid/random)
-        org-name    "Acme Inc"
-        team        (th/create-team* 1 {:profile-id (:id owner)})
-        org-summary {:id org-id
-                     :name org-name
-                     :teams [{:id (:id team)}]}
-        sent        (atom [])
-        params      {::th/type :notify-organization-sso-change
-                     :organization-id org-id
-                     :updated-props false
-                     :became-active true}]
+  ;; --- Deferred mock data: depends on profile/team IDs from setup ---
+  (let [mock-data-ref (atom nil)
+        sent          (atom [])]
+    (with-mocks
+      [;; --- Nitrate mock: nil during setup, serve data once available ---
+       nitrate-mock {:target 'app.nitrate/call
+                     :return (fn [_cfg method _params]
+                               (if-let [data @mock-data-ref]
+                                 (let [{:keys [owner-id member-id organization-summary]} data]
+                                   (case method
+                                     :get-organization-members [owner-id member-id]
+                                     :get-organization-summary organization-summary
+                                     nil))
+                                 nil))}
+       ;; --- Email mock: capture sent emails ---
+       email-mock  {:target 'app.email/send!
+                    :return (fn [params] (swap! sent conj params) nil)}]
 
-    ;; Member also has a pending invitation: should still receive only one email.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :org-id org-id
-                    :team-id nil
-                    :email-to (:email member)
-                    :created-by (:id owner)
-                    :role "editor"
-                    :valid-until (ct/in-future "24h")})
+      ;; --- Setup: create profiles, team, organization-summary ---
+      (let [owner       (th/create-profile* 1 {:is-active true :fullname "Owner"})
+            member      (th/create-profile* 2 {:is-active true
+                                               :fullname "Member"
+                                               :email "member@example.com"})
+            invited     (th/create-profile* 3 {:is-active true
+                                               :fullname "Invited User"
+                                               :email "invited@example.com"})
+            organization-id      (uuid/random)
+            organization-name    "Acme Inc"
+            team        (th/create-team* 1 {:profile-id (:id owner)})
+            organization-summary {:id organization-id
+                                  :name organization-name
+                                  :teams [{:id (:id team)}]}
+            params      {::th/type :notify-organization-sso-change
+                         :organization-id organization-id
+                         :updated-props false
+                         :announce-activation true}]
 
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team)
-                    :org-id nil
-                    :email-to (:email invited)
-                    :created-by (:id owner)
-                    :role "editor"
-                    :valid-until (ct/in-future "48h")})
+        ;; --- Setup: insert invitations ---
+        ;; Member also has a pending invitation: should still receive only one email.
+        (th/db-insert! :team-invitation
+                       {:id (uuid/random)
+                        :org-id organization-id
+                        :team-id nil
+                        :email-to (:email member)
+                        :created-by (:id owner)
+                        :role "editor"
+                        :valid-until (ct/in-future "24h")})
 
-    ;; Invite without an existing profile.
-    (th/db-insert! :team-invitation
-                   {:id (uuid/random)
-                    :team-id (:id team)
-                    :org-id nil
-                    :email-to "external@example.com"
-                    :created-by (:id owner)
-                    :role "editor"
-                    :valid-until (ct/in-future "72h")})
+        (th/db-insert! :team-invitation
+                       {:id (uuid/random)
+                        :team-id (:id team)
+                        :org-id nil
+                        :email-to (:email invited)
+                        :created-by (:id owner)
+                        :role "editor"
+                        :valid-until (ct/in-future "48h")})
 
-    (with-redefs [nitrate/call (fn [_cfg method _params]
-                                 (case method
-                                   :get-org-members [(:id owner) (:id member)]
-                                   :get-org-summary org-summary
-                                   nil))
-                  eml/send! (fn [params] (swap! sent conj params))]
-      (management-command-with-nitrate! params))
+        ;; --- Invite without an existing profile ---
+        (th/db-insert! :team-invitation
+                       {:id (uuid/random)
+                        :team-id (:id team)
+                        :org-id nil
+                        :email-to "external@example.com"
+                        :created-by (:id owner)
+                        :role "editor"
+                        :valid-until (ct/in-future "72h")})
 
-    (let [emails (->> @sent (map :to) set)]
-      (t/is (= 4 (count @sent)))
-      (t/is (= #{"member@example.com"
-                 (:email owner)
-                 "invited@example.com"
-                 "external@example.com"}
-               emails))
-      (doseq [email-params @sent]
-        (t/is (= org-name (:organization-name email-params)))
-        (t/is (= eml/organization-setup-sso (::eml/factory email-params)))))))
+        ;; --- Publish mock data so the mock can serve it ---
+        (reset! mock-data-ref {:owner-id (:id owner)
+                               :member-id (:id member)
+                               :organization-summary organization-summary})
+
+        ;; --- Exercise: notify SSO change ---
+        (th/management-command! params)
+
+        ;; --- Verify: 4 emails sent to correct recipients ---
+        (let [emails (->> @sent (map :to) set)]
+          (t/is (= 4 (count @sent)))
+          (t/is (= #{"member@example.com"
+                     (:email owner)
+                     "invited@example.com"
+                     "external@example.com"}
+                   emails))
+          (doseq [email-params @sent]
+            (t/is (= organization-name (:organization-name email-params)))
+            (t/is (= eml/organization-setup-sso (::eml/factory email-params)))))))))
 
 (t/deftest notify-organization-sso-change-skips-email-when-not-active
   (let [sent   (atom [])
         params {::th/type :notify-organization-sso-change
                 :organization-id (uuid/random)
                 :updated-props false
-                :became-active false}]
+                :announce-activation false}]
     (with-redefs [eml/send! (fn [params] (swap! sent conj params))]
-      (management-command-with-nitrate! params))
+      (th/management-command! params))
     (t/is (empty? @sent))))
 
 (t/deftest check-organization-sso-returns-valid-true
-  (let [org-id (uuid/random)
+  (let [organization-id (uuid/random)
         out    (with-redefs [oidc/is-organization-sso-config-valid? (constantly true)]
-                 (management-command-with-nitrate!
+                 (th/management-command!
                   {::th/type :check-organization-sso
-                   :organization-id org-id
+                   :organization-id organization-id
                    :client-id "test-client"
                    :client-secret "test-secret"
-                   :base-url "https://idp.example.com"}))]
+                   :issuer "https://idp.example.com"}))]
     (t/is (th/success? out))
     (t/is (true? (-> out :result :valid)))))
 
 (t/deftest check-organization-sso-returns-valid-false-on-invalid-config
-  (let [out (management-command-with-nitrate!
+  (let [out (th/management-command!
              {::th/type :check-organization-sso
               :organization-id (uuid/random)
               :client-id "test-client"
@@ -1356,18 +1723,102 @@
     (t/is (th/success? out))
     (t/is (false? (-> out :result :valid)))))
 
-(t/deftest check-organization-sso-uses-issuer-when-base-url-is-blank
-  (let [org-id (uuid/random)
+(t/deftest check-organization-sso-passes-issuer-to-validation
+  (let [organization-id (uuid/random)
         out    (with-redefs [oidc/is-organization-sso-config-valid?
                              (fn [_cfg sso]
                                (and (= "test-client" (:client-id sso))
                                     (= "https://idp.example.com/" (:issuer sso))))]
-                 (management-command-with-nitrate!
+                 (th/management-command!
                   {::th/type :check-organization-sso
-                   :organization-id org-id
+                   :organization-id organization-id
                    :client-id "test-client"
                    :client-secret "test-secret"
-                   :base-url ""
                    :issuer "https://idp.example.com/"}))]
     (t/is (th/success? out))
     (t/is (true? (-> out :result :valid)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; PUSH AUDIT EVENTS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private http-request
+  {:headers {"x-forwarded-for" "192.168.1.10"
+             "x-real-ip" "192.168.1.10"}})
+
+(t/deftest push-audit-events-stores-backend-source
+  (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (binding [cf/flags #{:audit-log}]
+      (let [prof (th/create-profile* 1 {:is-active true})
+            params {::th/type :push-audit-events
+                    :events [{:name "test-action"
+                              :profile-id (:id prof)
+                              :props {:key "val"}
+                              :type "action"}]}
+            params (with-meta params
+                     {::http/request http-request})
+            out    (th/management-command! params)]
+        (t/is (nil? (:error out)))
+        (t/is (:called? @audit-mock))
+        (t/is (= 1 (:call-count @audit-mock)))
+        (let [[_ event] (:call-args @audit-mock)]
+          (t/is (= "test-action" (:name event)))
+          (t/is (= "action" (:type event)))
+          (t/is (= (:id prof) (:profile-id event)))
+          (t/is (= "val" (get-in event [:props :key])))
+          (t/is (some? (:tracked-at event))))))))
+
+(t/deftest push-audit-events-type-defaults-to-action
+  (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (binding [cf/flags #{:audit-log}]
+      (let [prof   (th/create-profile* 1 {:is-active true})
+            params {::th/type :push-audit-events
+                    :events [{:name "no-type-event"
+                              :profile-id (:id prof)}]}
+            params (with-meta params
+                     {::http/request http-request})
+            out    (th/management-command! params)]
+        (t/is (nil? (:error out)))
+        (let [[_ event] (:call-args @audit-mock)]
+          (t/is (= "action" (:type event)))
+          (t/is (= "no-type-event" (:name event))))))))
+
+(t/deftest push-audit-events-multiple-events
+  (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (binding [cf/flags #{:audit-log}]
+      (let [prof   (th/create-profile* 1 {:is-active true})
+            params {::th/type :push-audit-events
+                    :events [{:name "event-a"
+                              :profile-id (:id prof)
+                              :type "action"}
+                             {:name "event-b"
+                              :profile-id (:id prof)
+                              :type "action"}]}
+            params (with-meta params
+                     {::http/request http-request})
+            out    (th/management-command! params)]
+        (t/is (nil? (:error out)))
+        (t/is (= 2 (:call-count @audit-mock)))
+        (let [events (mapv second (:call-args-list @audit-mock))]
+          (t/is (= "event-a" (:name (first events))))
+          (t/is (= "event-b" (:name (second events)))))))))
+
+(t/deftest push-audit-events-merges-context
+  (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (binding [cf/flags #{:audit-log}]
+      (let [prof   (th/create-profile* 1 {:is-active true})
+            params {::th/type :push-audit-events
+                    :events [{:name "context-test"
+                              :profile-id (:id prof)
+                              :type "action"
+                              :context {:custom-key "custom-val"
+                                        :foo "bar"}}]}
+            params (with-meta params
+                     {::http/request http-request})
+            out    (th/management-command! params)]
+        (t/is (nil? (:error out)))
+        (let [[_ event] (:call-args @audit-mock)]
+          (t/is (= "custom-val" (get-in event [:context :custom-key])))
+          (t/is (= "bar" (get-in event [:context :foo])))
+          (t/is (= (:full cf/version) (get-in event [:context :version])))
+          (t/is (= "app" (get-in event [:context :initiator]))))))))
diff --git a/backend/test/backend_tests/rpc_media_test.clj b/backend/test/backend_tests/rpc_media_test.clj
index ff38aee470..4669ad929d 100644
--- a/backend/test/backend_tests/rpc_media_test.clj
+++ b/backend/test/backend_tests/rpc_media_test.clj
@@ -380,8 +380,41 @@
         (t/is (= :validation (:type (ex-data err))))
         (t/is (= :unable-to-download-image (:code (ex-data err))))))))
 
-;; --------------------------------------------------------------------
-;; Helpers for chunked-upload tests
+
+(t/deftest download-image-closes-stream
+  (t/testing "response body stream is closed on success"
+    (let [closed? (atom false)
+          ;; Minimal valid PNG (1x1 pixel, red)
+          png-data (byte-array [0x89 0x50 0x4E 0x47 0x0D 0x0A 0x1A 0x0A 0x00 0x00 0x00 0x0D 0x49 0x48 0x44 0x52 0x00 0x00 0x00 0x01 0x00 0x00 0x00 0x01 0x08 0x02 0x00 0x00 0x00 0x90 0x77 0x53 0xDE 0x00 0x00 0x00 0x0C 0x49 0x44 0x41 0x54 0x08 0xD7 0x63 0xF8 0xCF 0xC0 0x00 0x00 0x00 0x02 0x00 0x01 0xE2 0x21 0xBC 0x33 0x00 0x00 0x00 0x00 0x49 0x45 0x4E 0x44 0xAE 0x42 0x60 0x82])
+          body     (proxy [java.io.ByteArrayInputStream] [png-data]
+                     (close [] (reset! closed? true)))]
+      (with-mocks [http-mock {:target 'app.http.client/req-with-redirects
+                              :return {:status 200
+                                       :headers {"content-type" "image/png"
+                                                 "content-length" (str (alength png-data))}
+                                       :body body}}]
+        (let [cfg    {::http/client :mock-client}
+              result (media/download-image cfg "https://example.com/image.png")]
+          (t/is (some? result))
+          (t/is @closed? "body stream should be closed after successful download")))))
+
+  (t/testing "response body stream is closed on validation error"
+    (let [closed? (atom false)
+          body    (proxy [java.io.ByteArrayInputStream] [(byte-array 100)]
+                    (close [] (reset! closed? true)))]
+      (with-mocks [http-mock {:target 'app.http.client/req-with-redirects
+                              :return {:status 404
+                                       :headers {"content-type" "text/html"
+                                                 "content-length" "100"}
+                                       :body body}}]
+        (let [cfg {::http/client :mock-client}
+              err (try
+                    (media/download-image cfg "https://example.com/not-found.png")
+                    nil
+                    (catch clojure.lang.ExceptionInfo e e))]
+          (t/is (some? err))
+          (t/is (= :unable-to-download-image (:code (ex-data err))))
+          (t/is @closed? "body stream should be closed even on validation error"))))))
 ;; --------------------------------------------------------------------
 
 (defn- split-file-into-chunks
diff --git a/backend/test/backend_tests/rpc_nitrate_test.clj b/backend/test/backend_tests/rpc_nitrate_test.clj
index 28015bb369..5d973d94bd 100644
--- a/backend/test/backend_tests/rpc_nitrate_test.clj
+++ b/backend/test/backend_tests/rpc_nitrate_test.clj
@@ -6,16 +6,21 @@
 
 (ns backend-tests.rpc-nitrate-test
   (:require
+   [app.auth.oidc :as oidc]
+   [app.common.json :as json]
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.email :as eml]
+   [app.http :as-alias http]
    [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
    [app.rpc.commands.nitrate]
    [app.rpc.commands.teams :as teams]
+   [app.rpc.helpers :as rph]
    [backend-tests.helpers :as th]
+   [buddy.core.codecs :as bc]
    [clojure.test :as t]
    [cuerdas.core :as str]))
 
@@ -26,62 +31,167 @@
 ;; Helpers
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn- make-org-summary
-  [& {:keys [organization-id organization-name owner-id your-penpot-teams org-teams]
-      :or   {your-penpot-teams [] org-teams []}}]
+(defn- make-organization-summary
+  [& {:keys [organization-id organization-name owner-id your-penpot-teams organization-teams]
+      :or   {your-penpot-teams [] organization-teams []}}]
   {:id       organization-id
    :name     organization-name
    :owner-id owner-id
    :teams    (into
               (mapv (fn [id] {:id id :is-your-penpot true}) your-penpot-teams)
-              (mapv (fn [id] {:id id :is-your-penpot false}) org-teams))})
+              (mapv (fn [id] {:id id :is-your-penpot false}) organization-teams))})
 
 (defn- nitrate-call-mock
-  "Creates a mock for nitrate/call that returns the given org-summary for
-  :get-org-summary, a valid membership for :get-org-membership, and nil for
+  "Creates a mock for nitrate/call that returns the given organization-summary for
+  :get-organization-summary, a valid membership for :get-organization-membership, and nil for
   any other method."
-  [org-summary]
+  ([organization-summary]
+   (nitrate-call-mock organization-summary nil))
+  ([organization-summary remove-profile-params]
+   (fn [_cfg method params]
+     (case method
+       :get-organization-summary organization-summary
+       :get-organization-membership {:is-member true
+                                     :organization-id (:id organization-summary)}
+       :remove-profile-from-organization (when remove-profile-params
+                                           (reset! remove-profile-params params))
+       nil))))
+
+(defn- nitrate-organization-summary-only-mock
+  [organization-summary]
   (fn [_cfg method _params]
     (case method
-      :get-org-summary org-summary
-      :get-org-membership {:is-member true
-                           :organization-id (:id org-summary)}
+      :get-organization-summary organization-summary
+      :get-organization-membership {:is-member true
+                                    :organization-id (:id organization-summary)
+                                    :created-at (ct/inst "2026-07-17T12:00:00Z")}
+      :get-organization-members [(:owner-id organization-summary)
+                                 (uuid/random)]
       nil)))
 
-(defn- nitrate-org-summary-only-mock
-  [org-summary]
-  (fn [_cfg method _params]
+(defn- active-sso-call-mock
+  [team-id organization-id organization-owner-id]
+  (fn [_cfg method params]
     (case method
-      :get-org-summary org-summary
+      :get-team-organization
+      (when (= team-id (:team-id params))
+        {:id team-id
+         :organization {:id organization-id
+                        :owner-id organization-owner-id}})
+
+      :get-organization-sso-by-team
+      {:active true
+       :issuer "https://idp.example.com"
+       :organization-id organization-id}
+
       nil)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Tests
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(t/deftest leave-org-happy-path-no-extra-teams
+(t/deftest check-nitrate-sso-skips-gate-without-team-access
+  (let [team-owner       (th/create-profile* 1 {:is-active true})
+        external-profile (th/create-profile* 2 {:is-active true})
+        team             (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id  (uuid/random)
+        params           (with-meta
+                           {::th/type :check-nitrate-sso
+                            ::rpc/profile-id (:id external-profile)
+                            :team-id (:id team)
+                            :url "https://penpot.example.com/#/workspace"}
+                           {::http/request {}})]
+    (binding [cf/flags (conj cf/flags :admin-console)]
+      (with-redefs [nitrate/call
+                    (active-sso-call-mock
+                     (:id team)
+                     organization-id
+                     (:id team-owner))
+                    oidc/build-organization-sso-auth-redirect-uri
+                    (constantly "https://idp.example.com/authorize")]
+        (let [out (th/command! params)]
+          (t/is (th/success? out))
+          (t/is (= {:authorized true} (:result out))))))))
+
+(t/deftest check-nitrate-sso-keeps-gate-for-team-member
+  (let [team-owner      (th/create-profile* 1 {:is-active true})
+        team            (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id (uuid/random)
+        redirect-uri    "https://idp.example.com/authorize"
+        params          (with-meta
+                          {::th/type :check-nitrate-sso
+                           ::rpc/profile-id (:id team-owner)
+                           :team-id (:id team)
+                           :url "https://penpot.example.com/#/workspace"}
+                          {::http/request {}})]
+    (binding [cf/flags (conj cf/flags :admin-console)]
+      (with-redefs [nitrate/call
+                    (active-sso-call-mock
+                     (:id team)
+                     organization-id
+                     (:id team-owner))
+                    oidc/build-organization-sso-auth-redirect-uri
+                    (constantly redirect-uri)]
+        (let [out (th/command! params)]
+          (t/is (th/success? out))
+          (t/is (= {:authorized false
+                    :redirect-uri redirect-uri}
+                   (:result out))))))))
+
+(t/deftest check-nitrate-sso-keeps-gate-for-non-member-organization-owner
+  (let [team-owner      (th/create-profile* 1 {:is-active true})
+        organization-owner       (th/create-profile* 2 {:is-active true})
+        team            (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id (uuid/random)
+        redirect-uri    "https://idp.example.com/authorize"
+        params          (with-meta
+                          {::th/type :check-nitrate-sso
+                           ::rpc/profile-id (:id organization-owner)
+                           :team-id (:id team)
+                           :url "https://penpot.example.com/#/workspace"}
+                          {::http/request {}})]
+    (binding [cf/flags (conj cf/flags :admin-console)]
+      (with-redefs [nitrate/organization-owner-of-team?
+                    (fn [_cfg profile-id team-id]
+                      (and (= (:id organization-owner) profile-id)
+                           (= (:id team) team-id)))
+                    nitrate/call
+                    (active-sso-call-mock
+                     (:id team)
+                     organization-id
+                     (:id organization-owner))
+                    oidc/build-organization-sso-auth-redirect-uri
+                    (constantly redirect-uri)]
+        (let [out (th/command! params)]
+          (t/is (th/success? out))
+          (t/is (= {:authorized false
+                    :redirect-uri redirect-uri}
+                   (:result out))))))))
+
+(t/deftest leave-organization-happy-path-no-extra-teams
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
 
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
         project          (th/create-project* 99 {:profile-id (:id profile-user)
-                                                 :team-id (:id org-default-team)})
+                                                 :team-id (:id organization-default-team)})
         _                (th/create-file* 99 {:profile-id (:id profile-user)
                                               :project-id (:id project)})
 
         organization-id         (uuid/random)
-        ;; The user's personal penpot team in the org context
-        your-penpot-id (:id org-default-team)
+        ;; The user's personal penpot team in the organization context
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
+        organization-summary          (make-organization-summary
+                                       :organization-id   organization-id
+                                       :organization-name "Test Org"
+                                       :owner-id          (:id profile-owner)
+                                       :your-penpot-teams [your-penpot-id]
+                                       :organization-teams         [])
+        remove-profile-params (atom nil)]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary remove-profile-params)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -94,29 +204,34 @@
         (t/is (th/success? out))
         (t/is (nil? (:result out)))
 
-        ;; The personal team must be renamed with the org prefix and
+        ;; The personal team must be renamed with the organization prefix and
         ;; unset as a default team.
         (let [team (th/db-get :team {:id your-penpot-id})]
           (t/is (str/starts-with? (:name team) "[Test Org] "))
-          (t/is (false? (:is-default team))))))))
+          (t/is (false? (:is-default team))))
 
-(t/deftest leave-org-deletes-org-default-team-when-empty
+        (t/is (= (:id profile-user)
+                 (:user-who-delete-member @remove-profile-params)))
+        (t/is (= "organization-member"
+                 (:deleted-by-role @remove-profile-params)))))))
+
+(t/deftest leave-organization-deletes-organization-default-team-when-empty
   (let [profile-owner   (th/create-profile* 1 {:is-active true})
         profile-user    (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 98 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 98 {:profile-id (:id profile-user)})
 
         organization-id          (uuid/random)
-        your-penpot-id  (:id org-default-team)
+        your-penpot-id  (:id organization-default-team)
 
-        org-summary     (make-org-summary
-                         :organization-id            organization-id
-                         :organization-name          "Test Org"
-                         :owner-id          (:id profile-owner)
-                         :your-penpot-teams [your-penpot-id]
-                         :org-teams         [])]
+        organization-summary     (make-organization-summary
+                                  :organization-id            organization-id
+                                  :organization-name          "Test Org"
+                                  :owner-id          (:id profile-owner)
+                                  :your-penpot-teams [your-penpot-id]
+                                  :organization-teams         [])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -127,31 +242,31 @@
 
         (t/is (th/success? out))
 
-        ;; Empty org default team should be soft-deleted.
+        ;; Empty organization default team should be soft-deleted.
         (let [team (th/db-get :team {:id your-penpot-id} {::db/remove-deleted false})]
           (t/is (some? (:deleted-at team))))))))
 
-(t/deftest leave-org-keeps-and-renames-org-default-team-when-has-files
+(t/deftest leave-organization-keeps-and-renames-organization-default-team-when-has-files
   (let [profile-owner    (th/create-profile* 1 {:is-active true})
         profile-user     (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 97 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 97 {:profile-id (:id profile-user)})
         project          (th/create-project* 97 {:profile-id (:id profile-user)
-                                                 :team-id (:id org-default-team)})
+                                                 :team-id (:id organization-default-team)})
         _                (th/create-file* 97 {:profile-id (:id profile-user)
                                               :project-id (:id project)})
 
         organization-id           (uuid/random)
-        your-penpot-id   (:id org-default-team)
+        your-penpot-id   (:id organization-default-team)
 
-        org-summary      (make-org-summary
-                          :organization-id            organization-id
-                          :organization-name          "Test Org"
-                          :owner-id          (:id profile-owner)
-                          :your-penpot-teams [your-penpot-id]
-                          :org-teams         [])]
+        organization-summary      (make-organization-summary
+                                   :organization-id            organization-id
+                                   :organization-name          "Test Org"
+                                   :owner-id          (:id profile-owner)
+                                   :your-penpot-teams [your-penpot-id]
+                                   :organization-teams         [])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -162,31 +277,31 @@
 
         (t/is (th/success? out))
 
-        ;; Non-empty org default team should remain and be renamed.
+        ;; Non-empty organization default team should remain and be renamed.
         (let [team (th/db-get :team {:id your-penpot-id})]
           (t/is (str/starts-with? (:name team) "[Test Org] "))
           (t/is (false? (:is-default team)))
           (t/is (nil? (:deleted-at team))))))))
 
-(t/deftest leave-org-with-teams-to-delete
+(t/deftest leave-organization-with-teams-to-delete
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-user is the sole owner/member of team1
         team1          (th/create-team* 1 {:profile-id (:id profile-user)})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -202,7 +317,7 @@
         (let [team (th/db-get :team {:id (:id team1)} {::db/remove-deleted false})]
           (t/is (some? (:deleted-at team))))))))
 
-(t/deftest leave-org-with-ownership-transfer
+(t/deftest leave-organization-with-ownership-transfer
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-user owns team1; profile-owner is also a member
@@ -210,20 +325,20 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-owner)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -247,7 +362,7 @@
                               :profile-id (:id profile-owner)})]
           (t/is (true? (:is-owner rel))))))))
 
-(t/deftest leave-org-exit-as-non-owner
+(t/deftest leave-organization-exit-as-non-owner
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-owner owns team1; profile-user is a non-owner member
@@ -255,20 +370,20 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-user)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -290,22 +405,22 @@
         (let [team (th/db-get :team {:id (:id team1)})]
           (t/is (nil? (:deleted-at team))))))))
 
-(t/deftest get-leave-org-summary-counts-default-team-as-delete-when-empty
+(t/deftest get-leave-organization-summary-counts-default-team-as-delete-when-empty
   (let [profile-owner    (th/create-profile* 1 {:is-active true})
         profile-user     (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 97 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 97 {:profile-id (:id profile-user)})
 
         organization-id  (uuid/random)
-        your-penpot-id   (:id org-default-team)
-        org-summary      (make-org-summary
-                          :organization-id organization-id
-                          :organization-name "Test Org"
-                          :owner-id (:id profile-owner)
-                          :your-penpot-teams [your-penpot-id]
-                          :org-teams [])]
+        your-penpot-id   (:id organization-default-team)
+        organization-summary      (make-organization-summary
+                                   :organization-id organization-id
+                                   :organization-name "Test Org"
+                                   :owner-id (:id profile-owner)
+                                   :your-penpot-teams [your-penpot-id]
+                                   :organization-teams [])]
 
-    (with-redefs [nitrate/call (nitrate-org-summary-only-mock org-summary)]
-      (let [out (th/command! {::th/type :get-leave-org-summary
+    (with-redefs [nitrate/call (nitrate-organization-summary-only-mock organization-summary)]
+      (let [out (th/command! {::th/type :get-leave-organization-summary
                               ::rpc/profile-id (:id profile-user)
                               :id organization-id
                               :default-team-id your-penpot-id})]
@@ -313,30 +428,32 @@
         (t/is (= {:teams-to-delete 0
                   :teams-to-transfer 0
                   :teams-to-exit 0
-                  :teams-to-detach 0}
+                  :teams-to-detach 0
+                  :member-added-at (ct/inst "2026-07-17T12:00:00Z")
+                  :organization-member-count-before 2}
                  (:result out)))))))
 
-(t/deftest get-leave-org-summary-counts-default-team-as-keep-when-has-files
+(t/deftest get-leave-organization-summary-counts-default-team-as-keep-when-has-files
   (let [profile-owner    (th/create-profile* 1 {:is-active true})
         profile-user     (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 96 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 96 {:profile-id (:id profile-user)})
         project          (th/create-project* 96 {:profile-id (:id profile-user)
-                                                 :team-id (:id org-default-team)})
+                                                 :team-id (:id organization-default-team)})
         _                (th/create-file* 96 {:profile-id (:id profile-user)
                                               :project-id (:id project)})
         extra-team       (th/create-team* 95 {:profile-id (:id profile-user)})
 
         organization-id  (uuid/random)
-        your-penpot-id   (:id org-default-team)
-        org-summary      (make-org-summary
-                          :organization-id organization-id
-                          :organization-name "Test Org"
-                          :owner-id (:id profile-owner)
-                          :your-penpot-teams [your-penpot-id]
-                          :org-teams [(:id extra-team)])]
+        your-penpot-id   (:id organization-default-team)
+        organization-summary      (make-organization-summary
+                                   :organization-id organization-id
+                                   :organization-name "Test Org"
+                                   :owner-id (:id profile-owner)
+                                   :your-penpot-teams [your-penpot-id]
+                                   :organization-teams [(:id extra-team)])]
 
-    (with-redefs [nitrate/call (nitrate-org-summary-only-mock org-summary)]
-      (let [out (th/command! {::th/type :get-leave-org-summary
+    (with-redefs [nitrate/call (nitrate-organization-summary-only-mock organization-summary)]
+      (let [out (th/command! {::th/type :get-leave-organization-summary
                               ::rpc/profile-id (:id profile-user)
                               :id organization-id
                               :default-team-id your-penpot-id})]
@@ -345,25 +462,27 @@
         (t/is (= {:teams-to-delete 1
                   :teams-to-transfer 0
                   :teams-to-exit 0
-                  :teams-to-detach 1}
+                  :teams-to-detach 1
+                  :member-added-at (ct/inst "2026-07-17T12:00:00Z")
+                  :organization-member-count-before 2}
                  (:result out)))))))
 
-(t/deftest leave-org-error-org-owner-cannot-leave
+(t/deftest leave-organization-error-organization-owner-cannot-leave
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-owner)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-owner)})
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        ;; profile-owner IS the org owner in the org-summary
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
+        ;; profile-owner IS the organization owner in the organization-summary
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-owner)
                   :id          organization-id
                   :name        "Test Org"
@@ -374,25 +493,25 @@
 
         (t/is (not (th/success? out)))
         (t/is (= :validation (th/ex-type (:error out))))
-        (t/is (= :org-owner-cannot-leave (th/ex-code (:error out))))))))
+        (t/is (= :organization-owner-cannot-leave (th/ex-code (:error out))))))))
 
-(t/deftest leave-org-error-invalid-default-team-id
+(t/deftest leave-organization-error-invalid-default-team-id
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; Pass a random UUID that is not in the your-penpot-teams list
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -419,7 +538,7 @@
                         :or   {is-owner false num-members 1 member-ids []}}]
   {:id id :is-owner is-owner :num-members num-members :member-ids member-ids})
 
-(t/deftest calculate-valid-teams-no-org-teams
+(t/deftest calculate-valid-teams-no-organization-teams
   (let [default-id (uuid/random)
         default-team (make-team default-id)
         result (calculate-valid-teams [default-team] default-id)]
@@ -432,7 +551,7 @@
   (let [default-id   (uuid/random)
         other-id     (uuid/random)
         other-team   (make-team other-id)
-        ;; default-id is not in org-teams at all
+        ;; default-id is not in organization-teams at all
         result (calculate-valid-teams [other-team] default-id)]
     (t/is (nil? (:valid-default-team result)))))
 
@@ -487,7 +606,7 @@
 ;; Integration: combined delete + leave
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(t/deftest leave-org-combined-delete-and-leave
+(t/deftest leave-organization-combined-delete-and-leave
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; team1: profile-user is sole owner — must delete
@@ -502,20 +621,20 @@
         _              (th/create-team-role* {:team-id    (:id team3)
                                               :profile-id (:id profile-user)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1) (:id team2) (:id team3)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1) (:id team2) (:id team3)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
-      (let [data {::th/type        :leave-org
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -546,27 +665,27 @@
         ;; team3 itself should still exist (profile-owner is still there)
         (let [team (th/db-get :team {:id (:id team3)})]
           (t/is (some? team)))))))
-(t/deftest leave-org-error-teams-to-delete-incomplete
+(t/deftest leave-organization-error-teams-to-delete-incomplete
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-user is the sole owner/member of both team1 and team2
         team1          (th/create-team* 1 {:profile-id (:id profile-user)})
         team2          (th/create-team* 2 {:profile-id (:id profile-user)})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1) (:id team2)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1) (:id team2)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; Only team1 is listed; team2 is also a sole-owner team and must be included
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -579,7 +698,7 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(t/deftest leave-org-error-cannot-delete-multi-member-team
+(t/deftest leave-organization-error-cannot-delete-multi-member-team
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; team1 has two members: profile-user (owner) and profile-owner (editor)
@@ -587,21 +706,21 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-owner)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; team1 has 2 members so it is not a valid deletion candidate
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -614,7 +733,7 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(t/deftest leave-org-error-teams-to-leave-incomplete
+(t/deftest leave-organization-error-teams-to-leave-incomplete
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-user owns team1, which also has profile-owner as editor
@@ -622,21 +741,21 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-owner)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; team1 must be transferred (owner + multiple members) but is absent
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -649,28 +768,28 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(t/deftest leave-org-error-reassign-to-self
+(t/deftest leave-organization-error-reassign-to-self
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         team1          (th/create-team* 1 {:profile-id (:id profile-user)})
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-owner)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; reassign-to points to the profile that is leaving — not allowed
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -683,7 +802,7 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(t/deftest leave-org-error-reassign-to-non-member
+(t/deftest leave-organization-error-reassign-to-non-member
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         profile-other  (th/create-profile* 3 {:is-active true})
@@ -692,21 +811,21 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-owner)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; profile-other is not a member of team1
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -719,7 +838,7 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(t/deftest all-team-members-in-orgs-returns-org-id->boolean-map
+(t/deftest all-team-members-in-organizations-returns-organization-id->boolean-map
   (let [profile-user  (th/create-profile* 201 {:is-active true})
         profile-other (th/create-profile* 202 {:is-active true})
         team          (th/create-team* 201 {:profile-id (:id profile-user)})
@@ -729,62 +848,62 @@
         team-member-ids (->> (th/db-query :team-profile-rel {:team-id (:id team)})
                              (map :profile-id)
                              (into #{}))
-        org-id-1      (uuid/random)
-        org-id-2      (uuid/random)
+        organization-id-1      (uuid/random)
+        organization-id-2      (uuid/random)
         calls         (atom [])]
-    (with-redefs [cf/flags (conj cf/flags :nitrate)
+    (with-redefs [cf/flags (conj cf/flags :admin-console)
                   nitrate/call (fn [_cfg method params]
                                  (swap! calls conj [method params])
                                  (case method
-                                   :get-org-membership {:is-member true
-                                                        :organization-id (:organization-id params)}
-                                   :get-org-members (get {org-id-1 (vec team-member-ids)
-                                                          org-id-2 [(:id profile-user)]}
-                                                         (:organization-id params)
-                                                         [])
+                                   :get-organization-membership {:is-member true
+                                                                 :organization-id (:organization-id params)}
+                                   :get-organization-members (get {organization-id-1 (vec team-member-ids)
+                                                                   organization-id-2 [(:id profile-user)]}
+                                                                  (:organization-id params)
+                                                                  [])
                                    nil))]
-      (let [out (th/command! {::th/type :all-team-members-in-orgs
+      (let [out (th/command! {::th/type :all-team-members-in-organizations
                               ::rpc/profile-id (:id profile-user)
                               :team-id (:id team)
-                              :organization-ids [org-id-1 org-id-2]})
+                              :organization-ids [organization-id-1 organization-id-2]})
             methods (map first @calls)
-            membership-calls (count (filter #(= :get-org-membership %) methods))
-            get-members-calls (count (filter #(= :get-org-members %) methods))]
+            membership-calls (count (filter #(= :get-organization-membership %) methods))
+            get-members-calls (count (filter #(= :get-organization-members %) methods))]
         (t/is (th/success? out))
-        (t/is (= {org-id-1 true
-                  org-id-2 false}
+        (t/is (= {organization-id-1 true
+                  organization-id-2 false}
                  (:result out)))
         (t/is (= 2 membership-calls))
         (t/is (= 2 get-members-calls))))))
 
-(t/deftest all-team-members-in-orgs-fails-before-fetching-org-members
+(t/deftest all-team-members-in-organizations-fails-before-fetching-organization-members
   (let [profile-user  (th/create-profile* 203 {:is-active true})
         team          (th/create-team* 203 {:profile-id (:id profile-user)})
-        org-id-1      (uuid/random)
-        org-id-2      (uuid/random)
+        organization-id-1      (uuid/random)
+        organization-id-2      (uuid/random)
         calls         (atom [])]
-    (with-redefs [cf/flags (conj cf/flags :nitrate)
+    (with-redefs [cf/flags (conj cf/flags :admin-console)
                   nitrate/call (fn [_cfg method params]
                                  (swap! calls conj [method params])
                                  (case method
-                                   :get-org-membership (if (= (:organization-id params) org-id-2)
-                                                         {:is-member false
-                                                          :organization-id (:organization-id params)}
-                                                         {:is-member true
-                                                          :organization-id (:organization-id params)})
-                                   :get-org-members []
+                                   :get-organization-membership (if (= (:organization-id params) organization-id-2)
+                                                                  {:is-member false
+                                                                   :organization-id (:organization-id params)}
+                                                                  {:is-member true
+                                                                   :organization-id (:organization-id params)})
+                                   :get-organization-members []
                                    nil))]
-      (let [out (th/command! {::th/type :all-team-members-in-orgs
+      (let [out (th/command! {::th/type :all-team-members-in-organizations
                               ::rpc/profile-id (:id profile-user)
                               :team-id (:id team)
-                              :organization-ids [org-id-1 org-id-2]})
+                              :organization-ids [organization-id-1 organization-id-2]})
             methods (map first @calls)]
         (t/is (not (th/success? out)))
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :user-doesnt-belong-organization (th/ex-code (:error out))))
-        (t/is (= 0 (count (filter #(= :get-org-members %) methods))))))))
+        (t/is (= 0 (count (filter #(= :get-organization-members %) methods))))))))
 
-(t/deftest leave-org-error-reassign-on-non-owned-team
+(t/deftest leave-organization-error-reassign-on-non-owned-team
   (let [profile-owner  (th/create-profile* 1 {:is-active true})
         profile-user   (th/create-profile* 2 {:is-active true})
         ;; profile-owner owns team1; profile-user is just a non-owner member
@@ -792,21 +911,21 @@
         _              (th/create-team-role* {:team-id    (:id team1)
                                               :profile-id (:id profile-user)
                                               :role       :editor})
-        org-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
+        organization-default-team (th/create-team* 99 {:profile-id (:id profile-user)})
 
         organization-id         (uuid/random)
-        your-penpot-id (:id org-default-team)
+        your-penpot-id (:id organization-default-team)
 
-        org-summary    (make-org-summary
-                        :organization-id            organization-id
-                        :organization-name          "Test Org"
-                        :owner-id          (:id profile-owner)
-                        :your-penpot-teams [your-penpot-id]
-                        :org-teams         [(:id team1)])]
+        organization-summary    (make-organization-summary
+                                 :organization-id            organization-id
+                                 :organization-name          "Test Org"
+                                 :owner-id          (:id profile-owner)
+                                 :your-penpot-teams [your-penpot-id]
+                                 :organization-teams         [(:id team1)])]
 
-    (with-redefs [nitrate/call (nitrate-call-mock org-summary)]
+    (with-redefs [nitrate/call (nitrate-call-mock organization-summary)]
       ;; profile-user is not the owner so providing reassign-to is invalid
-      (let [data {::th/type        :leave-org
+      (let [data {::th/type        :leave-organization
                   ::rpc/profile-id (:id profile-user)
                   :id          organization-id
                   :name        "Test Org"
@@ -819,20 +938,23 @@
         (t/is (= :validation (th/ex-type (:error out))))
         (t/is (= :not-valid-teams (th/ex-code (:error out))))))))
 
-(defn- add-team-to-org-nitrate-mock
-  [{:keys [org-id org-summary org-perms owner-id team-id sso-active?]}]
+(defn- add-team-to-organization-nitrate-mock
+  [{:keys [organization-id organization-summary organization-perms owner-id team-id sso-active? set-team-params]}]
   (fn [_cfg method params]
     (case method
-      :get-org-membership (if (= (:profile-id params) owner-id)
-                            {:is-member true :organization-id org-id}
-                            {:is-member false :organization-id org-id})
-      :get-org-members [owner-id]
-      :get-team-org {:organization nil}
-      :get-org-permissions org-perms
-      :set-team-org {:id team-id}
-      :get-org-sso {:active sso-active?}
-      :get-org-summary (assoc org-summary :teams [{:id team-id}])
-      :add-profile-to-org {:is-member true}
+      :get-organization-membership (if (= (:profile-id params) owner-id)
+                                     {:is-member true :organization-id organization-id}
+                                     {:is-member false :organization-id organization-id})
+      :get-organization-members [owner-id]
+      :get-team-organization {:organization nil}
+      :get-organization-permissions organization-perms
+      :set-team-organization (do
+                               (when set-team-params
+                                 (reset! set-team-params params))
+                               {:id team-id})
+      :get-organization-sso {:active sso-active?}
+      :get-organization-summary (assoc organization-summary :teams [{:id team-id}])
+      :add-profile-to-organization {:is-member true}
       nil)))
 
 (t/deftest add-team-to-organization-sends-sso-emails-to-new-members-and-invitees
@@ -846,17 +968,18 @@
         _          (th/create-team-role* {:team-id (:id team)
                                           :profile-id (:id member)
                                           :role :editor})
-        org-id     (uuid/random)
-        org-name   "SSO Org"
-        org-summary {:id org-id
-                     :name org-name
-                     :owner-id (:id owner)
-                     :teams []}
-        org-perms  {:owner-id (:id owner)
-                    :permissions {:create-teams "any"
-                                  :move-teams "always"
-                                  :new-team-members "members"}}
-        sent       (atom [])]
+        organization-id     (uuid/random)
+        organization-name   "SSO Org"
+        organization-summary {:id organization-id
+                              :name organization-name
+                              :owner-id (:id owner)
+                              :teams []}
+        organization-perms  {:owner-id (:id owner)
+                             :permissions {:create-teams "any"
+                                           :move-teams "always"
+                                           :new-team-members "members"}}
+        sent       (atom [])
+        set-team-params (atom nil)]
 
     (th/db-insert! :team-invitation
                    {:id (uuid/random)
@@ -867,29 +990,55 @@
                     :role "editor"
                     :valid-until (ct/in-future "48h")})
 
-    (with-redefs [cf/flags (conj cf/flags :nitrate)
-                  nitrate/call (add-team-to-org-nitrate-mock
-                                {:org-id org-id
-                                 :org-summary org-summary
-                                 :org-perms org-perms
+    (with-redefs [cf/flags (conj cf/flags :admin-console)
+                  nitrate/call (add-team-to-organization-nitrate-mock
+                                {:organization-id organization-id
+                                 :organization-summary organization-summary
+                                 :organization-perms organization-perms
                                  :owner-id (:id owner)
                                  :team-id (:id team)
-                                 :sso-active? true})
-                  teams/initialize-user-in-nitrate-org (fn [& _] nil)
+                                 :sso-active? true
+                                 :set-team-params set-team-params})
+                  teams/initialize-user-in-organization (fn [& _] nil)
                   eml/send! (fn [params] (swap! sent conj params))]
       (let [out (th/command! {::th/type :add-team-to-organization
                               ::rpc/profile-id (:id owner)
                               :team-id (:id team)
-                              :organization-id org-id})]
+                              :organization-id organization-id})]
         (t/is (th/success? out))))
 
+    (t/is (= {:team-id (:id team)
+              :organization-id organization-id
+              :is-default false}
+             @set-team-params))
+
     (let [emails (->> @sent (map :to) set)]
       (t/is (= 2 (count @sent)))
       (t/is (= #{"member302@example.com" "external301@example.com"} emails))
       (doseq [email-params @sent]
-        (t/is (= org-name (:organization-name email-params)))
+        (t/is (= organization-name (:organization-name email-params)))
         (t/is (= eml/organization-setup-sso (::eml/factory email-params)))))))
 
+(t/deftest create-team-in-organization-passes-association-to-nitrate
+  (let [organization-id (uuid/random)
+        team            {:id (uuid/random)
+                         :created-at (ct/now)}
+        params*         (atom nil)]
+    (with-redefs [nitrate/call (fn [_cfg method params]
+                                 (when (= method :set-team-organization)
+                                   (reset! params* params))
+                                 {:id (:id team)})]
+      (nitrate/set-team-organization
+       {}
+       team
+       {:organization-id organization-id
+        :is-default false}))
+
+    (t/is (= {:team-id (:id team)
+              :organization-id organization-id
+              :is-default false}
+             @params*))))
+
 (t/deftest add-team-to-organization-skips-sso-emails-when-sso-inactive
   (let [owner      (th/create-profile* 303 {:is-active true :email "owner303@example.com"})
         member     (th/create-profile* 304 {:is-active true :email "member304@example.com"})
@@ -897,15 +1046,15 @@
         _          (th/create-team-role* {:team-id (:id team)
                                           :profile-id (:id member)
                                           :role :editor})
-        org-id     (uuid/random)
-        org-summary {:id org-id
-                     :name "No SSO Org"
-                     :owner-id (:id owner)
-                     :teams []}
-        org-perms  {:owner-id (:id owner)
-                    :permissions {:create-teams "any"
-                                  :move-teams "always"
-                                  :new-team-members "members"}}
+        organization-id     (uuid/random)
+        organization-summary {:id organization-id
+                              :name "No SSO Org"
+                              :owner-id (:id owner)
+                              :teams []}
+        organization-perms  {:owner-id (:id owner)
+                             :permissions {:create-teams "any"
+                                           :move-teams "always"
+                                           :new-team-members "members"}}
         sent       (atom [])]
 
     (th/db-insert! :team-invitation
@@ -917,19 +1066,60 @@
                     :role "editor"
                     :valid-until (ct/in-future "48h")})
 
-    (with-redefs [cf/flags (conj cf/flags :nitrate)
-                  nitrate/call (add-team-to-org-nitrate-mock
-                                {:org-id org-id
-                                 :org-summary org-summary
-                                 :org-perms org-perms
+    (with-redefs [cf/flags (conj cf/flags :admin-console)
+                  nitrate/call (add-team-to-organization-nitrate-mock
+                                {:organization-id organization-id
+                                 :organization-summary organization-summary
+                                 :organization-perms organization-perms
                                  :owner-id (:id owner)
                                  :team-id (:id team)
                                  :sso-active? false})
-                  teams/initialize-user-in-nitrate-org (fn [& _] nil)
+                  teams/initialize-user-in-organization (fn [& _] nil)
                   eml/send! (fn [params] (swap! sent conj params))]
       (let [out (th/command! {::th/type :add-team-to-organization
                               ::rpc/profile-id (:id owner)
                               :team-id (:id team)
-                              :organization-id org-id})]
+                              :organization-id organization-id})]
         (t/is (th/success? out))
         (t/is (empty? @sent))))))
+
+(t/deftest get-nitrate-activation-code-request
+  (let [profile    (th/create-profile* 1 {:is-active true})
+        nitrate-id "nitrate-instance-1"
+        public-key "-----BEGIN PUBLIC KEY-----\nMIIB\n-----END PUBLIC KEY-----"
+        now        (ct/now)]
+    (with-redefs [cf/flags     (conj cf/flags :admin-console)
+                  ct/now       (constantly now)
+                  nitrate/call (fn [_cfg method _params]
+                                 (t/is (= :get-identity method))
+                                 {:nitrate-id nitrate-id
+                                  :public-key public-key})]
+      (let [out  (th/command! {::th/type :get-nitrate-activation-code-request
+                               ::rpc/profile-id (:id profile)})
+            body (-> (:result out)
+                     (bc/b64->str)
+                     (json/decode :key-fn json/read-kebab-key))]
+        (t/is (th/success? out))
+        (t/is (= {:nitrate-id nitrate-id
+                  :public-key public-key
+                  :email      (:email profile)
+                  :iat        (ct/seconds now)}
+                 body))
+
+        (let [[_ method-fn] (get-in th/*system* [:app.rpc/methods :get-nitrate-activation-code-request])
+              result        (method-fn {::rpc/profile-id (:id profile)
+                                        ::rpc/request-at now})
+              headers       (::http/headers (meta result))]
+          (t/is (rph/wrapped? result))
+          (t/is (= "text/plain" (get headers "content-type")))
+          (t/is (= "attachment; filename=\"penpot-activation-code-request.txt\""
+                   (get headers "content-disposition"))))))))
+
+(t/deftest get-nitrate-activation-code-request-identity-unavailable
+  (let [profile (th/create-profile* 1 {:is-active true})]
+    (with-redefs [cf/flags     (conj cf/flags :admin-console)
+                  nitrate/call (fn [_cfg _method _params] nil)]
+      (let [out (th/command! {::th/type :get-nitrate-activation-code-request
+                              ::rpc/profile-id (:id profile)})]
+        (t/is (not (th/success? out)))
+        (t/is (th/ex-of-code? (:error out) :nitrate-identity-unavailable))))))
diff --git a/backend/test/backend_tests/rpc_org_owner_permissions_test.clj b/backend/test/backend_tests/rpc_org_owner_permissions_test.clj
deleted file mode 100644
index 7ac84ef042..0000000000
--- a/backend/test/backend_tests/rpc_org_owner_permissions_test.clj
+++ /dev/null
@@ -1,150 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC Sucursal en España SL
-
-(ns backend-tests.rpc-org-owner-permissions-test
-  (:require
-   [app.common.uuid :as uuid]
-   [app.config :as cf]
-   [app.nitrate :as nitrate]
-   [app.rpc :as-alias rpc]
-   [backend-tests.helpers :as th]
-   [clojure.test :as t]))
-
-(t/use-fixtures :once th/state-init)
-(t/use-fixtures :each th/database-reset)
-
-(defn- org-data
-  [org-id owner-id]
-  {:id            org-id
-   :name          "Acme"
-   :slug          "acme"
-   :owner-id      owner-id
-   :avatar-bg-url "http://example.com/avatar.png"
-   :permissions   {}})
-
-(defn- with-org-owner-access
-  [{:keys [org-owner-id org-id team-id]} f]
-  (with-redefs [cf/flags (conj cf/flags :nitrate)
-                nitrate/organization-owner-of-team?
-                (fn [_cfg profile-id candidate-team-id]
-                  (and (= org-owner-id profile-id)
-                       (= team-id candidate-team-id)))
-
-                nitrate/call
-                (fn [_cfg method params]
-                  (case method
-                    :get-owned-orgs
-                    [{:id org-id
-                      :name "Acme"
-                      :owner-id org-owner-id
-                      :teams [{:id team-id :is-your-penpot false}]}]
-
-                    :get-team-org
-                    (if (= team-id (:team-id params))
-                      {:id team-id
-                       :is-your-penpot false
-                       :organization (org-data org-id org-owner-id)}
-                      {:id (:team-id params)
-                       :is-your-penpot false
-                       :organization nil})))]
-    (f)))
-
-(t/deftest org-owner-access-disabled-without-nitrate-flag
-  (let [team-owner  (th/create-profile* 1)
-        org-owner   (th/create-profile* 2)
-        target-team (th/create-team* 1 {:profile-id (:id team-owner)})]
-
-    (let [out   (th/command! {::th/type :get-projects
-                              ::rpc/profile-id (:id org-owner)
-                              :team-id (:id target-team)})
-          error (:error out)]
-      (t/is (th/ex-info? error))
-      (t/is (th/ex-of-type? error :not-found)))))
-
-(t/deftest non-member-org-owner-gets-viewer-access-to-org-team
-  (let [team-owner  (th/create-profile* 1)
-        org-owner   (th/create-profile* 2)
-        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
-        project     (th/create-project* 1 {:profile-id (:id team-owner)
-                                           :team-id (:id target-team)})
-        file        (th/create-file* 1 {:profile-id (:id team-owner)
-                                        :project-id (:id project)})
-        org-id      (uuid/next)]
-
-    (with-org-owner-access {:org-owner-id (:id org-owner)
-                            :org-id org-id
-                            :team-id (:id target-team)}
-      (fn []
-        ;; The team is not listed for a non-member, even though the org
-        ;; owner can access it directly.
-        (let [out (th/command! {::th/type :get-teams
-                                ::rpc/profile-id (:id org-owner)})]
-          (t/is (nil? (:error out)))
-          (t/is (not-any? #(= (:id target-team) (:id %)) (:result out))))
-
-        (let [out  (th/command! {::th/type :get-team
-                                 ::rpc/profile-id (:id org-owner)
-                                 :id (:id target-team)})
-              team (:result out)]
-          (t/is (nil? (:error out)))
-          (t/is (= (:id target-team) (:id team)))
-          (t/is (false? (get-in team [:permissions :is-owner])))
-          (t/is (false? (get-in team [:permissions :is-admin])))
-          (t/is (false? (get-in team [:permissions :can-edit])))
-          (t/is (= org-id (get-in team [:organization :id])))
-          (t/is (= "Acme" (get-in team [:organization :name]))))
-
-        (let [out     (th/command! {::th/type :get-team-members
-                                    ::rpc/profile-id (:id org-owner)
-                                    :team-id (:id target-team)})
-              members (:result out)]
-          (t/is (nil? (:error out)))
-          (t/is (some #(= (:id team-owner) (:id %)) members))
-          (t/is (not-any? #(= (:id org-owner) (:id %)) members)))
-
-        (let [out (th/command! {::th/type :get-projects
-                                ::rpc/profile-id (:id org-owner)
-                                :team-id (:id target-team)})]
-          (t/is (nil? (:error out)))
-          (t/is (some #(= (:id project) (:id %)) (:result out))))
-
-        (let [out (th/command! {::th/type :get-file
-                                ::rpc/profile-id (:id org-owner)
-                                :id (:id file)})]
-          (t/is (nil? (:error out)))
-          (t/is (= (:id file) (get-in out [:result :id])))
-          (t/is (false? (get-in out [:result :permissions :can-edit]))))
-
-        (let [out   (th/command! {::th/type :rename-project
-                                  ::rpc/profile-id (:id org-owner)
-                                  :id (:id project)
-                                  :name "Nope"})
-              error (:error out)]
-          (t/is (th/ex-info? error))
-          (t/is (th/ex-of-type? error :not-found)))))))
-
-(t/deftest org-owner-member-keeps-team-role
-  (let [team-owner  (th/create-profile* 1)
-        org-owner   (th/create-profile* 2)
-        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
-        org-id      (uuid/next)]
-
-    (th/create-team-role* {:team-id (:id target-team)
-                           :profile-id (:id org-owner)
-                           :role :editor})
-
-    (with-org-owner-access {:org-owner-id (:id org-owner)
-                            :org-id org-id
-                            :team-id (:id target-team)}
-      (fn []
-        (let [out  (th/command! {::th/type :get-team
-                                 ::rpc/profile-id (:id org-owner)
-                                 :id (:id target-team)})
-              team (:result out)]
-          (t/is (nil? (:error out)))
-          (t/is (false? (get-in team [:permissions :is-owner])))
-          (t/is (false? (get-in team [:permissions :is-admin])))
-          (t/is (true? (get-in team [:permissions :can-edit]))))))))
diff --git a/backend/test/backend_tests/rpc_organization_owner_permissions_test.clj b/backend/test/backend_tests/rpc_organization_owner_permissions_test.clj
new file mode 100644
index 0000000000..8168242f16
--- /dev/null
+++ b/backend/test/backend_tests/rpc_organization_owner_permissions_test.clj
@@ -0,0 +1,240 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.rpc-organization-owner-permissions-test
+  (:require
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.msgbus :as mbus]
+   [app.nitrate :as nitrate]
+   [app.rpc :as-alias rpc]
+   [backend-tests.helpers :as th]
+   [clojure.test :as t]))
+
+(t/use-fixtures :once th/state-init)
+(t/use-fixtures :each th/database-reset)
+
+(defn- organization-data
+  [organization-id owner-id]
+  {:id            organization-id
+   :name          "Acme"
+   :slug          "acme"
+   :owner-id      owner-id
+   :avatar-bg-url "http://example.com/avatar.png"
+   :permissions   {}})
+
+(defn- with-organization-owner-access
+  [{:keys [organization-owner-id organization-id team-id]} f]
+  (with-redefs [cf/flags (conj cf/flags :admin-console)
+                nitrate/organization-owner-of-team?
+                (fn [_cfg profile-id candidate-team-id]
+                  (and (= organization-owner-id profile-id)
+                       (= team-id candidate-team-id)))
+
+                nitrate/call
+                (fn [_cfg method params]
+                  (case method
+                    :get-owned-organizations
+                    [{:id organization-id
+                      :name "Acme"
+                      :owner-id organization-owner-id
+                      :teams [{:id team-id :is-your-penpot false}]}]
+
+                    :get-team-organization
+                    (if (= team-id (:team-id params))
+                      {:id team-id
+                       :is-your-penpot false
+                       :organization (organization-data organization-id organization-owner-id)}
+                      {:id (:team-id params)
+                       :is-your-penpot false
+                       :organization nil})))]
+    (f)))
+
+(defn- with-captured-messages
+  "Runs `f` with the msgbus publications collected on `messages`."
+  [messages f]
+  (with-redefs [mbus/pub! (fn [_instance & {:keys [topic message]}]
+                            (swap! messages conj {:topic topic :message message})
+                            nil)]
+    (f)))
+
+(defn- messages-for
+  [messages profile-id]
+  (->> @messages
+       (filter #(= profile-id (:topic %)))
+       (mapv :message)))
+
+(t/deftest organization-owner-access-disabled-without-nitrate-flag
+  (let [team-owner  (th/create-profile* 1)
+        organization-owner   (th/create-profile* 2)
+        target-team (th/create-team* 1 {:profile-id (:id team-owner)})]
+
+    (let [out   (th/command! {::th/type :get-projects
+                              ::rpc/profile-id (:id organization-owner)
+                              :team-id (:id target-team)})
+          error (:error out)]
+      (t/is (th/ex-info? error))
+      (t/is (th/ex-of-type? error :not-found)))))
+
+(t/deftest non-member-organization-owner-gets-viewer-access-to-organization-team
+  (let [team-owner  (th/create-profile* 1)
+        organization-owner   (th/create-profile* 2)
+        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
+        project     (th/create-project* 1 {:profile-id (:id team-owner)
+                                           :team-id (:id target-team)})
+        file        (th/create-file* 1 {:profile-id (:id team-owner)
+                                        :project-id (:id project)})
+        organization-id      (uuid/next)]
+
+    (with-organization-owner-access {:organization-owner-id (:id organization-owner)
+                                     :organization-id organization-id
+                                     :team-id (:id target-team)}
+      (fn []
+        ;; The team is not listed for a non-member, even though the organization
+        ;; owner can access it directly.
+        (let [out (th/command! {::th/type :get-teams
+                                ::rpc/profile-id (:id organization-owner)})]
+          (t/is (nil? (:error out)))
+          (t/is (not-any? #(= (:id target-team) (:id %)) (:result out))))
+
+        (let [out  (th/command! {::th/type :get-team
+                                 ::rpc/profile-id (:id organization-owner)
+                                 :id (:id target-team)})
+              team (:result out)]
+          (t/is (nil? (:error out)))
+          (t/is (= (:id target-team) (:id team)))
+          (t/is (false? (get-in team [:permissions :is-owner])))
+          (t/is (false? (get-in team [:permissions :is-admin])))
+          (t/is (false? (get-in team [:permissions :can-edit])))
+          (t/is (= organization-id (get-in team [:organization :id])))
+          (t/is (= "Acme" (get-in team [:organization :name]))))
+
+        (let [out     (th/command! {::th/type :get-team-members
+                                    ::rpc/profile-id (:id organization-owner)
+                                    :team-id (:id target-team)})
+              members (:result out)]
+          (t/is (nil? (:error out)))
+          (t/is (some #(= (:id team-owner) (:id %)) members))
+          (t/is (not-any? #(= (:id organization-owner) (:id %)) members)))
+
+        (let [out (th/command! {::th/type :get-projects
+                                ::rpc/profile-id (:id organization-owner)
+                                :team-id (:id target-team)})]
+          (t/is (nil? (:error out)))
+          (t/is (some #(= (:id project) (:id %)) (:result out))))
+
+        (let [out (th/command! {::th/type :get-file
+                                ::rpc/profile-id (:id organization-owner)
+                                :id (:id file)})]
+          (t/is (nil? (:error out)))
+          (t/is (= (:id file) (get-in out [:result :id])))
+          (t/is (false? (get-in out [:result :permissions :can-edit]))))
+
+        (let [out   (th/command! {::th/type :rename-project
+                                  ::rpc/profile-id (:id organization-owner)
+                                  :id (:id project)
+                                  :name "Nope"})
+              error (:error out)]
+          (t/is (th/ex-info? error))
+          (t/is (th/ex-of-type? error :not-found)))))))
+
+(t/deftest organization-owner-member-keeps-team-role
+  (let [team-owner  (th/create-profile* 1)
+        organization-owner   (th/create-profile* 2)
+        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id      (uuid/next)]
+
+    (th/create-team-role* {:team-id (:id target-team)
+                           :profile-id (:id organization-owner)
+                           :role :editor})
+
+    (with-organization-owner-access {:organization-owner-id (:id organization-owner)
+                                     :organization-id organization-id
+                                     :team-id (:id target-team)}
+      (fn []
+        (let [out  (th/command! {::th/type :get-team
+                                 ::rpc/profile-id (:id organization-owner)
+                                 :id (:id target-team)})
+              team (:result out)]
+          (t/is (nil? (:error out)))
+          (t/is (false? (get-in team [:permissions :is-owner])))
+          (t/is (false? (get-in team [:permissions :is-admin])))
+          (t/is (true? (get-in team [:permissions :can-edit]))))))))
+
+(t/deftest removed-organization-owner-is-degraded-to-viewer
+  (let [team-owner  (th/create-profile* 1)
+        organization-owner   (th/create-profile* 2)
+        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id      (uuid/next)
+        messages    (atom [])]
+
+    (th/create-team-role* {:team-id (:id target-team)
+                           :profile-id (:id organization-owner)
+                           :role :editor})
+
+    (with-organization-owner-access {:organization-owner-id (:id organization-owner)
+                                     :organization-id organization-id
+                                     :team-id (:id target-team)}
+      (fn []
+        (let [out (with-captured-messages messages
+                    #(th/command! {::th/type :delete-team-member
+                                   ::rpc/profile-id (:id team-owner)
+                                   :team-id (:id target-team)
+                                   :member-id (:id organization-owner)}))]
+          (t/is (nil? (:error out))))
+
+        ;; The organization owner keeps read-only access, so they are notified
+        ;; with a role change instead of being kicked out of the team.
+        (let [notified (messages-for messages (:id organization-owner))]
+          (t/is (= 1 (count notified)))
+          (t/is (= :team-role-change (:type (first notified))))
+          (t/is (= :viewer (:role (first notified))))
+          (t/is (= (:id target-team) (:team-id (first notified))))
+          (t/is (not-any? #(= :team-membership-change (:type %)) notified)))
+
+        (let [out  (th/command! {::th/type :get-team
+                                 ::rpc/profile-id (:id organization-owner)
+                                 :id (:id target-team)})
+              team (:result out)]
+          (t/is (nil? (:error out)))
+          (t/is (false? (get-in team [:permissions :is-owner])))
+          (t/is (false? (get-in team [:permissions :is-admin])))
+          (t/is (false? (get-in team [:permissions :can-edit]))))))))
+
+(t/deftest removed-regular-member-is-still-kicked-out
+  (let [team-owner  (th/create-profile* 1)
+        organization-owner   (th/create-profile* 2)
+        member      (th/create-profile* 3)
+        target-team (th/create-team* 1 {:profile-id (:id team-owner)})
+        organization-id      (uuid/next)
+        messages    (atom [])]
+
+    (th/create-team-role* {:team-id (:id target-team)
+                           :profile-id (:id member)
+                           :role :editor})
+
+    (with-organization-owner-access {:organization-owner-id (:id organization-owner)
+                                     :organization-id organization-id
+                                     :team-id (:id target-team)}
+      (fn []
+        (let [out (with-captured-messages messages
+                    #(th/command! {::th/type :delete-team-member
+                                   ::rpc/profile-id (:id team-owner)
+                                   :team-id (:id target-team)
+                                   :member-id (:id member)}))]
+          (t/is (nil? (:error out))))
+
+        (let [notified (messages-for messages (:id member))]
+          (t/is (= 1 (count notified)))
+          (t/is (= :team-membership-change (:type (first notified))))
+          (t/is (= :removed (:change (first notified))))
+          (t/is (= (:id target-team) (:team-id (first notified)))))
+
+        (let [out (th/command! {::th/type :get-team
+                                ::rpc/profile-id (:id member)
+                                :id (:id target-team)})]
+          (t/is (th/ex-info? (:error out)))
+          (t/is (th/ex-of-type? (:error out) :not-found)))))))
diff --git a/backend/test/backend_tests/rpc_profile_test.clj b/backend/test/backend_tests/rpc_profile_test.clj
index 7adc12d68e..f846cfb343 100644
--- a/backend/test/backend_tests/rpc_profile_test.clj
+++ b/backend/test/backend_tests/rpc_profile_test.clj
@@ -42,7 +42,7 @@
   (let [profile (th/create-profile* 1)
         data    {::th/type :login-with-password
                  :email "profile1.test@nodomain.com"
-                 :password "foobar"}
+                 :password "Foobar12!"}
         out     (th/command! data)]
 
     #_(th/print-result! out)
@@ -56,7 +56,7 @@
   (let [profile (th/create-profile* 1)
         data    {::th/type :login-with-password
                  :email "profile1.test@nodomain.com"
-                 :password "123123"}
+                 :password "Test123!"}
         out     (th/command! data)]
     ;; (th/print-result! out)
     (let [error (:error out)]
@@ -69,7 +69,7 @@
   (let [profile (th/create-profile* 1 {:is-active true})
         data    {::th/type :login-with-password
                  :email "profile1.test@nodomain.com"
-                 :password "123123"}
+                 :password "Test123!"}
         out     (th/command! data)]
     ;; (th/print-result! out)
     (t/is (nil? (:error out)))
@@ -91,7 +91,7 @@
           (t/is (not (contains? result :password))))))
 
     (t/testing "update profile"
-      (with-redefs [app.config/flags #{:nitrate}]
+      (with-redefs [app.config/flags #{:admin-console}]
         (with-redefs [nitrate/add-nitrate-licence-to-profile
                       (fn [_ profile]
                         (assoc profile :subscription {:plan :pro}))]
@@ -403,7 +403,7 @@
   (let [data  {::th/type :prepare-register-profile
                :email "user@example.com"
                :fullname "foobar"
-               :password "foobar"
+               :password "Foobar12!"
                :utm_campaign "utma"
                :mtm_campaign "mtma"}
         out   (th/command! data)
@@ -444,7 +444,7 @@
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
                    :fullname "foobar"
-                   :password "foobar"}
+                   :password "Foobar12!"}
             out   (th/command! data)
             token (get-in out [:result :token])]
         (t/is (th/success? out))
@@ -463,7 +463,7 @@
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
                    :fullname "foobar"
-                   :password "foobar"}
+                   :password "Foobar12!"}
             out   (th/command! data)
             token (get-in out [:result :token])]
         (t/is (th/success? out))
@@ -498,7 +498,7 @@
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
                    :fullname "foobar"
-                   :password "foobar"}
+                   :password "Foobar12!"}
             out   (th/command! data)
             token (get-in out [:result :token])]
         (t/is (th/success? out))
@@ -521,7 +521,7 @@
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
                    :fullname "foobar"
-                   :password "foobar"}
+                   :password "Foobar12!"}
             out   (th/command! data)
             token (get-in out [:result :token])]
         (t/is (th/success? out))
@@ -547,7 +547,7 @@
         (let [data  {::th/type :prepare-register-profile
                      :email "hello@example.com"
                      :fullname "foobar"
-                     :password "foobar"}
+                     :password "Foobar12!"}
               out   (th/command! data)
               token (get-in out [:result :token])]
           (t/is (th/success? out))
@@ -576,7 +576,7 @@
         (let [data  {::th/type :prepare-register-profile
                      :email "hello@example.com"
                      :fullname "foobar"
-                     :password "foobar"}
+                     :password "Foobar12!"}
               out   (th/command! data)
               token (get-in out [:result :token])]
           (t/is (th/success? out))
@@ -614,7 +614,7 @@
                      :invitation-token itoken
                      :fullname "foobar"
                      :email "user@example.com"
-                     :password "foobar"}
+                     :password "Foobar12!"}
 
           {prep-result :result prep-error :error} (th/command! prep-data)]
       (t/is (nil? prep-error))
@@ -659,7 +659,7 @@
                      :invitation-token itoken
                      :fullname "foobar"
                      :email "user@example.com"
-                     :password "foobar"}
+                     :password "Foobar12!"}
 
           {prep-result :result prep-error :error} (th/command! prep-data)]
       (t/is (nil? prep-error))
@@ -692,7 +692,7 @@
                :invitation-token itoken
                :email "user@example.com"
                :fullname "foobar"
-               :password "foobar"}
+               :password "Foobar12!"}
         out   (th/command! data)]
 
     (t/is (not (th/success? out)))
@@ -712,7 +712,7 @@
                  :invitation-token itoken
                  :fullname "foobar"
                  :email "user@example.com"
-                 :password "foobar"}
+                 :password "Foobar12!"}
           out (th/command! data)]
 
       (t/is (not (th/success? out)))
@@ -733,7 +733,7 @@
                  :invitation-token itoken
                  :email "user@example.com"
                  :fullname "foobar"
-                 :password "foobar"}
+                 :password "Foobar12!"}
           out   (th/command! data)]
 
       (t/is (not (th/success? out)))
@@ -754,7 +754,7 @@
                  :invitation-token itoken
                  :fullname "foobar"
                  :email "user@example.com"
-                 :password "foobar"}
+                 :password "Foobar12!"}
           out   (th/command! data)]
 
       (t/is (not (th/success? out)))
@@ -767,7 +767,7 @@
     (let [data  {::th/type :prepare-register-profile
                  :fullname "foobar"
                  :email "user@example.com"
-                 :password "foobar"}
+                 :password "Foobar12!"}
           out  (th/command! data)]
 
       (t/is (not (th/success? out)))
@@ -780,7 +780,7 @@
         data    {::th/type :prepare-register-profile
                  :fullname "foobar"
                  :email (:email profile)
-                 :password "foobar"}
+                 :password "Foobar12!"}
         out     (th/command! data)]
     ;; (th/print-result! out)
     (t/is (th/success? out))
@@ -793,7 +793,7 @@
         data  {::th/type :prepare-register-profile
                :fullname "foobar"
                :email "user@example.com"
-               :password "foobar"}]
+               :password "Foobar12!"}]
 
     (th/create-global-complaint-for pool {:type :bounce :email "user@example.com"})
 
@@ -808,7 +808,7 @@
         data  {::th/type :prepare-register-profile
                :fullname "foobar"
                :email "user@example.com"
-               :password "foobar"}]
+               :password "Foobar12!"}]
 
     (th/create-global-complaint-for pool {:type :complaint :email "user@example.com"})
 
@@ -1131,8 +1131,8 @@
   (let [profile (th/create-profile* 1)
         data  {::th/type :update-profile-password
                ::rpc/profile-id (:id profile)
-               :old-password "123123"
-               :password "foobarfoobar"}
+               :old-password "Test123!"
+               :password "Foobar12!"}
         out   (th/command! data)]
     (t/is (nil? (:error out)))
     (t/is (nil? (:result out)))))
@@ -1143,7 +1143,7 @@
         data  {::th/type :update-profile-password
                ::rpc/profile-id (:id profile)
                :old-password "badpassword"
-               :password "foobarfoobar"}
+               :password "Foobar12!"}
         {:keys [result error] :as out} (th/command! data)]
     (t/is (th/ex-info? error))
     (t/is (th/ex-of-type? error :validation))
@@ -1154,9 +1154,166 @@
   (let [profile (th/create-profile* 1)
         data  {::th/type :update-profile-password
                ::rpc/profile-id (:id profile)
-               :old-password "123123"
+               :old-password "Test123!"
                :password "profile1.test@nodomain.com"}
         {:keys [result error] :as out} (th/command! data)]
     (t/is (th/ex-info? error))
     (t/is (th/ex-of-type? error :validation))
     (t/is (th/ex-of-code? error :email-as-password))))
+
+
+(t/deftest update-profile-props-rejects-subscription
+  ;; N1-16: Mass Assignment — :subscription must not be writable via RPC
+  ;; The closed schema rejects :subscription at validation time
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:subscription {:type "unlimited" :status "active"}}}
+        out     (th/command! data)]
+
+    ;; The call must fail with validation error
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :params-validation))
+
+    ;; And :subscription must NOT be persisted
+    (let [saved (th/db-get :profile {:id (:id profile)})
+          props (profile/decode-row saved)]
+      (t/is (nil? (get-in props [:props :subscription]))
+            ":subscription must not be writable via update-profile-props"))))
+
+
+(t/deftest update-profile-props-accepts-valid-keys
+  ;; Verify that valid props keys still work after closing the schema
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:onboarding-viewed true
+                         :newsletter-updates false
+                         :renderer :wasm}}
+        out     (th/command! data)]
+
+    ;; The call should succeed
+    (t/is (nil? (:error out)))
+
+    ;; And all valid keys should be persisted
+    (let [saved (th/db-get :profile {:id (:id profile)})
+          props (profile/decode-row saved)]
+      (t/is (true? (get-in props [:props :onboarding-viewed])))
+      (t/is (false? (get-in props [:props :newsletter-updates])))
+      (t/is (= :wasm (get-in props [:props :renderer]))))))
+
+
+(t/deftest update-profile-props-accepts-onboarding-questions
+  ;; The onboarding questions flow sends these props on the final "START" step
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:onboarding-questions-answered true
+                         :onboarding-questions
+                         {:expected-use "work"
+                          :role "ux"
+                          :start-with "prototyping"}}}
+        out     (th/command! data)]
+
+    ;; The call should succeed
+    (t/is (nil? (:error out)))
+
+    ;; And all keys should be persisted
+    (let [saved (th/db-get :profile {:id (:id profile)})
+          props (profile/decode-row saved)]
+      (t/is (true? (get-in props [:props :onboarding-questions-answered])))
+      (t/is (= {:expected-use "work"
+                :role "ux"
+                :start-with "prototyping"}
+               (get-in props [:props :onboarding-questions]))))))
+
+
+(t/deftest update-profile-props-rejects-invalid-onboarding-questions
+  ;; The schema is closed and :onboarding-questions only accepts string values
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:onboarding-questions {:expected-use 42}}}
+        out     (th/command! data)]
+
+    ;; The call must fail with validation error
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :params-validation))))
+
+
+(t/deftest update-profile-props-accepts-nudge
+  ;; Nudge settings are persisted per-profile via update-profile-props
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:nudge {:big 20 :small 0.5}}}
+        out     (th/command! data)]
+
+    ;; The call should succeed
+    (t/is (nil? (:error out)))
+
+    ;; And the nudge values should be persisted
+    (let [saved (th/db-get :profile {:id (:id profile)})
+          props (profile/decode-row saved)]
+      (t/is (= {:big 20 :small 0.5} (get-in props [:props :nudge]))))))
+
+(t/deftest update-profile-props-rejects-invalid-nudge
+  ;; The nudge map only accepts :big/:small numbers
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-props
+                 ::rpc/profile-id (:id profile)
+                 :props {:nudge {:big "ten"}}}
+        out     (th/command! data)]
+
+    ;; The call must fail with validation error
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :params-validation))))
+
+
+(t/deftest prepare-register-profile-password-too-short
+  (let [data {::th/type :prepare-register-profile
+              :email "user@example.com"
+              :fullname "foobar"
+              :password "123"}
+        out  (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :weak-password))))
+
+
+(t/deftest prepare-register-profile-weak-password
+  (let [data {::th/type :prepare-register-profile
+              :email "user@example.com"
+              :fullname "foobar"
+              :password "password123"}
+        out  (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :weak-password))))
+
+
+(t/deftest update-profile-password-too-short
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-password
+                 ::rpc/profile-id (:id profile)
+                 :old-password "Test123!"
+                 :password "123"}
+        out     (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :weak-password))))
+
+
+(t/deftest update-profile-password-weak-password
+  (let [profile (th/create-profile* 1)
+        data    {::th/type :update-profile-password
+                 ::rpc/profile-id (:id profile)
+                 :old-password "Test123!"
+                 :password "qwerty"}
+        out     (th/command! data)]
+    (t/is (th/ex-info? (:error out)))
+    (t/is (th/ex-of-type? (:error out) :validation))
+    (t/is (th/ex-of-code? (:error out) :weak-password))))
diff --git a/backend/test/backend_tests/rpc_team_test.clj b/backend/test/backend_tests/rpc_team_test.clj
index 3fff7c2953..5c0477ed17 100644
--- a/backend/test/backend_tests/rpc_team_test.clj
+++ b/backend/test/backend_tests/rpc_team_test.clj
@@ -13,7 +13,9 @@
    [app.db :as db]
    [app.email.blacklist :as email.blacklist]
    [app.http :as http]
+   [app.nitrate :as nitrate]
    [app.rpc :as-alias rpc]
+   [app.rpc.commands.teams :as teams]
    [app.storage :as sto]
    [app.tokens :as tokens]
    [backend-tests.helpers :as th]
@@ -103,6 +105,63 @@
           (t/is (= :validation (:type edata)))
           (t/is (= :member-is-muted (:code edata))))))))
 
+(t/deftest create-and-update-team-invitations-include-organization-props
+  (with-mocks [email-mock {:target 'app.email/send! :return nil}
+               audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (let [owner      (th/create-profile* 101 {:is-active true})
+          invitee    (th/create-profile* 102 {:is-active true})
+          organization-team   (th/create-team* 101 {:profile-id (:id owner)})
+          plain-team (th/create-team* 102 {:profile-id (:id owner)})
+          organization-id     (uuid/random)
+          organization         {:id organization-id
+                                :name "Acme"
+                                :slug "acme"
+                                :owner-id (:id owner)
+                                :avatar-bg-url "https://example.com/avatar.svg"
+                                :permissions {:new-team-members "anyone"}}
+          nitrate-call
+          (fn [_cfg method params]
+            (case method
+              :get-team-organization
+              (if (= (:team-id params) (:id organization-team))
+                {:organization organization :is-your-penpot false}
+                {:organization nil :is-your-penpot false})
+
+              :get-organization-members
+              [(:id invitee)]
+
+              nil))
+          invite!     (fn [team email]
+                        (th/command! {::th/type :create-team-invitations
+                                      ::rpc/profile-id (:id owner)
+                                      :team-id (:id team)
+                                      :role :editor
+                                      :emails [email]}))]
+      (with-redefs [cf/flags (conj cf/flags :admin-console :email-verification)
+                    nitrate/call nitrate-call]
+        (t/is (th/success? (invite! organization-team (:email invitee))))
+        (t/is (th/success? (invite! organization-team (:email invitee))))
+        (t/is (th/success? (invite! plain-team "external@example.com"))))
+
+      (let [events       (mapv second (:call-args-list @audit-mock))
+            create-organization   (first (filter #(and (= "create-team-invitation" (:name %))
+                                                       (= (:email invitee)
+                                                          (get-in % [:props :member-email])))
+                                                 events))
+            update-organization   (first (filter #(= "update-team-invitation" (:name %)) events))
+            create-plain (first (filter #(and (= "create-team-invitation" (:name %))
+                                              (= "external@example.com"
+                                                 (get-in % [:props :member-email])))
+                                        events))]
+        (doseq [event [create-organization update-organization]]
+          (t/is (true? (get-in event [:props :team-belongs-to-organization])))
+          (t/is (true? (get-in event [:props :adds-invitee-to-organization])))
+          (t/is (true? (get-in event [:props :invitee-already-organization-member]))))
+
+        (t/is (false? (get-in create-plain [:props :team-belongs-to-organization])))
+        (t/is (false? (get-in create-plain [:props :adds-invitee-to-organization])))
+        (t/is (false? (get-in create-plain [:props :invitee-already-organization-member])))))))
+
 (t/deftest create-team-invitations-blacklisted-domain
   (with-mocks [mock {:target 'app.email/send! :return nil}]
     (let [profile1 (th/create-profile* 1 {:is-active true})
@@ -378,6 +437,158 @@
             (t/is (= :validation (:type edata)))
             (t/is (= :invalid-token (:code edata)))))))))
 
+(t/deftest accept-organization-invitation-audit-event
+  (with-mocks [audit-mock {:target 'app.loggers.audit/submit :return nil}]
+    (let [inviter          (th/create-profile* 201 {:is-active true})
+          invitee          (th/create-profile* 202 {:is-active true})
+          team             (th/create-team* 201 {:profile-id (:id inviter)})
+          organization-id  (uuid/random)
+          default-team-id  (uuid/random)
+          direct-token     (tokens/generate
+                            th/*system*
+                            {:iss :team-invitation
+                             :exp (ct/in-future "1h")
+                             :profile-id (:id inviter)
+                             :role :editor
+                             :organization-id organization-id
+                             :member-email (:email invitee)
+                             :member-id (:id invitee)})
+          team-token       (tokens/generate
+                            th/*system*
+                            {:iss :team-invitation
+                             :exp (ct/in-future "1h")
+                             :profile-id (:id inviter)
+                             :role :editor
+                             :team-id (:id team)
+                             :member-email (:email invitee)
+                             :member-id (:id invitee)})
+          verify!          (fn [token]
+                             (th/command! {::th/type :verify-token
+                                           ::rpc/profile-id (:id invitee)
+                                           :token token}))
+          organization-event
+          (fn []
+            (->> (:call-args-list @audit-mock)
+                 (map second)
+                 (filter #(= "accept-organization-invitation" (:name %)))
+                 first))
+          frontend-event     (atom nil)]
+
+      (db/insert! (:app.db/pool th/*system*)
+                  :team-invitation
+                  {:org-id organization-id
+                   :email-to (:email invitee)
+                   :created-by (:id inviter)
+                   :role "editor"
+                   :valid-until (ct/in-future "48h")})
+
+      (with-redefs [cf/flags (conj cf/flags :admin-console)
+                    nitrate/call
+                    (fn [_cfg method _params]
+                      (case method
+                        :get-organization-membership {:organization-id organization-id
+                                                      :is-member false}
+                        :get-organization-members [(:id inviter) (uuid/random) (uuid/random)]
+                        nil))
+                    teams/initialize-user-in-organization
+                    (fn [& _] default-team-id)]
+        (let [out (verify! direct-token)]
+          (t/is (th/success? out))
+          (reset! frontend-event
+                  (get-in out [:result :organization-invitation-audit]))))
+
+      (let [event (organization-event)]
+        (t/is (= organization-id (get-in event [:props :organization-id])))
+        (t/is (not (contains? (:props event) :organization-member-add-source)))
+        (t/is (not (contains? (:props event) :belongs-to-team-on-add)))
+        (t/is (not (contains? (:props event) :organization-member-count-before)))
+        (t/is (= :editor (get-in event [:props :role])))
+        (t/is (uuid? (get-in event [:props :invitation-id])))
+        (t/is (= "organization-invitation-acceptance"
+                 (:origin @frontend-event)))
+        (t/is (= organization-id
+                 (get-in @frontend-event [:props :organization-id])))
+        (t/is (= "direct-organization-invitation"
+                 (get-in @frontend-event [:props :organization-member-add-source])))
+        (t/is (false? (get-in @frontend-event [:props :belongs-to-team-on-add])))
+        (t/is (= 3
+                 (get-in @frontend-event [:props :organization-member-count-before])))
+        (t/is (not-any? #(contains? #{"accept-team-invitation"
+                                      "accept-team-invitation-from"}
+                                    (:name (second %)))
+                        (:call-args-list @audit-mock))))
+
+      (th/reset-mock! audit-mock)
+      (db/insert! (:app.db/pool th/*system*)
+                  :team-invitation
+                  {:team-id (:id team)
+                   :email-to (:email invitee)
+                   :created-by (:id inviter)
+                   :role "editor"
+                   :valid-until (ct/in-future "48h")})
+
+      (with-redefs [cf/flags (conj cf/flags :admin-console)
+                    nitrate/call
+                    (fn [_cfg method _params]
+                      (case method
+                        :get-organization-membership-by-team {:organization-id organization-id
+                                                              :is-member false}
+                        :get-organization-members (into [(:id inviter)]
+                                                        (repeatedly 4 uuid/random))
+                        nil))
+                    teams/add-profile-to-team! (fn [& _] nil)]
+        (let [out (verify! team-token)]
+          (t/is (th/success? out))
+          (reset! frontend-event
+                  (get-in out [:result :organization-invitation-audit]))))
+
+      (let [events (mapv second (:call-args-list @audit-mock))
+            event  (organization-event)]
+        (t/is (some #(= "accept-team-invitation" (:name %)) events))
+        (t/is (some #(= "accept-team-invitation-from" (:name %)) events))
+        (t/is (= (:id team) (get-in event [:props :team-id])))
+        (t/is (= organization-id (get-in event [:props :organization-id])))
+        (t/is (not (contains? (:props event) :organization-member-add-source)))
+        (t/is (not (contains? (:props event) :belongs-to-team-on-add)))
+        (t/is (not (contains? (:props event) :organization-member-count-before)))
+        (t/is (= "team-invitation-acceptance"
+                 (:origin @frontend-event)))
+        (t/is (= (:id team) (get-in @frontend-event [:props :team-id])))
+        (t/is (= organization-id
+                 (get-in @frontend-event [:props :organization-id])))
+        (t/is (= "team-invitation"
+                 (get-in @frontend-event [:props :organization-member-add-source])))
+        (t/is (true? (get-in @frontend-event [:props :belongs-to-team-on-add])))
+        (t/is (= 5
+                 (get-in @frontend-event [:props :organization-member-count-before]))))
+
+      (th/reset-mock! audit-mock)
+      (db/insert! (:app.db/pool th/*system*)
+                  :team-invitation
+                  {:team-id (:id team)
+                   :email-to (:email invitee)
+                   :role "editor"
+                   :valid-until (ct/in-future "48h")})
+
+      (with-redefs [cf/flags (conj cf/flags :admin-console)
+                    nitrate/call
+                    (fn [_cfg method _params]
+                      (case method
+                        :get-organization-membership-by-team {:organization-id organization-id
+                                                              :is-member true}
+                        :get-organization-members (throw (ex-info "unexpected member count" {}))
+                        nil))
+                    teams/add-profile-to-team! (fn [& _] nil)]
+        (let [out (verify! team-token)]
+          (t/is (th/success? out))
+          (reset! frontend-event
+                  (get-in out [:result :organization-invitation-audit]))))
+
+      (let [events (mapv second (:call-args-list @audit-mock))]
+        (t/is (some #(= "accept-team-invitation" (:name %)) events))
+        (t/is (not-any? #(= "accept-organization-invitation" (:name %)) events))
+        (t/is (nil? @frontend-event))))))
+
 (t/deftest create-team-invitations-with-email-verification-disabled
   (with-mocks [mock {:target 'app.email/send! :return nil}]
     (let [profile1 (th/create-profile* 1 {:is-active true})
@@ -804,6 +1015,46 @@
           out  (th/command! data)]
       (t/is (th/success? out)))))
 
+(t/deftest create-team-invitations-email-cooldown
+  (with-mocks [mock {:target 'app.email/send! :return nil}]
+    (let [profile1 (th/create-profile* 1 {:is-active true})
+          team     (th/create-team* 1 {:profile-id (:id profile1)})
+
+          data     {::th/type :create-team-invitations
+                    ::rpc/profile-id (:id profile1)
+                    :team-id (:id team)
+                    :role :editor
+                    :emails ["cooldown-test@example.com"]}]
+
+      ;; First invitation sends email
+      (let [out (th/command! data)]
+        (t/is (th/success? out))
+        (t/is (= 1 (:call-count @mock))))
+
+      ;; Resending immediately should NOT send email (cooldown active)
+      (th/reset-mock! mock)
+      (let [out (th/command! data)]
+        (t/is (th/success? out))
+        (t/is (= 0 (:call-count @mock))))
+
+      ;; Resending to a different email should send email
+      (th/reset-mock! mock)
+      (let [data (assoc data :emails ["different@example.com"])
+            out  (th/command! data)]
+        (t/is (th/success? out))
+        (t/is (= 1 (:call-count @mock))))
+
+      ;; After cooldown expires, resending should send email
+      (th/reset-mock! mock)
+      (th/db-update! :team-invitation
+                     {:updated-at (ct/in-past "10m")}
+                     {:team-id (:id team)
+                      :email-to "cooldown-test@example.com"})
+      (let [data (assoc data :emails ["cooldown-test@example.com"])
+            out  (th/command! data)]
+        (t/is (th/success? out))
+        (t/is (= 1 (:call-count @mock)))))))
+
 (t/deftest update-team-with-invalid-name
   (let [profile (th/create-profile* 1 {:is-active true})
         team    (th/create-team* 1 {:profile-id (:id profile)})]
@@ -845,4 +1096,3 @@
                 :name "My Valid Team"}
           out  (th/command! data)]
       (t/is (th/success? out)))))
-
diff --git a/backend/test/backend_tests/rpc_webhooks_test.clj b/backend/test/backend_tests/rpc_webhooks_test.clj
index 3b39c8b52d..df4ae3a622 100644
--- a/backend/test/backend_tests/rpc_webhooks_test.clj
+++ b/backend/test/backend_tests/rpc_webhooks_test.clj
@@ -155,8 +155,7 @@
                           :return {:status 200}}]
     (let [owner       (th/create-profile* 1 {:is-active true})
           viewer      (th/create-profile* 2 {:is-active true})
-          team        (th/create-team* 1 {:profile-id (:id owner)})
-          whook       (volatile! nil)]
+          team        (th/create-team* 1 {:profile-id (:id owner)})]
       (th/create-team-role* {:team-id (:id team)
                              :profile-id (:id viewer)
                              :role :viewer})
@@ -164,52 +163,15 @@
       (let [roles (th/db-query :team-profile-rel {:team-id (:id team)})]
         (t/is (= 2 (count roles))))
 
-      (t/testing "viewer creates a webhook"
+      (t/testing "viewer cannot create a webhook (requires editor role)"
         (let [viewers-webhook (create-webhook-params (:id viewer) (:id team))
               out             (th/command! viewers-webhook)]
-          (t/is (nil? (:error out)))
-          (t/is (= 1 (:call-count @http-mock)))
-
-          (let [result (:result out)]
-            (check-webhook-format result)
-            (t/is (= (:uri viewers-webhook) (:uri result)))
-            (t/is (= (:team-id viewers-webhook) (:team-id result)))
-            (t/is (= (::rpc/profile-id viewers-webhook) (:profile-id result)))
-            (t/is (= (:mtype viewers-webhook) (:mtype result)))
-            (vreset! whook result))))
-
-      (th/reset-mock! http-mock)
-
-      (t/testing "viewer updates it's own webhook (success)"
-        (let [params {::th/type :update-webhook
-                      ::rpc/profile-id (:id viewer)
-                      :id (:id @whook)
-                      :uri (:uri @whook)
-                      :mtype "application/transit+json"
-                      :is-active false}
-              out    (th/command! params)
-              result (:result out)]
-
-          (t/is (nil? (:error out)))
           (t/is (= 0 (:call-count @http-mock)))
-          (check-webhook-format result)
-          (t/is (= (:is-active params) (:is-active result)))
-          (t/is (= (:team-id @whook) (:team-id result)))
-          (t/is (= (:mtype params) (:mtype result)))
-          (vreset! whook result)))
-
-      (th/reset-mock! http-mock)
-
-      (t/testing "viewer deletes it's own webhook (success)"
-        (let [params {::th/type :delete-webhook
-                      ::rpc/profile-id (:id viewer)
-                      :id (:id @whook)}
-              out    (th/command! params)]
-          (t/is (= 0 (:call-count @http-mock)))
-          (t/is (nil? (:error out)))
-          (t/is (nil? (:result out)))
-          (let [rows (th/db-exec! ["select * from webhook"])]
-            (t/is (= 0 (count rows))))))
+          (let [error      (:error out)
+                error-data (ex-data error)]
+            (t/is (th/ex-info? error))
+            (t/is (= (:type error-data) :not-found))
+            (t/is (= (:code error-data) :object-not-found)))))
 
       (th/reset-mock! http-mock))))
 
@@ -268,6 +230,26 @@
           (t/is (= (:type error-data) :not-found))
           (t/is (= (:code error-data) :object-not-found)))))))
 
+(t/deftest webhooks-viewer-cannot-create
+  (with-mocks [http-mock {:target 'app.http.client/req
+                          :return {:status 200}}]
+    (let [owner  (th/create-profile* 1 {:is-active true})
+          viewer (th/create-profile* 2 {:is-active true})
+          team   (th/create-team* 1 {:profile-id (:id owner)})]
+      (th/create-team-role* {:team-id (:id team)
+                             :profile-id (:id viewer)
+                             :role :viewer})
+
+      (t/testing "viewer cannot create a webhook on the team"
+        (let [params (create-webhook-params (:id viewer) (:id team))
+              out    (th/command! params)]
+          (t/is (= 0 (:call-count @http-mock)))
+          (let [error      (:error out)
+                error-data (ex-data error)]
+            (t/is (th/ex-info? error))
+            (t/is (= (:type error-data) :not-found))
+            (t/is (= (:code error-data) :object-not-found))))))))
+
 (t/deftest webhooks-quotes
   (with-mocks [http-mock {:target 'app.http.client/req
                           :return {:status 200}}]
@@ -304,3 +286,91 @@
         (t/is (th/ex-info? error))
         (t/is (= (:type error-data) :restriction))
         (t/is (= (:code error-data) :webhooks-quote-reached))))))
+
+(t/deftest removed-user-cannot-edit-webhook
+  (with-mocks [http-mock {:target 'app.http.client/req
+                          :return {:status 200}}]
+
+    (let [owner  (th/create-profile* 1 {:is-active true})
+          editor (th/create-profile* 2 {:is-active true})
+          team   (th/create-team* 1 {:profile-id (:id owner)})]
+
+      (th/create-team-role* {:team-id (:id team)
+                             :profile-id (:id editor)
+                             :role :editor})
+
+      (let [params {::th/type :create-webhook
+                    ::rpc/profile-id (:id editor)
+                    :team-id (:id team)
+                    :uri (u/uri "http://example.com")
+                    :mtype "application/json"}
+            out    (th/command! params)]
+
+        (t/is (nil? (:error out)))
+        (let [whook (:result out)]
+
+          (th/reset-mock! http-mock)
+
+          (t/testing "owner can edit editor's webhook (team owns it)"
+            (let [params {::th/type :update-webhook
+                          ::rpc/profile-id (:id owner)
+                          :id (:id whook)
+                          :uri (u/uri "http://example.com/updated")
+                          :mtype "application/transit+json"
+                          :is-active true}
+                  out    (th/command! params)]
+              (t/is (nil? (:error out)))
+              (t/is (= 1 (:call-count @http-mock)))))
+
+          (th/reset-mock! http-mock)
+
+          (t/testing "remove editor from team"
+            (let [params {::th/type :delete-team-member
+                          ::rpc/profile-id (:id owner)
+                          :team-id (:id team)
+                          :member-id (:id editor)}
+                  out    (th/command! params)]
+              (t/is (nil? (:error out)))))
+
+          (th/reset-mock! http-mock)
+
+          (t/testing "removed editor cannot update webhook"
+            (let [params {::th/type :update-webhook
+                          ::rpc/profile-id (:id editor)
+                          :id (:id whook)
+                          :uri (u/uri "http://example.com/evil")
+                          :mtype "application/transit+json"
+                          :is-active true}
+                  out    (th/command! params)]
+              (t/is (= 0 (:call-count @http-mock)))
+              (let [error      (:error out)
+                    error-data (ex-data error)]
+                (t/is (th/ex-info? error))
+                (t/is (= (:type error-data) :not-found))
+                (t/is (= (:code error-data) :object-not-found)))))
+
+          (th/reset-mock! http-mock)
+
+          (t/testing "removed editor cannot delete webhook"
+            (let [params {::th/type :delete-webhook
+                          ::rpc/profile-id (:id editor)
+                          :id (:id whook)}
+                  out    (th/command! params)]
+              (t/is (= 0 (:call-count @http-mock)))
+              (let [error      (:error out)
+                    error-data (ex-data error)]
+                (t/is (th/ex-info? error))
+                (t/is (= (:type error-data) :not-found))
+                (t/is (= (:code error-data) :object-not-found)))))
+
+          (th/reset-mock! http-mock)
+
+          (t/testing "owner can still delete editor's webhook"
+            (let [params {::th/type :delete-webhook
+                          ::rpc/profile-id (:id owner)
+                          :id (:id whook)}
+                  out    (th/command! params)]
+              (t/is (nil? (:error out)))
+              (t/is (nil? (:result out)))
+              (let [rows (th/db-exec! ["select * from webhook"])]
+                (t/is (= 0 (count rows)))))))))))
diff --git a/backend/test/backend_tests/storage_test.clj b/backend/test/backend_tests/storage_test.clj
index 348a978fc2..2aca502e9f 100644
--- a/backend/test/backend_tests/storage_test.clj
+++ b/backend/test/backend_tests/storage_test.clj
@@ -199,6 +199,25 @@
       (let [res (th/db-exec-one! ["select count(*) from storage_object where deleted_at is not null"])]
         (t/is (= 0 (:count res)))))))
 
+(defn- upload-font-chunked!
+  "Splits `font-bytes` into a single chunk, creates an upload session,
+   uploads the chunk, and returns the session-id UUID."
+  [prof ^bytes font-bytes mtype]
+  (let [tmp        (fs/create-tempfile :dir "/tmp/penpot" :prefix "test-font-chunk-")
+        _          (io/write* tmp font-bytes)
+        mfile      {:filename "chunk" :path tmp :mtype mtype :size (alength font-bytes)}
+        session-id (-> (th/command! {::th/type :create-upload-session
+                                     ::rpc/profile-id (:id prof)
+                                     :total-chunks 1})
+                       :result :session-id)
+        out        (th/command! {::th/type :upload-chunk
+                                 ::rpc/profile-id (:id prof)
+                                 :session-id session-id
+                                 :index 0
+                                 :content mfile})]
+    (assert (nil? (:error out)))
+    session-id))
+
 (t/deftest touched-gc-task-2
   (let [storage (-> (:app.storage/storage th/*system*)
                     (configure-storage-backend))
@@ -229,6 +248,8 @@
                  :name "testfile"
                  :content mfile}
 
+        session-id (upload-font-chunked! prof ttfdata "font/ttf")
+
         params2 {::th/type :create-font-variant
                  ::rpc/profile-id (:id prof)
                  :team-id team-id
@@ -236,7 +257,7 @@
                  :font-family "somefont"
                  :font-weight 400
                  :font-style "normal"
-                 :data {"font/ttf" ttfdata}}
+                 :uploads {"font/ttf" session-id}}
 
         out1     (th/command! params1)
         out2     (th/command! params2)]
@@ -250,7 +271,7 @@
     (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
                 (th/run-task! :storage-gc-touched {}))]
       (t/is (= 5 (:freeze res)))
-      (t/is (= 0 (:delete res)))
+      (t/is (= 1 (:delete res)))
 
       (let [result-1 (:result out1)
             result-2 (:result out2)]
@@ -271,7 +292,7 @@
         (let [res (binding [ct/*clock* (ct/fixed-clock (ct/in-future {:hours 3}))]
                     (th/run-task! :storage-gc-touched {}))]
           (t/is (= 2 (:freeze res)))
-          (t/is (= 3 (:delete res))))
+          (t/is (= 4 (:delete res))))
 
         ;; now check that there are no touched objects
         (let [res (th/db-exec-one! ["select count(*) from storage_object where touched_at is not null"])]
@@ -279,7 +300,7 @@
 
         ;; now check that all objects are marked to be deleted
         (let [res (th/db-exec-one! ["select count(*) from storage_object where deleted_at is not null"])]
-          (t/is (= 3 (:count res))))))))
+          (t/is (= 4 (:count res))))))))
 
 (t/deftest touched-gc-task-3
   (let [storage (-> (:app.storage/storage th/*system*)
diff --git a/backend/test/e2e/asset-download.test.mjs b/backend/test/e2e/asset-download.test.mjs
new file mode 100644
index 0000000000..99bb0446ba
--- /dev/null
+++ b/backend/test/e2e/asset-download.test.mjs
@@ -0,0 +1,145 @@
+import { describe, it, before } from "node:test";
+import assert from "node:assert/strict";
+import {
+  setupTestProfile,
+  createAccessToken,
+} from "./helpers/auth.mjs";
+import { rpcPost, getAsset } from "./helpers/client.mjs";
+import { parseSSE, extractResult } from "./helpers/sse.mjs";
+
+async function createAndExport(cookie, projectId) {
+  const createRes = await rpcPost(
+    "create-file",
+    { name: "E2E Asset Test", projectId },
+    { cookieToken: cookie }
+  );
+  assert.equal(createRes.status, 200);
+  const fileId = createRes.body.id;
+
+  const exportRes = await rpcPost(
+    "export-binfile",
+    { fileId, includeLibraries: false, embedAssets: true },
+    { cookieToken: cookie }
+  );
+  assert.equal(exportRes.status, 200);
+  const assetUrl = extractResult(parseSSE(exportRes.body));
+  return assetUrl;
+}
+
+function extractAssetId(assetUrl) {
+  const match = assetUrl.match(/\/assets\/by-id\/([0-9a-f-]+)/);
+  return match ? match[1] : null;
+}
+
+describe("asset download", () => {
+  let profile, cookie, assetUrl, assetId;
+
+  before(async () => {
+    const setup = await setupTestProfile();
+    profile = setup.profile;
+    cookie = setup.cookie;
+
+    assetUrl = await createAndExport(cookie, profile.defaultProjectId);
+    assetId = extractAssetId(assetUrl);
+    assert.ok(assetId, `should extract asset id from URL: ${assetUrl}`);
+  });
+
+  it("asset download with cookie auth succeeds", async () => {
+    // In devenv, nginx's @handle_redirect intercepts the backend's 307 and
+    // proxies to S3 directly. The client sees 200 with file content, not 307.
+    const res = await getAsset(assetId, { cookieToken: cookie });
+    assert.equal(res.status, 200, `expected 200, got ${res.status}`);
+    assert.ok(
+      res.body.length > 0 || typeof res.body === "object",
+      "response should have content"
+    );
+  });
+
+  it("asset download with access token auth succeeds", async () => {
+    const tokenObj = await createAccessToken(cookie, "e2e-asset-test");
+    const accessToken = tokenObj.token;
+
+    const res = await getAsset(assetId, { accessToken });
+    assert.equal(res.status, 200, `expected 200, got ${res.status}`);
+  });
+
+  it("asset download without auth returns 401", async () => {
+    const res = await getAsset(assetId, {});
+    assert.equal(res.status, 401, `expected 401, got ${res.status}`);
+  });
+
+  it("asset download returns file content through nginx proxy", async () => {
+    // The full flow: backend returns 307 with S3 presigned URL,
+    // nginx intercepts and proxies to S3, client gets 200 with content.
+    const res = await getAsset(assetId, { cookieToken: cookie });
+    assert.equal(res.status, 200);
+    // Response should be a .penpot file (binary/zip content)
+    assert.ok(res.body, "response should have body");
+  });
+
+  it("follow S3 redirect WITH auth header (bug repro)", async () => {
+    // In devenv, nginx's @handle_redirect intercepts the 307 and proxies to
+    // S3 server-side, only forwarding the Host header from X-Host. The client's
+    // Authorization header is NOT forwarded to S3, so the request succeeds.
+    //
+    // In production (no nginx proxy), the backend returns 307 directly. The HTTP
+    // client follows the redirect and forwards the Authorization: Token header to
+    // S3, which conflicts with the presigned URL's X-Amz-* params and returns
+    // 400 InvalidArgument.
+    //
+    // This test documents the devenv behavior: nginx strips the auth header
+    // when proxying to S3, so the download succeeds.
+    const res = await getAsset(assetId, { cookieToken: cookie });
+    assert.equal(res.status, 200, "through nginx, download succeeds");
+    assert.ok(res.body, "should have file content");
+  });
+
+  it("full export-to-download flow works end-to-end", async () => {
+    const url = await createAndExport(cookie, profile.defaultProjectId);
+    const id = extractAssetId(url);
+    assert.ok(id);
+
+    const res = await getAsset(id, { cookieToken: cookie });
+    assert.equal(res.status, 200);
+  });
+
+  it("asset URL is accessible immediately after export", async () => {
+    const url = await createAndExport(cookie, profile.defaultProjectId);
+    const id = extractAssetId(url);
+    assert.ok(id);
+
+    const res = await getAsset(id, { cookieToken: cookie });
+    assert.equal(res.status, 200, "asset should be accessible right after export");
+  });
+
+  it("token-only: export then download asset with same token", async () => {
+    const tokenObj = await createAccessToken(cookie, "e2e-token-export-test");
+    const token = tokenObj.token;
+
+    const createRes = await rpcPost(
+      "create-file",
+      { name: "E2E Token Export Test", projectId: profile.defaultProjectId },
+      { accessToken: token }
+    );
+    assert.equal(createRes.status, 200);
+    const fileId = createRes.body.id;
+
+    const exportRes = await rpcPost(
+      "export-binfile",
+      { fileId, includeLibraries: false, embedAssets: true },
+      { accessToken: token }
+    );
+    assert.equal(exportRes.status, 200);
+
+    const events = parseSSE(exportRes.body);
+    const url = extractResult(events);
+    assert.ok(url, "should get an asset URL from export");
+
+    const id = extractAssetId(url);
+    assert.ok(id, `should extract asset id from URL: ${url}`);
+
+    const res = await getAsset(id, { accessToken: token });
+    assert.equal(res.status, 200, `expected 200, got ${res.status}`);
+    assert.ok(res.body, "response should have file content");
+  });
+});
diff --git a/backend/test/e2e/auth-flow.test.mjs b/backend/test/e2e/auth-flow.test.mjs
new file mode 100644
index 0000000000..7f9fbb34fd
--- /dev/null
+++ b/backend/test/e2e/auth-flow.test.mjs
@@ -0,0 +1,78 @@
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import {
+  createDemoProfile,
+  login,
+  setupTestProfile,
+} from "./helpers/auth.mjs";
+import { rpcPost } from "./helpers/client.mjs";
+
+describe("auth flow", () => {
+  it("creates a demo profile", async () => {
+    const { email, password } = await createDemoProfile();
+    assert.match(email, /^demo-.*\.demo@example\.com$/);
+    assert.ok(password.length > 0);
+  });
+
+  it("logs in with valid credentials", async () => {
+    const { email, password } = await createDemoProfile();
+    const { profile, cookie } = await login(email, password);
+
+    assert.equal(profile.email, email);
+    assert.equal(profile.isDemo, true);
+    assert.ok(profile.id, "profile should have id");
+    assert.ok(profile.defaultProjectId, "profile should have defaultProjectId");
+    assert.ok(profile.defaultTeamId, "profile should have defaultTeamId");
+    assert.ok(cookie, "cookie should be set");
+  });
+
+  it("login sets session cookie", async () => {
+    const { email, password } = await createDemoProfile();
+    const { cookie } = await login(email, password);
+    assert.ok(cookie, "auth-token cookie should be extracted");
+    assert.ok(cookie.length > 10, "cookie should have meaningful length");
+  });
+
+  it("login fails with wrong password", async () => {
+    const { email } = await createDemoProfile();
+    try {
+      await login(email, "wrong-password");
+      assert.fail("should have thrown");
+    } catch (e) {
+      assert.ok(e.message.includes("Login failed"));
+    }
+  });
+
+  it("login fails with non-existent email", async () => {
+    try {
+      await login("nonexistent@example.com", "some-password");
+      assert.fail("should have thrown");
+    } catch (e) {
+      assert.ok(e.message.includes("Login failed"));
+    }
+  });
+
+  it("authenticated RPC with cookie", async () => {
+    const { profile, cookie } = await setupTestProfile();
+    const res = await rpcPost("get-profile", {}, { cookieToken: cookie });
+    assert.equal(res.status, 200);
+    assert.equal(res.body.id, profile.id);
+    assert.equal(res.body.email, profile.email);
+  });
+
+  it("unauthenticated RPC returns anonymous profile", async () => {
+    const res = await rpcPost("get-profile", {});
+    assert.equal(res.status, 200);
+    // Anonymous profile has uuid/zero as id
+    assert.equal(res.body.id, "00000000-0000-0000-0000-000000000000");
+  });
+
+  it("setupTestProfile returns all fields", async () => {
+    const { profile, cookie, email, password } = await setupTestProfile();
+    assert.ok(profile.id);
+    assert.ok(profile.defaultProjectId);
+    assert.ok(cookie);
+    assert.ok(email);
+    assert.ok(password);
+  });
+});
diff --git a/backend/test/e2e/config.mjs b/backend/test/e2e/config.mjs
new file mode 100644
index 0000000000..697f20f8c4
--- /dev/null
+++ b/backend/test/e2e/config.mjs
@@ -0,0 +1,7 @@
+const config = Object.freeze({
+  baseUrl: process.env.PENPOT_BASE_URL || "http://localhost:3450",
+  email: process.env.PENPOT_EMAIL || null,
+  password: process.env.PENPOT_PASSWORD || null,
+});
+
+export default config;
diff --git a/backend/test/e2e/export-binfile.test.mjs b/backend/test/e2e/export-binfile.test.mjs
new file mode 100644
index 0000000000..f6be598ec5
--- /dev/null
+++ b/backend/test/e2e/export-binfile.test.mjs
@@ -0,0 +1,87 @@
+import { describe, it, before } from "node:test";
+import assert from "node:assert/strict";
+import { setupTestProfile } from "./helpers/auth.mjs";
+import { rpcPost } from "./helpers/client.mjs";
+import { parseSSE, extractResult } from "./helpers/sse.mjs";
+
+async function createFile(cookie, projectId, name = "E2E Test File") {
+  const res = await rpcPost(
+    "create-file",
+    { name, projectId },
+    { cookieToken: cookie }
+  );
+  assert.equal(res.status, 200, `create-file failed: ${JSON.stringify(res.body)}`);
+  return res.body;
+}
+
+async function exportFile(cookie, fileId) {
+  const res = await rpcPost(
+    "export-binfile",
+    {
+      fileId,
+      includeLibraries: false,
+      embedAssets: true,
+    },
+    { cookieToken: cookie }
+  );
+  assert.equal(res.status, 200, `export-binfile failed: ${JSON.stringify(res.body)}`);
+
+  const events = parseSSE(res.body);
+  const assetUrl = extractResult(events);
+  return assetUrl;
+}
+
+describe("export-binfile", () => {
+  let profile, cookie;
+
+  before(async () => {
+    const setup = await setupTestProfile();
+    profile = setup.profile;
+    cookie = setup.cookie;
+  });
+
+  it("creates a file via API", async () => {
+    const file = await createFile(cookie, profile.defaultProjectId);
+    assert.ok(file.id, "file should have an id");
+    assert.equal(file.name, "E2E Test File");
+  });
+
+  it("export returns an asset URL", async () => {
+    const file = await createFile(cookie, profile.defaultProjectId);
+    const assetUrl = await exportFile(cookie, file.id);
+    assert.ok(
+      typeof assetUrl === "string" && assetUrl.includes("/assets/by-id/"),
+      `asset URL should contain /assets/by-id/, got: ${assetUrl}`
+    );
+    assert.match(assetUrl, /\/assets\/by-id\/[0-9a-f-]+$/);
+  });
+
+  it("export with invalid file-id returns error", async () => {
+    const fakeId = "00000000-0000-0000-0000-000000000000";
+    const res = await rpcPost(
+      "export-binfile",
+      {
+        fileId: fakeId,
+        includeLibraries: false,
+        embedAssets: true,
+      },
+      { cookieToken: cookie }
+    );
+    assert.ok(
+      res.body.type || res.status !== 200,
+      "should return error for non-existent file"
+    );
+  });
+
+  it("export requires authentication", async () => {
+    const res = await rpcPost("export-binfile", {
+      fileId: "00000000-0000-0000-0000-000000000000",
+      includeLibraries: false,
+      embedAssets: true,
+    });
+    assert.ok(
+      res.body.type || res.status !== 200,
+      "should require authentication"
+    );
+  });
+});
diff --git a/backend/test/e2e/helpers/auth.mjs b/backend/test/e2e/helpers/auth.mjs
new file mode 100644
index 0000000000..07d34ef0f0
--- /dev/null
+++ b/backend/test/e2e/helpers/auth.mjs
@@ -0,0 +1,38 @@
+import { rpcPost, extractCookie } from "./client.mjs";
+
+export async function createDemoProfile() {
+  const res = await rpcPost("create-demo-profile", {});
+  if (res.body.type === "validation" || res.body.type === "restriction") {
+    throw new Error(
+      `Failed to create demo profile: ${res.body.code} - ${res.body.hint || ""}`
+    );
+  }
+  return { email: res.body.email, password: res.body.password };
+}
+
+export async function login(email, password) {
+  const res = await rpcPost("login-with-password", { email, password });
+  if (res.status !== 200 || res.body.type) {
+    throw new Error(
+      `Login failed: ${JSON.stringify(res.body)}`
+    );
+  }
+  const cookie = extractCookie(res.setCookie);
+  return { profile: res.body, cookie };
+}
+
+export async function createAccessToken(cookie, name = "e2e-test-token") {
+  const res = await rpcPost("create-access-token", { name }, { cookieToken: cookie });
+  if (res.status !== 200 || res.body.type) {
+    throw new Error(
+      `Create access token failed: ${JSON.stringify(res.body)}`
+    );
+  }
+  return res.body;
+}
+
+export async function setupTestProfile() {
+  const { email, password } = await createDemoProfile();
+  const { profile, cookie } = await login(email, password);
+  return { profile, cookie, email, password };
+}
diff --git a/backend/test/e2e/helpers/client.mjs b/backend/test/e2e/helpers/client.mjs
new file mode 100644
index 0000000000..1bfe8750d6
--- /dev/null
+++ b/backend/test/e2e/helpers/client.mjs
@@ -0,0 +1,86 @@
+import config from "../config.mjs";
+
+async function parseResponse(response) {
+  const contentType = response.headers.get("content-type") || "";
+  const setCookie = response.headers.get("set-cookie") || null;
+
+  let body;
+  if (contentType.includes("application/json")) {
+    body = await response.json();
+  } else {
+    body = await response.text();
+  }
+
+  return {
+    status: response.status,
+    headers: response.headers,
+    body,
+    setCookie,
+  };
+}
+
+export function extractCookie(setCookieHeader, name = "auth-token") {
+  if (!setCookieHeader) return null;
+  const match = setCookieHeader.match(new RegExp(`${name}=([^;]+)`));
+  return match ? match[1] : null;
+}
+
+export async function rpcPost(method, body = {}, { cookieToken, accessToken } = {}) {
+  const headers = {
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  };
+  if (cookieToken) {
+    headers.Cookie = `auth-token=${cookieToken}`;
+  }
+  if (accessToken) {
+    headers.Authorization = `Token ${accessToken}`;
+  }
+
+  const response = await fetch(`${config.baseUrl}/api/main/methods/${method}`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body),
+  });
+
+  return parseResponse(response);
+}
+
+export async function multipartPost(method, formData, { cookieToken } = {}) {
+  const headers = {
+    Accept: "application/json",
+  };
+  if (cookieToken) {
+    headers.Cookie = `auth-token=${cookieToken}`;
+  }
+
+  const response = await fetch(`${config.baseUrl}/api/main/methods/${method}`, {
+    method: "POST",
+    headers,
+    body: formData,
+  });
+
+  return parseResponse(response);
+}
+
+export async function getAsset(
+  id,
+  { cookieToken, accessToken, redirect = "manual" } = {}
+) {
+  const headers = { Accept: "application/json" };
+  if (cookieToken) {
+    headers.Cookie = `auth-token=${cookieToken}`;
+  }
+  if (accessToken) {
+    headers.Authorization = `Token ${accessToken}`;
+  }
+
+  const response = await fetch(`${config.baseUrl}/assets/by-id/${id}`, {
+    method: "GET",
+    headers,
+    redirect,
+  });
+
+  return parseResponse(response);
+}
+
diff --git a/backend/test/e2e/helpers/sse.mjs b/backend/test/e2e/helpers/sse.mjs
new file mode 100644
index 0000000000..02f3845d20
--- /dev/null
+++ b/backend/test/e2e/helpers/sse.mjs
@@ -0,0 +1,72 @@
+import { createParser } from "eventsource-parser";
+
+export function parseSSE(text) {
+  const events = [];
+  const parser = createParser({
+    onEvent(event) {
+      events.push({ event: event.event || "message", data: event.data });
+    },
+  });
+  parser.feed(text);
+  return events;
+}
+
+export function extractResult(events) {
+  const endEvent = events.find((e) => e.event === "end");
+  if (!endEvent) {
+    const errEvent = events.find((e) => e.event === "error");
+    if (errEvent) {
+      throw new Error(`SSE error: ${errEvent.data}`);
+    }
+    throw new Error(`No end event found in SSE stream. Events: ${JSON.stringify(events)}`);
+  }
+
+  const raw = JSON.parse(endEvent.data);
+
+  // Transit JSON verbose format:
+  // For URIs (e.g. asset URL): {"~#uri":"https://..."}
+  // For objects: {"~:key":"val",...} or ["^ ","~:key","val",...]
+  // For strings: plain string
+  if (raw && typeof raw === "object") {
+    // Tagged URI
+    if ("~#uri" in raw) {
+      return raw["~#uri"];
+    }
+    // Transit map with ~:value key
+    if ("~:value" in raw) {
+      const value = raw["~:value"];
+      if (Array.isArray(value)) {
+        return transitArrayToObj(value);
+      }
+      return value;
+    }
+    // Direct transit map (keys starting with ~:)
+    const firstKey = Object.keys(raw)[0];
+    if (firstKey && firstKey.startsWith("~:")) {
+      return transitMapToObj(raw);
+    }
+  }
+
+  return raw;
+}
+
+function transitArrayToObj(arr) {
+  // Transit verbose object: ["^ ","~:key1","val1","~:key2","val2",...]
+  const obj = {};
+  for (let i = 1; i < arr.length; i += 2) {
+    const key = arr[i].replace(/^~:/, "");
+    const val = arr[i + 1];
+    obj[key] = val;
+  }
+  return obj;
+}
+
+function transitMapToObj(map) {
+  // Transit verbose map: {"~:key1":"val1","~:key2":"val2",...}
+  const obj = {};
+  for (const [key, val] of Object.entries(map)) {
+    const cleanKey = key.replace(/^~:/, "");
+    obj[cleanKey] = val;
+  }
+  return obj;
+}
diff --git a/common/deps.edn b/common/deps.edn
index 56714185b7..36f4b63b16 100644
--- a/common/deps.edn
+++ b/common/deps.edn
@@ -1,21 +1,21 @@
 {:deps
  {org.clojure/clojure {:mvn/version "1.12.5"}
   org.clojure/data.json {:mvn/version "2.5.2"}
-  org.clojure/tools.cli {:mvn/version "1.1.230"}
-  org.clojure/test.check {:mvn/version "1.1.1"}
+  org.clojure/tools.cli {:mvn/version "1.4.256"}
+  org.clojure/test.check {:mvn/version "1.1.3"}
   org.clojure/data.fressian {:mvn/version "1.1.1"}
-  org.clojure/clojurescript {:mvn/version "1.12.42"}
+  org.clojure/clojurescript {:mvn/version "1.12.145"}
 
   org.apache.commons/commons-pool2 {:mvn/version "2.13.1"}
 
   ;; Logging
-  org.apache.logging.log4j/log4j-api {:mvn/version "2.26.0"}
-  org.apache.logging.log4j/log4j-core {:mvn/version "2.26.0"}
-  org.apache.logging.log4j/log4j-web {:mvn/version "2.26.0"}
-  org.apache.logging.log4j/log4j-jul {:mvn/version "2.26.0"}
-  org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.26.0"}
+  org.apache.logging.log4j/log4j-api {:mvn/version "2.26.1"}
+  org.apache.logging.log4j/log4j-core {:mvn/version "2.26.1"}
+  org.apache.logging.log4j/log4j-web {:mvn/version "2.26.1"}
+  org.apache.logging.log4j/log4j-jul {:mvn/version "2.26.1"}
+  org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.26.1"}
   org.slf4j/slf4j-api {:mvn/version "2.0.18"}
-  pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.42"}
+  pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.43"}
 
   selmer/selmer {:mvn/version "1.13.4"}
   criterium/criterium {:mvn/version "0.4.6"}
@@ -23,22 +23,20 @@
   metosin/jsonista {:mvn/version "1.0.0"
                     :exclusions [com.fasterxml.jackson.core/jackson-core
                                  com.fasterxml.jackson.core/jackson-databind]}
-  com.fasterxml.jackson.core/jackson-core {:mvn/version "2.22.0"}
-  com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.22.0"}
+  com.fasterxml.jackson.core/jackson-core {:mvn/version "2.22.1"}
+  com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.22.1"}
 
 
-  metosin/malli {:mvn/version "0.19.1"}
+  metosin/malli {:mvn/version "0.20.1"}
 
   expound/expound {:mvn/version "0.9.0"}
-  com.cognitect/transit-clj {:mvn/version "1.0.333"}
+  com.cognitect/transit-clj {:mvn/version "1.1.363"}
   com.cognitect/transit-cljs {:mvn/version "0.8.280"}
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
   integrant/integrant {:mvn/version "1.0.1"}
 
   funcool/cuerdas {:mvn/version "2026.415"}
-  funcool/promesa
-  {:git/sha "46048fc0d4bf5466a2a4121f5d52aefa6337f2e8"
-   :git/url "https://github.com/funcool/promesa"}
+  funcool/promesa {:mvn/version "12.0.1"}
 
   funcool/datoteka
   {:git/tag "4.0.0"
@@ -53,16 +51,16 @@
   com.sun.mail/jakarta.mail {:mvn/version "2.0.2"}
   org.la4j/la4j {:mvn/version "0.6.0"}
 
-  me.flowthing/pp {:mvn/version "2024-11-13.77"}
+  me.flowthing/pp {:mvn/version "2026-03-01.107"}
 
   io.aviso/pretty {:mvn/version "1.4.4"}
   environ/environ {:mvn/version "1.2.0"}}
- :paths ["src" "vendor" "target/classes"]
+ :paths ["src" "vendor" "resources" "target/classes"]
  :aliases
  {:dev
   {:extra-deps
    {org.clojure/tools.namespace {:mvn/version "1.5.1"}
-    thheller/shadow-cljs {:mvn/version "3.2.0"}
+    thheller/shadow-cljs {:mvn/version "3.4.11"}
     com.clojure-goes-fast/clj-async-profiler {:mvn/version "2.0.0-beta1"}
     com.bhauman/rebel-readline {:mvn/version "0.1.11"}
     criterium/criterium {:mvn/version "0.4.6"}
diff --git a/common/package.json b/common/package.json
index 19257d3ee6..c05a294ca5 100644
--- a/common/package.json
+++ b/common/package.json
@@ -4,24 +4,25 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "devDependencies": {
-    "concurrently": "^10.0.3",
+    "concurrently": "^10.0.4",
     "nodemon": "^3.1.14",
-    "prettier": "3.9.4",
+    "prettier": "3.9.6",
     "source-map-support": "^0.5.21",
-    "ws": "^8.21.0"
+    "ws": "^8.21.2"
   },
   "dependencies": {
     "date-fns": "^4.4.0"
   },
   "scripts": {
-    "lint:clj": "clj-kondo --parallel=true --lint src/",
+    "lint:clj": "clj-kondo --config-dir ../.clj-kondo --lint src/",
+    "lint:js": "exit 0",
     "check-fmt:clj": "cljfmt check --parallel=true src/ test/",
     "check-fmt:js": "prettier -c src/**/*.js",
     "fmt:clj": "cljfmt fix --parallel=true src/ test/",
diff --git a/common/pnpm-lock.yaml b/common/pnpm-lock.yaml
index 6f6b1d494c..0f0edb681d 100644
--- a/common/pnpm-lock.yaml
+++ b/common/pnpm-lock.yaml
@@ -13,20 +13,20 @@ importers:
         version: 4.4.0
     devDependencies:
       concurrently:
-        specifier: ^10.0.3
-        version: 10.0.3
+        specifier: ^10.0.4
+        version: 10.0.4
       nodemon:
         specifier: ^3.1.14
         version: 3.1.14
       prettier:
-        specifier: 3.9.4
-        version: 3.9.4
+        specifier: 3.9.6
+        version: 3.9.6
       source-map-support:
         specifier: ^0.5.21
         version: 0.5.21
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.2
+        version: 8.21.2
 
 packages:
 
@@ -50,9 +50,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  brace-expansion@5.0.6:
-    resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -73,8 +73,8 @@ packages:
     resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==}
     engines: {node: '>=20'}
 
-  concurrently@10.0.3:
-    resolution: {integrity: sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==}
+  concurrently@10.0.4:
+    resolution: {integrity: sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==}
     engines: {node: '>=22'}
     hasBin: true
 
@@ -161,8 +161,8 @@ packages:
     resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
     engines: {node: '>=8.6'}
 
-  prettier@3.9.4:
-    resolution: {integrity: sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==}
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -181,8 +181,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  shell-quote@1.8.4:
-    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
+  shell-quote@1.9.0:
+    resolution: {integrity: sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==}
     engines: {node: '>= 0.4'}
 
   simple-update-notifier@2.0.0:
@@ -234,8 +234,8 @@ packages:
     resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==}
     engines: {node: '>=18'}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.2:
+    resolution: {integrity: sha512-54dMVAo4WIe6SKy3vBgN+9bJZqqQ8IMRevAkOLQALhi49qkkQDQfWdAZ8KQlXiEabw88ARXXdUrlvtbKQX+aKw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -273,7 +273,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  brace-expansion@5.0.6:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -303,11 +303,11 @@ snapshots:
       strip-ansi: 7.2.0
       wrap-ansi: 9.0.2
 
-  concurrently@10.0.3:
+  concurrently@10.0.4:
     dependencies:
       chalk: 5.6.2
       rxjs: 7.8.2
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       supports-color: 10.2.2
       tree-kill: 1.2.2
       yargs: 18.0.0
@@ -357,7 +357,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.6
+      brace-expansion: 5.0.9
 
   ms@2.1.3: {}
 
@@ -378,7 +378,7 @@ snapshots:
 
   picomatch@2.3.2: {}
 
-  prettier@3.9.4: {}
+  prettier@3.9.6: {}
 
   pstree.remy@1.1.8: {}
 
@@ -392,7 +392,7 @@ snapshots:
 
   semver@7.8.4: {}
 
-  shell-quote@1.8.4: {}
+  shell-quote@1.9.0: {}
 
   simple-update-notifier@2.0.0:
     dependencies:
@@ -439,7 +439,7 @@ snapshots:
       string-width: 7.2.0
       strip-ansi: 7.2.0
 
-  ws@8.21.0: {}
+  ws@8.21.2: {}
 
   y18n@5.0.8: {}
 
diff --git a/frontend/resources/fonts/gfonts.2025.11.28.json b/common/resources/fonts/gfonts.2025.11.28.json
similarity index 100%
rename from frontend/resources/fonts/gfonts.2025.11.28.json
rename to common/resources/fonts/gfonts.2025.11.28.json
diff --git a/common/src/app/common/data.cljc b/common/src/app/common/data.cljc
index 7cbfdcc4f5..418c6e5bd5 100644
--- a/common/src/app/common/data.cljc
+++ b/common/src/app/common/data.cljc
@@ -1173,6 +1173,15 @@
   [key coll]
   (sort-by key natural-compare coll))
 
+(defn normalize-string
+  "Normalizes a string by trimming leading/trailing whitespace.
+   Returns empty string for nil input. Non-string input is returned unchanged."
+  [s]
+  (cond
+    (nil? s) ""
+    (string? s) (str/trim s)
+    :else s))
+
 (defn sanitize-string [s]
   (if s
     (-> s
diff --git a/common/src/app/common/features.cljc b/common/src/app/common/features.cljc
index a5097a29a7..216c5fc64f 100644
--- a/common/src/app/common/features.cljc
+++ b/common/src/app/common/features.cljc
@@ -57,6 +57,7 @@
     "text-editor/v2"
     "text-editor-wasm/v1"
     "render-wasm/v1"
+    "wasm-export/v1"
     "variants/v1"})
 
 ;; A set of features enabled by default
@@ -82,7 +83,8 @@
     "text-editor/v2"
     "text-editor-wasm/v1"
     "tokens/numeric-input"
-    "render-wasm/v1"})
+    "render-wasm/v1"
+    "wasm-export/v1"})
 
 ;; Features that are mainly backend only or there are a proper
 ;; fallback when frontend reports no support for it
@@ -132,6 +134,7 @@
     :feature-text-editor-v2-html-paste "text-editor/v2-html-paste"
     :feature-text-editor-wasm "text-editor-wasm/v1"
     :feature-render-wasm "render-wasm/v1"
+    :feature-wasm-export "wasm-export/v1"
     :feature-variants "variants/v1"
     :feature-token-input "tokens/numeric-input"
     nil))
diff --git a/common/src/app/common/files/changes.cljc b/common/src/app/common/files/changes.cljc
index 8747099167..7c458aab3f 100644
--- a/common/src/app/common/files/changes.cljc
+++ b/common/src/app/common/files/changes.cljc
@@ -244,6 +244,7 @@
      [:page-id {:optional true} ::sm/uuid]
      [:component-id {:optional true} ::sm/uuid]
      [:ignore-touched {:optional true} :boolean]
+     [:allow-altering-copies {:optional true} :boolean]
      [:parent-id ::sm/uuid]
      [:shapes ::sm/any]]]
 
@@ -633,22 +634,26 @@
     (d/update-in-when data [:components component-id :objects] process-operations change)))
 
 (defn- process-children-reordering
-  [objects {:keys [parent-id shapes] :as change}]
+  [objects {:keys [parent-id shapes allow-altering-copies] :as change}]
   (if-let [old-shapes (dm/get-in objects [parent-id :shapes])]
-    (let [id->idx
-          (update-vals
-           (->> (d/enumerate shapes)
-                (group-by second))
-           (comp first first))
+    ;; Component sync owns copy child ordering.
+    (if (and (not allow-altering-copies)
+             (ctk/in-component-copy? (get objects parent-id)))
+      objects
+      (let [id->idx
+            (update-vals
+             (->> (d/enumerate shapes)
+                  (group-by second))
+             (comp first first))
 
-          new-shapes
-          (vec (sort-by #(d/nilv (id->idx %) -1) < old-shapes))]
+            new-shapes
+            (vec (sort-by #(d/nilv (id->idx %) -1) < old-shapes))]
 
-      (if (not= old-shapes new-shapes)
-        (do
-          (some-> *touched-changes* (vswap! conj change))
-          (update objects parent-id assoc :shapes new-shapes))
-        objects))
+        (if (not= old-shapes new-shapes)
+          (do
+            (some-> *touched-changes* (vswap! conj change))
+            (update objects parent-id assoc :shapes new-shapes))
+          objects)))
 
     objects))
 
diff --git a/common/src/app/common/files/changes_builder.cljc b/common/src/app/common/files/changes_builder.cljc
index eb7593e992..c0012dfce9 100644
--- a/common/src/app/common/files/changes_builder.cljc
+++ b/common/src/app/common/files/changes_builder.cljc
@@ -198,6 +198,20 @@
                  ::applied-changes-count (count redo-changes)))
     changes))
 
+(defn- without-changes-local
+  "Append changes through `f` without applying them to the mounted page's
+  working state."
+  [changes f]
+  (if (contains? (meta changes) ::file-data)
+    (let [changes (-> changes (apply-changes-local) (f))]
+      (vary-meta changes assoc ::applied-changes-count (count (:redo-changes changes))))
+    (f changes)))
+
+(defn concat-changes-without-local
+  "Append `other` without applying it to the mounted page's working state."
+  [changes other]
+  (without-changes-local changes #(concat-changes % other)))
+
 ;; Page changes
 
 (defn add-empty-page
@@ -603,68 +617,72 @@
      (-> (reduce update-shape changes ids)
          (apply-changes-local)))))
 
+(defn- add-remove-objects-changes
+  [changes page-id objects ids {:keys [ignore-touched allow-altering-copies]
+                                :or {ignore-touched false
+                                     allow-altering-copies false}}]
+  (let [add-redo-change
+        (fn [change-set id]
+          (conj change-set
+                (cond-> {:type :del-obj
+                         :page-id page-id
+                         :id id}
+                  ignore-touched
+                  (assoc :ignore-touched true))))
+
+        add-undo-change-shape
+        (fn [change-set id]
+          (let [shape (get objects id)]
+            (cond-> change-set
+              (some? shape)
+              (conj {:type :add-obj
+                     :id id
+                     :page-id page-id
+                     :parent-id (:parent-id shape)
+                     :frame-id (:frame-id shape)
+                     :index (cfh/get-position-on-parent objects id)
+                     :obj (cond-> shape
+                            (contains? shape :shapes)
+                            (assoc :shapes []))}))))
+
+        add-undo-change-parent
+        (fn [change-set id]
+          (let [shape (get objects id)
+                prev-sibling (cfh/get-prev-sibling objects (:id shape))]
+            (cond-> change-set
+              (some? shape)
+              (conj (cond-> {:type :mov-objects
+                             :page-id page-id
+                             :parent-id (:parent-id shape)
+                             :shapes [id]
+                             :after-shape prev-sibling
+                             :index 0
+                             :ignore-touched true}
+                      allow-altering-copies
+                      (assoc :allow-altering-copies true))))))]
+
+    (-> changes
+        (update :redo-changes #(reduce add-redo-change % ids))
+        (update :undo-changes #(as-> % $
+                                 (reduce add-undo-change-parent $ ids)
+                                 (reduce add-undo-change-shape $ ids))))))
+
 (defn remove-objects
   ([changes ids] (remove-objects changes ids nil))
-  ([changes ids {:keys [ignore-touched] :or {ignore-touched false}}]
+  ([changes ids options]
    (assert-page-id! changes)
    (assert-objects! changes)
-   (let [page-id (::page-id (meta changes))
-         objects (lookup-objects changes)
-
-         add-redo-change
-         (fn [change-set id]
-           (conj change-set
-                 (cond-> {:type :del-obj
-                          :page-id page-id
-                          :id id}
-                   ignore-touched
-                   (assoc :ignore-touched true))))
-
-         add-undo-change-shape
-         (fn [change-set id]
-           (let [shape (get objects id)]
-             (cond-> change-set
-               (some? shape)
-               (conj {:type :add-obj
-                      :id id
-                      :page-id page-id
-                      :parent-id (:parent-id shape)
-                      :frame-id (:frame-id shape)
-                      :index (cfh/get-position-on-parent objects id)
-                      :obj (cond-> shape
-                             (contains? shape :shapes)
-                             (assoc :shapes []))}))))
-
-         add-undo-change-parent
-         (fn [change-set id]
-           (let [shape (get objects id)
-                 prev-sibling (cfh/get-prev-sibling objects (:id shape))]
-             (cond-> change-set
-               (some? shape)
-               (conj {:type :mov-objects
-                      :page-id page-id
-                      :parent-id (:parent-id shape)
-                      :shapes [id]
-                      :after-shape prev-sibling
-                      :index 0
-                      :ignore-touched true}))))]
-
-     (-> changes
-         (update :redo-changes #(reduce add-redo-change % ids))
-         (update :undo-changes #(as-> % $
-                                  (reduce add-undo-change-parent $ ids)
-                                  (reduce add-undo-change-shape $ ids)))
-         (apply-changes-local)))))
+   (-> changes
+       (add-remove-objects-changes (::page-id (meta changes))
+                                   (lookup-objects changes)
+                                   ids
+                                   options)
+       (apply-changes-local))))
 
 ;; FIXME: PERFORMANCE
-(defn resize-parents
-  [changes ids]
-  (assert-page-id! changes)
-  (assert-objects! changes)
-  (let [page-id (::page-id (meta changes))
-
-        objects (lookup-objects changes)
-        xform   (comp
+(defn- add-resize-parents-changes
+  [changes page-id objects ids]
+  (let [xform   (comp
                  (mapcat #(cons % (cfh/get-parent-ids objects %)))
                  (map (d/getf objects))
                  (filter #(contains? #{:group :bool} (:type %)))
@@ -698,9 +716,8 @@
                   (update :uops conj {:type :set :attr attr :val old-val :ignore-touched true})))))
 
         resize-parent
-        (fn [changes parent]
-          (let [objects (lookup-objects changes)
-                children (->> parent :shapes (map (d/getf objects)))
+        (fn [[changes objects] parent]
+          (let [children (->> parent :shapes (map (d/getf objects)))
                 resized-parent (cond
                                  (empty? children) ;; a parent with no children will be deleted,
                                  nil               ;; so it does not need resize
@@ -727,14 +744,24 @@
                             :id (:id parent)}]
 
                 (if (seq rops)
-                  (-> changes
-                      (update :redo-changes conj (assoc change :operations rops))
-                      (update :undo-changes conj (assoc change :operations uops))
-                      (apply-changes-local))
-                  changes))
-              changes)))]
+                  [(-> changes
+                       (update :redo-changes conj (assoc change :operations rops))
+                       (update :undo-changes conj (assoc change :operations uops)))
+                   (assoc objects (:id parent) resized-parent)]
+                  [changes objects]))
+              [changes objects])))]
 
-    (reduce resize-parent changes all-parents)))
+    (first (reduce resize-parent [changes objects] all-parents))))
+
+(defn resize-parents
+  [changes ids]
+  (assert-page-id! changes)
+  (assert-objects! changes)
+  (-> changes
+      (add-resize-parents-changes (::page-id (meta changes))
+                                  (lookup-objects changes)
+                                  ids)
+      (apply-changes-local)))
 
 ;; Library changes
 
@@ -1148,6 +1175,8 @@
         (->> ids
              (map (d/getf objects))
              (filter ctl/grid-layout?)
+             ;; Component sync owns copy child ordering.
+             (remove ctk/in-component-copy?)
              (reduce reorder-grid changes))]
 
     changes))
diff --git a/common/src/app/common/files/comp_processors.cljc b/common/src/app/common/files/comp_processors.cljc
index ed2ca8b51e..9c73a2bba3 100644
--- a/common/src/app/common/files/comp_processors.cljc
+++ b/common/src/app/common/files/comp_processors.cljc
@@ -63,8 +63,8 @@
       file-data)))
 
 (defn fix-missing-swap-slots
-  "Locate shapes that have been swapped (i.e. their shape-ref does not point to the near match) but
-   they don't have a swap slot. In this case, add one pointing to the near match."
+  "Locate shapes that have been swapped (see `ctf/swapped-subhead?`) but don't have a swap slot.
+   In this case, add one pointing to the near match."
   [file-data libraries]
   (try
     (ctf/update-all-shapes
@@ -73,7 +73,11 @@
        (if (ctk/subcopy-head? shape)
          (let [container (:container (meta shape))
                file {:id (:id file-data) :data file-data}
-               near-match (ctf/find-near-match file container libraries shape :include-deleted? true :with-context? false)]
+               swapped? (ctf/swapped-subhead?
+                         shape container
+                         #(ctf/find-ref-shape file container libraries % :include-deleted? true))
+               near-match (when swapped?
+                            (ctf/find-near-match file container libraries shape :include-deleted? true :with-context? false))]
            (if (and (some? near-match)
                     (not= (:shape-ref shape) (:id near-match))
                     (nil? (ctk/get-swap-slot shape)))
diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 147df1d1cc..28174ba84f 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -1874,6 +1874,110 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
+(defmethod migrate-data "0025-repair-empty-text-content"
+  ;; Repair text shapes whose :content tree has empty/missing :children
+  ;; at any of the three levels:
+  ;;   Level 1: root with no paragraph-set
+  ;;   Level 2: paragraph-set with no paragraph
+  ;;   Level 3: paragraph with no span
+  ;; Such shapes fail the backend `validate-shape` schema and would also
+  ;; break the v2 editor's `cljs->dom` roundtrip. Re-seed the canonical
+  ;; root -> paragraph-set -> paragraph -> span tree, preserving the
+  ;; original root-level attributes (e.g. :vertical-align) when present.
+  ;; Idempotent on healthy content.
+  [data _]
+  (let [default-span {:text "" :fills types.text/default-text-fills}
+        default-paragraph {:type "paragraph" :children [default-span]}
+        default-paragraph-set {:type "paragraph-set" :children [default-paragraph]}
+
+        ;; Level 3: repair paragraph with empty/missing children
+        repair-span (fn [span]
+                      (if (and (map? span)
+                               (string? (:text span)))
+                        span
+                        default-span))
+
+        repair-paragraph (fn [paragraph]
+                           (if (and (map? paragraph)
+                                    (= "paragraph" (:type paragraph)))
+                             (cond
+                               ;; Children is nil or empty vector - seed with default span
+                               (or (nil? (:children paragraph))
+                                   (and (vector? (:children paragraph))
+                                        (empty? (:children paragraph))))
+                               (assoc paragraph :children [default-span])
+
+                               ;; Children is a vector - repair any invalid spans
+                               (vector? (:children paragraph))
+                               (update paragraph :children
+                                       (fn [children]
+                                         (mapv repair-span children)))
+
+                               ;; Children is not a vector - replace with default
+                               :else
+                               (assoc paragraph :children [default-span]))
+                             default-paragraph))
+
+        ;; Level 2: repair paragraph-set with empty/missing children
+        repair-paragraph-set (fn [paragraph-set]
+                               (if (and (map? paragraph-set)
+                                        (= "paragraph-set" (:type paragraph-set)))
+                                 (cond
+                                   ;; Children is nil or empty vector - seed with default paragraph
+                                   (or (nil? (:children paragraph-set))
+                                       (and (vector? (:children paragraph-set))
+                                            (empty? (:children paragraph-set))))
+                                   (assoc paragraph-set :children [default-paragraph])
+
+                                   ;; Children is a vector - repair any invalid paragraphs
+                                   (vector? (:children paragraph-set))
+                                   (update paragraph-set :children
+                                           (fn [children]
+                                             (mapv repair-paragraph children)))
+
+                                   ;; Children is not a vector - replace with default
+                                   :else
+                                   (assoc paragraph-set :children [default-paragraph]))
+                                 default-paragraph-set))
+
+        ;; Repair content at all levels, handling all edge cases
+        repair-content (fn [content]
+                         (cond
+                           ;; Content is not a valid root map - create default
+                           ;; Preserve root-level attrs if content is a map
+                           (or (nil? content)
+                               (not (map? content))
+                               (not= "root" (:type content)))
+                           (merge types.text/default-root-attrs
+                                  {:type "root"
+                                   :children [default-paragraph-set]}
+                                  (when (map? content)
+                                    (select-keys content types.text/root-attrs)))
+
+                           ;; Content is a valid root - repair all levels
+                           :else
+                           (let [children (if (and (vector? (:children content))
+                                                   (seq (:children content)))
+                                            (:children content)
+                                            [default-paragraph-set])]
+                             (merge types.text/default-root-attrs
+                                    {:type "root"}
+                                    (select-keys content types.text/root-attrs)
+                                    {:children (mapv repair-paragraph-set children)}))))
+
+        ;; Simplified gatekeeper - just check if it's a text shape
+        fix-shape (fn [shape]
+                    (if (cfh/text-shape? shape)
+                      (update shape :content repair-content)
+                      shape))
+
+        update-container (fn [container]
+                           (d/update-when container :objects d/update-vals fix-shape))]
+
+    (-> data
+        (update :pages-index d/update-vals update-container)
+        (d/update-when :components d/update-vals update-container))))
+
 (def available-migrations
   (into (d/ordered-set)
         ["legacy-2"
@@ -1955,4 +2059,5 @@
          "0021-fix-shape-svg-attrs"
          "0022-normalize-component-root-and-resync"
          "0023-repair-token-themes-with-inexistent-sets"
-         "0024b-fix-stroke-cap-placement"]))
+         "0024b-fix-stroke-cap-placement"
+         "0025-repair-empty-text-content"]))
diff --git a/common/src/app/common/files/repair.cljc b/common/src/app/common/files/repair.cljc
index 6714bfce04..95f3fda22f 100644
--- a/common/src/app/common/files/repair.cljc
+++ b/common/src/app/common/files/repair.cljc
@@ -10,12 +10,14 @@
    [app.common.files.changes-builder :as pcb]
    [app.common.files.helpers :as cfh]
    [app.common.logging :as log]
+   [app.common.path-names :as cpn]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
    [app.common.types.file :as ctf]
    [app.common.types.pages-list :as ctpl]
    [app.common.types.shape :as cts]
+   [app.common.types.variant :as ctv]
    [app.common.uuid :as uuid]))
 
 (log/set-level! :debug)
@@ -35,7 +37,7 @@
               (assoc :width 0.01)
               (assoc :height 0.01)
               (cts/setup-rect)))]
-    (log/dbg :hint "repairing shape :invalid-geometry" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-geometry" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -48,7 +50,7 @@
           (log/debug :hint "  -> set to " :parent-id uuid/zero)
           (assoc shape :parent-id uuid/zero))]
 
-    (log/dbg :hint "repairing shape :parent-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :parent-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -61,7 +63,7 @@
           (log/debug :hint "  -> add children to" :parent-id (:id parent-shape))
           (update parent-shape :shapes conj (:id shape)))]
 
-    (log/dbg :hint "repairing shape :child-not-in-parent" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :child-not-in-parent" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:parent-id shape)] repair-shape))))
@@ -74,7 +76,7 @@
           (log/debug :hint "  -> remove duplicated children")
           (update shape :shapes distinct))]
 
-    (log/dbg :hint "repairing shape :duplicated-children" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :duplicated-children" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -86,14 +88,14 @@
           (log/debug :hint "  -> remove child" :child-id (:child-id args))
           (update parent-shape :shapes (fn [shapes]
                                          (d/removev #(= (:child-id args) %) shapes))))]
-    (log/dbg :hint "repairing shape :child-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :child-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
 
 (defmethod repair-error :invalid-parent
   [_ {:keys [shape page-id args] :as error} file-data _]
-  (log/dbg :hint "repairing shape :invalid-parent" :id (:id shape) :name (:name shape) :page-id page-id)
+  (log/debug :hint "repairing shape :invalid-parent" :id (:id shape) :name (:name shape) :page-id page-id)
   (-> (pcb/empty-changes nil page-id)
       (pcb/with-file-data file-data)
       (pcb/change-parent (:parent-id args) [shape] nil {:allow-altering-copies true})))
@@ -109,7 +111,7 @@
             (log/debug :hint "  -> set to " :frame-id frame-id)
             (assoc shape :frame-id frame-id)))]
 
-    (log/dbg :hint "repairing shape :frame-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :frame-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -125,7 +127,7 @@
             (log/debug :hint "  -> set to " :frame-id frame-id)
             (assoc shape :frame-id frame-id)))]
 
-    (log/dbg :hint "repairing shape :invalid-frame" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-frame" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -138,7 +140,7 @@
           (log/debug :hint "  -> set :main-instance")
           (assoc shape :main-instance true))]
 
-    (log/dbg :hint "repairing shape :component-not-main" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :component-not-main" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -155,7 +157,7 @@
     ;; (log/warn :hint "  -> CANNOT REPAIR THIS AUTOMATICALLY.")
     ;; shape)]
 
-    (log/dbg :hint "repairing shape :component-main-external" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :component-main-external" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -174,7 +176,7 @@
     ;; (log/warn :hint "  -> CANNOT REPAIR THIS AUTOMATICALLY.")
     ;; shape)]
 
-    (log/dbg :hint "repairing shape :component-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :component-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes shape-ids repair-shape))))
@@ -194,7 +196,7 @@
           (log/debug :hint "  -> detach shape" :shape-id (:id shape))
           (ctk/detach-shape shape))]
 
-    (log/dbg :hint "repairing shape :invalid-main-instance-id" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-main-instance-id" :id (:id shape) :name (:name shape) :page-id page-id)
     (if (and (some? component) (not (:deleted component)))
       (-> (pcb/empty-changes nil page-id)
           (pcb/with-library-data file-data)
@@ -211,7 +213,7 @@
           ;; Assign main instance in the component to current shape
           (log/debug :hint "  -> assign main-instance-page" :component-id (:id component))
           (assoc component :main-instance-page page-id))]
-    (log/dbg :hint "repairing shape :invalid-main-instance-page" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-main-instance-page" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-library-data file-data)
         (pcb/update-component (:component-id shape) repair-component))))
@@ -224,7 +226,7 @@
           (log/warn :hint "  -> CANNOT REPAIR THIS AUTOMATICALLY.")
           shape)]
 
-    (log/dbg :hint "repairing shape :invalid-main-instance" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-main-instance" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -237,7 +239,7 @@
           (log/debug :hint "  -> unset :main-instance")
           (dissoc shape :main-instance))]
 
-    (log/dbg :hint "repairing shape :component-main" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :component-main" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -250,7 +252,7 @@
           (log/debug :hint "  -> set :component-root")
           (assoc shape :component-root true))]
 
-    (log/dbg :hint "repairing shape :should-be-component-root" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :should-be-component-root" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -263,7 +265,7 @@
           (log/debug :hint "  -> unset :component-root")
           (dissoc shape :component-root))]
 
-    (log/dbg :hint "repairing shape :should-not-be-component-root" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :should-not-be-component-root" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -310,7 +312,7 @@
 
     ;; If the shape still refers to the remote component, try to find the corresponding near one
     ;; and link to it. If not, detach the shape.
-    (log/dbg :hint "repairing shape :ref-shape-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :ref-shape-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
     (if (some? matching-shape)
       (-> (pcb/empty-changes nil page-id)
           (pcb/with-file-data file-data)
@@ -329,7 +331,7 @@
           (log/debug :hint "  -> unhead shape")
           (ctk/unhead-shape shape))]
 
-    (log/dbg :hint "repairing shape :shape-ref-is-not-head" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :shape-ref-is-not-head" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -354,7 +356,7 @@
             (nil? (:component-file args))
             (dissoc :component-file)))]
 
-    (log/dbg :hint "repairing shape :component-id-mismatch" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :component-id-mismatch" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -367,7 +369,7 @@
           (log/debug :hint "  -> reroot shape")
           (ctk/rehead-shape shape (:component-file args) (:component-id args)))]
 
-    (log/dbg :hint "repairing shape :shape-ref-is-head" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :shape-ref-is-head" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -396,7 +398,7 @@
                                      (assoc acc k v)))
                                  {}
                                  objects)))))]
-    (log/dbg :hint "repairing component :shape-ref-cycle" :id (:id shape) :name (:name shape))
+    (log/debug :hint "repairing component :shape-ref-cycle" :id (:id shape) :name (:name shape))
     (-> (pcb/empty-changes nil nil)
         (pcb/with-library-data file-data)
         (pcb/update-component (:id shape) repair-component))))
@@ -409,7 +411,7 @@
           (log/debug :hint "  -> unset :shape-ref")
           (dissoc shape :shape-ref))]
 
-    (log/dbg :hint "repairing shape :shape-ref-in-main" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :shape-ref-in-main" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -422,7 +424,7 @@
           (log/debug :hint "  -> unset :component-root")
           (dissoc shape :component-root))]
 
-    (log/dbg :hint "repairing shape :root-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :root-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -435,7 +437,7 @@
           (log/debug :hint "  -> set :component-root")
           (assoc shape :component-root true))]
 
-    (log/dbg :hint "repairing shape :nested-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :nested-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape)
@@ -449,7 +451,7 @@
           (log/debug :hint "  -> unset :component-root")
           (dissoc shape :component-root))]
 
-    (log/dbg :hint "repairing shape :root-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :root-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -462,7 +464,7 @@
           (log/debug :hint "  -> set :component-root")
           (assoc shape :component-root true))]
 
-    (log/dbg :hint "repairing shape :nested-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :nested-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -475,7 +477,7 @@
           (log/debug :hint "  -> detach shape" :shape-id (:id shape))
           (ctk/detach-shape shape))]
 
-    (log/dbg :hint "repairing shape :not-head-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :not-head-main-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -488,7 +490,7 @@
           (log/debug :hint "  -> detach shape" :shape-id (:id shape))
           (ctk/detach-shape shape))]
 
-    (log/dbg :hint "repairing shape :not-head-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :not-head-copy-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -501,7 +503,7 @@
           (log/warn :hint "  -> CANNOT REPAIR THIS AUTOMATICALLY.")
           shape)]
 
-    (log/dbg :hint "repairing shape :not-component-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :not-component-not-allowed" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -520,7 +522,7 @@
                  :r3 0
                  :r4 0))]
 
-    (log/dbg :hint "repairing shape :instance-head-not-frame" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :instance-head-not-frame" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -538,7 +540,7 @@
               (log/debug :hint "  -> remove :objects")
               (dissoc component :objects))))]
 
-    (log/dbg :hint "repairing component :component-nil-objects-not-allowed" :id (:id component) :name (:name component))
+    (log/debug :hint "repairing component :component-nil-objects-not-allowed" :id (:id component) :name (:name component))
     (-> (pcb/empty-changes nil)
         (pcb/with-library-data file-data)
         (pcb/update-component (:id component) repair-component))))
@@ -554,7 +556,7 @@
               (dissoc component :objects))
             component))]
 
-    (log/dbg :hint "repairing component :non-deleted-component-cannot-have-objects" :id (:id component) :name (:name component))
+    (log/debug :hint "repairing component :non-deleted-component-cannot-have-objects" :id (:id component) :name (:name component))
     (-> (pcb/empty-changes nil)
         (pcb/with-library-data file-data)
         (pcb/update-component (:id component) repair-component))))
@@ -567,7 +569,7 @@
           (log/debug :hint "  -> add :content-group to :touched-groups")
           (update shape :touched ctk/set-touched-group :content-group))]
 
-    (log/dbg :hint "repairing shape :invalid-text-touched" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :invalid-text-touched" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -580,7 +582,7 @@
           (log/debug :hint "  -> remove swap-slot")
           (ctk/remove-swap-slot shape))]
 
-    (log/dbg :hint "repairing shape :misplaced-slot" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :misplaced-slot" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
@@ -603,13 +605,11 @@
           (log/debug :hint "  -> remove swap-slot" :child-id (:id shape))
           (ctk/remove-swap-slot shape))]
 
-    (log/dbg :hint "repairing shape :duplicated-slot" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :duplicated-slot" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes (map :id child-with-duplicate) repair-shape))))
 
-
-
 (defmethod repair-error :component-duplicate-slot
   [_ {:keys [shape] :as error} file-data _]
   (let [main-shape            (get-in shape [:objects (:main-instance-id shape)])
@@ -633,7 +633,7 @@
                                    (:objects component))]
             (assoc component :objects objects)))]
 
-    (log/dbg :hint "repairing component :component-duplicated-slot" :id (:id shape) :name (:name shape))
+    (log/debug :hint "repairing component :component-duplicated-slot" :id (:id shape) :name (:name shape))
     (-> (pcb/empty-changes nil)
         (pcb/with-library-data file-data)
         (pcb/update-component (:id shape) repair-component))))
@@ -649,50 +649,139 @@
                   (ctk/set-swap-slot shape slot))
               shape)))]
 
-    (log/dbg :hint "repairing shape :missing-slot" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "repairing shape :missing-slot" :id (:id shape) :name (:name shape) :page-id page-id)
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape))))
 
-(defmethod repair-error :not-a-variant
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+(defmethod repair-error :main-instance-not-a-variant
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [repair-shape
+        (fn [shape]
+          (let [variant-id (:variant-id args)]
+            ;; Set the desired variant-id
+            (log/debug :hint (str "  -> set variant-id to " variant-id))
+            (assoc shape :variant-id variant-id)))]
 
-(defmethod repair-error :invalid-variant-id
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+    (log/debug :hint "repairing shape :main-instance-not-a-variant" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-shape))))
+
+(defmethod repair-error :main-instance-invalid-variant-id
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [repair-shape
+        (fn [shape]
+          (let [variant-id (:variant-id args)]
+            ;; Set the desired variant-id
+            (log/debug :hint (str "  -> set variant-id to " variant-id))
+            (assoc shape
+                   :variant-id variant-id)))]
+
+    (log/debug :hint "repairing shape :main-instance-invalid-variant-id" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-shape))))
 
 (defmethod repair-error :invalid-variant-properties
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [prop-names (:prop-names args)
+
+        component   (get-in file-data [:components (:component-id shape)])
+        prop-values (into {} (map (juxt :name :value)) (:variant-properties component))
+        properties' (mapv (fn [name] {:name name :value (get prop-values name "")}) prop-names)
+        variant-name (ctv/properties-to-name properties')
+
+        repair-component
+        (fn [component]
+          ;; Rebuild component properties, removing any extra ones and adding missing ones with empty value
+          (log/debug :hint "  -> rebuild properties" :component-id (:id component) :prop-names (str prop-names))
+          (assoc component :variant-properties properties'))
+
+        repair-shape
+        (fn [shape]
+          (log/debug :hint "  -> set variant-name" :variant-name variant-name)
+          (assoc shape :variant-name variant-name))]
+
+    (log/debug :hint "repairing shape :invalid-variant-properties" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/with-library-data file-data)
+        (pcb/update-component (:component-id shape) repair-component)
+        (pcb/update-shapes [(:id shape)] repair-shape))))
 
 (defmethod repair-error :variant-not-main
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+  [_ {:keys [shape page-id]} file-data _]
+  (let [page      (ctpl/get-page file-data page-id)
+        shape-ids (cfh/get-children-ids-with-self (:objects page) (:id shape))]
+    (log/debug :hint "repairing shape :variant-not-main" :id (:id shape) :name (:name shape) :page-id page-id)
+    (log/debug :hint "  -> delete shapes" :shape-ids shape-ids)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/remove-objects shape-ids))))
 
 (defmethod repair-error :parent-not-variant
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+  [_ {:keys [shape page-id]} file-data _]
+  (let [parent-id (:parent-id shape)
+        repair-fn
+        (fn [parent]
+          (log/debug :hint "  -> set :is-variant-container true")
+          (assoc parent :is-variant-container true))]
+    (log/debug :hint "repairing shape :parent-not-variant" :id (:id shape) :name (:name shape) :parent-id parent-id :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [parent-id] repair-fn))))
 
-(defmethod repair-error :variant-bad-name
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+(defmethod repair-error :variant-main-bad-name
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [repair-fn
+        (fn [shape]
+          (log/debug :hint "  -> set :name" :name (:variant-name args))
+          (assoc shape :name (:variant-name args)))]
+    (log/debug :hint "repairing shape :variant-main-bad-name" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-fn))))
 
-(defmethod repair-error :variant-bad-variant-name
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+(defmethod repair-error :variant-main-bad-variant-name
+  [_ {:keys [shape page-id]} file-data _]
+  (let [component    (get-in file-data [:components (:component-id shape)])
+        variant-name (ctv/properties-to-name (:variant-properties component))
+        repair-fn
+        (fn [shape]
+          (log/debug :hint "  -> set :variant-name" :variant-name variant-name)
+          (assoc shape :variant-name variant-name))]
+    (log/dbg :hint "repairing shape :variant-main-bad-variant-name" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-fn))))
 
 (defmethod repair-error :variant-component-bad-name
-  [_ error file _]
-  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
-  file)
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [[path name] (cpn/split-group-name (:variant-container-name args))
+        repair-fn
+        (fn [component]
+          (log/debug :hint "  -> set :path and :name" :path path :name name)
+          (assoc component :path path :name name))]
+    (log/dbg :hint "repairing shape :variant-component-bad-name" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-library-data file-data)
+        (pcb/update-component (:component-id shape) repair-fn))))
+
+(defmethod repair-error :variant-component-bad-id
+  [_ {:keys [shape page-id args]} file-data _]
+  (let [repair-shape
+        (fn [shape]
+          (let [variant-id (:variant-id args)]
+            ;; Set the desired variant-id
+            (log/debug :hint (str "  -> set variant-id to " variant-id))
+            (assoc shape
+                   :variant-id variant-id)))]
+
+    (log/debug :hint "repairing shape :variant-component-bad-id" :id (:id shape) :name (:name shape) :page-id page-id)
+    (-> (pcb/empty-changes nil page-id)
+        (pcb/with-file-data file-data)
+        (pcb/update-shapes [(:id shape)] repair-shape))))
 
 (defmethod repair-error :default
   [_ error file _]
@@ -701,7 +790,7 @@
 
 (defn repair-file
   [{:keys [data id] :as file} libraries errors]
-  (log/dbg :hint "repairing file" :id (str id) :errors (count errors))
+  (log/debug :hint "repairing file" :id (str id) :errors (count errors))
   (let [{:keys [redo-changes]}
         (reduce (fn [changes error]
                   (pcb/concat-changes changes
diff --git a/common/src/app/common/files/validate.cljc b/common/src/app/common/files/validate.cljc
index ca7b469d4b..9cb2a5e060 100644
--- a/common/src/app/common/files/validate.cljc
+++ b/common/src/app/common/files/validate.cljc
@@ -65,13 +65,13 @@
     :misplaced-slot
     :missing-slot
     :shape-ref-cycle
-    :not-a-variant
-    :invalid-variant-id
+    :main-instance-not-a-variant
+    :main-instance-invalid-variant-id
     :invalid-variant-properties
     :variant-not-main
     :parent-not-variant
-    :variant-bad-name
-    :variant-bad-variant-name
+    :variant-main-bad-name
+    :variant-main-bad-variant-name
     :variant-component-bad-name
     :variant-component-bad-id})
 
@@ -438,15 +438,15 @@
                   shape file page)))
 
 (defn- check-required-swap-slot
-  "Validate that the shape has swap-slot if it's a subinstance head and the ref shape is not the
-   matching shape by position in the near main."
+  "Validate that the shape has a swap slot if it's a subinstance head that has been
+   swapped (see `ctf/swapped-subhead?`)."
   [shape file page libraries]
   ;; Guard first: if the shape already has a swap slot the invariant is satisfied
-  ;; and we can avoid the expensive `find-near-match` call entirely.
-  (when (nil? (ctk/get-swap-slot shape))
+  ;; and we can avoid the ref-shape lookups entirely.
+  (when (and (nil? (ctk/get-swap-slot shape))
+             (ctf/swapped-subhead? shape page #(find-ref-shape* file page libraries %)))
     (let [near-match (ctf/find-near-match file page libraries shape :include-deleted? true :with-context? false)]
-      (when (and (some? near-match)
-                 (not= (:shape-ref shape) (:id near-match)))
+      (when (some? near-match)
         (report-error :missing-slot
                       "Shape has been swapped, should have swap slot"
                       shape file page
@@ -573,19 +573,23 @@
     (run! (fn [child-id]
             (when-let [child (get objects child-id)]
               (if (not (ctk/is-variant? child))
-                (report-error :not-a-variant
-                              (str/ffmt "Shape % should be a variant" (:id child))
-                              child file page)
+                (report-error :main-instance-not-a-variant
+                              (str/ffmt "Main instance shape % should be a variant" (:id child))
+                              child file page
+                              :variant-id shape-id)
                 (do
                   (when (not= (:variant-id child) shape-id)
-                    (report-error :invalid-variant-id
-                                  (str/ffmt "Variant % has invalid variant-id %" (:id child) (:variant-id child))
-                                  child file page))
+                    (report-error :main-instance-invalid-variant-id
+                                  (str/ffmt "Main instance in variant % should have the variant-id of the container but has %" (:id child) (:variant-id child))
+                                  child file page
+                                  :variant-id shape-id))
                   (when (not= prop-names (cfv/extract-properties-names child file-data))
                     (report-error :invalid-variant-properties
                                   (str/ffmt "Variant % has invalid properties %" (:id child) (vec prop-names))
-                                  child file page))))))
+                                  child file page
+                                  :prop-names prop-names))))))
           shapes)))
+
 (defn- check-variant
   "Shape is a variant, so
      -it should be a main component
@@ -594,9 +598,9 @@
      -its name should be the same as its parent's
    "
   [shape file page]
-  (let [parent    (ctst/get-shape page (:parent-id shape))
-        component (ctkl/get-component (:data file) (:component-id shape) true)
-        name      (ctv/properties-to-name (:variant-properties component))]
+  (let [parent       (ctst/get-shape page (:parent-id shape))
+        component    (ctkl/get-component (:data file) (:component-id shape) true)
+        variant-name (ctv/properties-to-name (:variant-properties component))]
     (when-not (ctk/main-instance? shape)
       (report-error :variant-not-main
                     (str/ffmt "Variant % is not a main instance" (:id shape))
@@ -605,23 +609,26 @@
       (report-error :parent-not-variant
                     (str/ffmt "Variant % has an invalid parent" (:id shape))
                     shape file page))
-
-    (when-not (= name (:variant-name shape))
-      (report-error :variant-bad-variant-name
+    (when-not (= variant-name (:variant-name shape))
+      (report-error :variant-main-bad-variant-name
                     (str/ffmt "Variant % has an invalid variant-name" (:id shape))
-                    shape file page))
+                    shape file page
+                    :variant-name variant-name))
     (when-not (= (:name parent) (:name shape))
-      (report-error :variant-bad-name
-                    (str/ffmt "Variant % has an invalid name" (:id shape))
-                    shape file page))
+      (report-error :variant-main-bad-name
+                    (str/ffmt "Main instance inside variant % has an invalid name" (:id shape))
+                    shape file page
+                    :variant-name (:name parent)))
     (when-not (= (:name parent) (cpn/merge-path-item (:path component) (:name component)))
       (report-error :variant-component-bad-name
                     (str/ffmt "Component % has an invalid name" (:id shape))
-                    shape file page))
+                    shape file page
+                    :variant-container-name (:name parent)))
     (when-not (= (:variant-id component) (:variant-id shape))
       (report-error :variant-component-bad-id
                     (str/ffmt "Variant % has adifferent variant-id than its component" (:id shape))
-                    shape file page))))
+                    shape file page
+                    :variant-id (:variant-id component)))))
 
 (defn- check-shape
   "Validate referential integrity and semantic coherence of
@@ -740,14 +747,15 @@
      -It should have at least one variant property"
   [component file]
   (let [component-page (ctf/get-component-page (:data file) component)
-        main-component (if (:deleted component)
+        main-instance  (if (:deleted component)
                          (dm/get-in component [:objects (:main-instance-id component)])
                          (ctst/get-shape component-page (:main-instance-id component)))]
-    (when (and main-component
-               (not (ctk/is-variant? main-component)))
-      (report-error :not-a-variant
-                    (str/ffmt "Shape % should be a variant" (:id main-component))
-                    main-component file component-page))))
+    (when (and main-instance
+               (not (ctk/is-variant? main-instance)))
+      (report-error :main-instance-not-a-variant
+                    (str/ffmt "Main instance shape % should be a variant" (:id main-instance))
+                    main-instance file component-page
+                    :variant-id (:variant-id component)))))
 
 (defn- check-main-inside-main
   [component file]
diff --git a/common/src/app/common/flags.cljc b/common/src/app/common/flags.cljc
index 62ce48aa9a..bfccc0afdf 100644
--- a/common/src/app/common/flags.cljc
+++ b/common/src/app/common/flags.cljc
@@ -164,13 +164,25 @@
     ;; redis for caching data
     :redis-cache
 
-    ;; Activates the nitrate module
-    :nitrate
+    ;; Activates the admin-console module
+    :admin-console
+
+    ;; disabled by default. When enabled, allows the admin-console
+    ;; `bulk-create-profiles` method to create batches of already
+    ;; active profiles. Only intended for test environments.
+    :admin-console-bulk-create-profiles
 
     :mcp
     :background-blur
     :available-viewer-wasm
-    :stroke-path})
+    :stroke-path
+    :stroke-per-side
+
+    ;; Exporter only: uses render-wasm for export instead of browser
+    ;; renderer.
+    :wasm-export
+    :custom-shortcuts
+    :remote-media-processing})
 
 (def all-flags
   (set/union email login varia))
@@ -204,6 +216,7 @@
    :enable-render-wasm-info
    :enable-available-viewer-wasm
    :enable-background-blur
+   :enable-stroke-path
    :enable-token-combobox])
 
 (defn parse
diff --git a/frontend/src/app/main/fonts.clj b/common/src/app/common/fonts.clj
similarity index 98%
rename from frontend/src/app/main/fonts.clj
rename to common/src/app/common/fonts.clj
index c8abbd0478..9b0be1660f 100644
--- a/frontend/src/app/main/fonts.clj
+++ b/common/src/app/common/fonts.clj
@@ -4,8 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.main.fonts
+(ns app.common.fonts
   "A fonts loading macros."
+
   (:require
    [app.common.uuid :as uuid]
    [clojure.data.json :as json]
@@ -47,6 +48,3 @@
   (let [data (slurp (io/resource path))
         data (json/read-str data)]
     `~(mapv parse-gfont (get data "items"))))
-
-
-
diff --git a/frontend/src/app/render_wasm/fallback_fonts.cljs b/common/src/app/common/fonts.cljs
similarity index 61%
rename from frontend/src/app/render_wasm/fallback_fonts.cljs
rename to common/src/app/common/fonts.cljs
index 80f52be51c..5366d6c2c4 100644
--- a/frontend/src/app/render_wasm/fallback_fonts.cljs
+++ b/common/src/app/common/fonts.cljs
@@ -4,13 +4,159 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.fallback-fonts
-  "Host-agnostic fallback-font knowledge: which scripts/emoji a text uses and
-  which (google) fallback fonts cover them. Pure data + pure fns — no browser
-  or Node dependencies — so the workspace (`api.texts`/`api.fonts`) and the
-  headless exporter (`app.renderer.wasm`) compute the SAME fallback set from
-  the same source. Anything a host must fetch/upload for text to render
-  belongs here, not in host code.")
+(ns app.common.fonts
+  "Host-agnostic font knowledge shared by every renderer: the google catalog
+  baked at compile time from `common/resources/fonts/gfonts.*.json`, the
+  font-id/uuid mapping, weight/style variant resolution, and the noto fallback
+  fonts a text's scripts and emoji need. Also the one family bundled with the
+  frontend, which is not a google font but resolves by the same rules.
+
+  Pure data + pure fns — no browser or Node dependencies — so the workspace and
+  the headless exporter resolve the SAME fonts from the same source. Anything a
+  host must fetch or upload for text to render belongs here, not in host code."
+  (:require-macros [app.common.fonts :refer [preload-gfonts]])
+  (:require
+   [app.common.data :as d]
+   [app.common.uuid :as uuid]
+   [cuerdas.core :as str]))
+
+;; --- GOOGLE FONTS CATALOG
+
+(def catalog
+  (preload-gfonts "fonts/gfonts.2025.11.28.json"))
+
+(def ^:private by-id
+  (reduce (fn [m font] (assoc m (:id font) font)) {} catalog))
+
+(def ^:private by-uuid
+  (reduce (fn [m font] (assoc m (:uuid font) font)) {} catalog))
+
+(defn gfont-id->uuid
+  "Maps a `gfont-<slug>` id to its (compilation-stable) catalog uuid, or nil."
+  [gfont-id]
+  (:uuid (get by-id gfont-id)))
+
+;; --- font-id -> wasm uuid
+
+(def ^:private custom-prefix "custom-")
+(def ^:private gfont-prefix "gfont-")
+
+(defn font-id->backend
+  "Which source a content font-id comes from: `:google` for `gfont-<slug>`,
+  `:custom` for `custom-<uuid>`, `:builtin` for everything else (bundled
+  families, but also unknown or malformed ids — the same bucket
+  `font-id->uuid` maps to `uuid/zero`)."
+  [font-id]
+  (cond
+    (not (string? font-id))                  :builtin
+    (str/starts-with? font-id gfont-prefix)  :google
+    (str/starts-with? font-id custom-prefix) :custom
+    :else                                    :builtin))
+
+(defn font-id->uuid
+  "Maps a content font-id to the uuid WASM keys fonts by:
+
+   - `gfont-<slug>`   -> the catalog uuid,
+   - `custom-<uuid>`  -> that uuid,
+   - anything else (builtin, unknown, malformed) -> `uuid/zero`, which WASM
+     resolves to the default font."
+
+  [font-id]
+  (case (font-id->backend font-id)
+    :google (or (gfont-id->uuid font-id) uuid/zero)
+    :custom (or (uuid/parse* (subs font-id (count custom-prefix))) uuid/zero)
+    uuid/zero))
+
+;; --- proxy urls
+
+(def ^:private gstatic-prefix
+  "https://fonts.gstatic.com/s")
+
+(defn gstatic->proxy-url
+  [s base]
+  (let [base (str/rtrim (str base) "/")]
+    (str/replace (str s) gstatic-prefix base)))
+
+;; --- variant resolution
+
+(defn closest-variant
+  [variants target-weight target-style]
+  (when-let [target-weight (d/parse-integer target-weight)]
+    (let [result
+          (reduce
+           (fn [closest-match variant]
+             (let [weight (d/parse-integer (:weight variant))
+                   distance (abs (- target-weight weight))
+                   matches-style? (= target-style (:style variant))
+                   current {:variant variant
+                            :weight weight
+                            :distance distance}]
+               (cond
+                 ;; Exact match found
+                 (and (zero? distance)
+                      (if target-style matches-style? true))
+                 (reduced current)
+
+                 (nil? closest-match) current
+
+                 ;; Update best match if this variant is closer or equal distance but higher weight
+                 (or (< distance (:distance closest-match))
+                     (and (= distance (:distance closest-match))
+                          (> weight (:weight closest-match))))
+                 current
+
+                 ;; Same weight as the `closest-match` but the style matches `target-style`
+                 (and (= weight (:weight closest-match)) matches-style?)
+                 current
+
+                 :else
+                 closest-match)))
+           nil
+           variants)]
+      (:variant result))))
+
+(defn resolve-ttf-url
+  [font-uuid weight style]
+  (when-let [font (get by-uuid font-uuid)]
+    (let [style    (if (zero? style) "normal" "italic")
+          variants (:variants font)]
+      (:ttf-url (or (closest-variant variants weight style)
+                    (first variants))))))
+
+;; --- BUILTIN FONTS
+;;
+;; Bundled with the frontend, served from `<public-uri>/fonts/`. Shared so the
+;; workspace and the exporter upload the same TTF for a given weight/style.
+
+(def local-fonts
+  [{:id "sourcesanspro"
+    :name "Source Sans Pro"
+    :family "sourcesanspro"
+    :variants
+    [{:id "200" :name "200" :weight "200" :style "normal" :suffix "extralight" :ttf-url "sourcesanspro-extralight.ttf"}
+     {:id "200italic" :name "200 Italic" :weight "200" :style "italic" :suffix "extralightitalic" :ttf-url "sourcesanspro-extralightitalic.ttf"}
+     {:id "300" :name "300" :weight "300" :style "normal" :suffix "light" :ttf-url "sourcesanspro-light.ttf"}
+     {:id "300italic" :name "300 Italic"  :weight "300" :style "italic" :suffix "lightitalic" :ttf-url "sourcesanspro-lightitalic.ttf"}
+     {:id "regular" :name "400" :weight "400" :style "normal" :ttf-url "sourcesanspro-regular.ttf"}
+     {:id "italic" :name "400 Italic" :weight "400" :style "italic" :ttf-url "sourcesanspro-italic.ttf"}
+     {:id "600" :name "600" :weight "600" :style "normal" :suffix "semibold" :ttf-url "sourcesanspro-semibold.ttf"}
+     {:id "600italic" :name "600 Italic" :weight "600" :style "italic" :suffix "semibolditalic" :ttf-url "sourcesanspro-semibolditalic.ttf"}
+     {:id "bold" :name "700" :weight "700" :style "normal" :ttf-url "sourcesanspro-bold.ttf"}
+     {:id "bolditalic" :name "700 Italic" :weight "700" :style "italic" :ttf-url "sourcesanspro-bolditalic.ttf"}
+     {:id "black" :name "900" :weight "900" :style "normal" :ttf-url "sourcesanspro-black.ttf"}
+     {:id "blackitalic" :name "900 Italic" :weight "900" :style "italic" :ttf-url "sourcesanspro-blackitalic.ttf"}]}])
+
+(defn resolve-ttf-file
+  "Builtin TTF file name for `weight` and `style` (0 normal, 1 italic), by the
+  same nearest-weight rule as the google catalog."
+  [weight style]
+  (let [variants (:variants (first local-fonts))]
+    (:ttf-url (or (closest-variant variants weight (if (zero? style) "normal" "italic"))
+                  (first variants)))))
+
+;; --- FALLBACK FONTS
+;;
+;; Which scripts/emoji a text uses and which (google) fallback fonts cover them.
 
 (def ^:private emoji-pattern
   #"(?:\uD83C[\uDDE6-\uDDFF]\uD83C[\uDDE6-\uDDFF])|(?:\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDEFF])|(?:\uD83E[\uDD00-\uDDFF])|(?:\uD83D[\uDE80-\uDEFF]|\uD83E[\uDC00-\uDCFF])|(?:\uD83E[\uDE70-\uDFFF])|[\u2600-\u26FF\u2700-\u27BF\u2300-\u23FF\u2B00-\u2BFF]")
diff --git a/common/src/app/common/fressian.clj b/common/src/app/common/fressian.clj
index b16d233b42..3de4cc54a7 100644
--- a/common/src/app/common/fressian.clj
+++ b/common/src/app/common/fressian.clj
@@ -31,6 +31,11 @@
   ([^String s, ^String encoding]
    (.getBytes s encoding)))
 
+;; --- DEPTH TRACKING
+
+(def ^:dynamic *read-depth* 0)
+(def ^:const max-read-depth 128)
+
 ;; --- LOW LEVEL FRESSIAN API
 
 (defn write-object!
@@ -41,7 +46,13 @@
 
 (defn read-object!
   [^Reader r]
-  (.readObject r))
+  (when (>= *read-depth* max-read-depth)
+    (throw (ex-info "maximum Fressian read depth exceeded"
+                    {:type :validation
+                     :code :max-read-depth-reached
+                     :hint "maximum Fressian read depth exceeded"})))
+  (binding [*read-depth* (inc *read-depth*)]
+    (.readObject r)))
 
 (defn write-tag!
   ([^Writer w ^String n]
diff --git a/common/src/app/common/geom/shapes/flex_layout/bounds.cljc b/common/src/app/common/geom/shapes/flex_layout/bounds.cljc
index e6aef398f0..b434d99fc9 100644
--- a/common/src/app/common/geom/shapes/flex_layout/bounds.cljc
+++ b/common/src/app/common/geom/shapes/flex_layout/bounds.cljc
@@ -121,74 +121,79 @@
 (defn layout-content-points
   [bounds parent children objects]
 
-  (let [parent-id     (dm/get-prop parent :id)
-        parent-bounds @(get bounds parent-id)
-        reverse?      (ctl/reverse? parent)
-        children      (cond->> children (not reverse?) reverse)]
+  (let [parent-id       (dm/get-prop parent :id)
+        parent-bounds   (get bounds parent-id)]
+    (when-let [parent-bounds (some-> parent-bounds deref)]
+      (let [reverse? (ctl/reverse? parent)
+            children (cond->> children (not reverse?) reverse)]
 
-    (loop [children  (seq children)
-           result    (transient [])
-           correct-v (gpt/point 0)]
+        (loop [children  (seq children)
+               result    (transient [])
+               correct-v (gpt/point 0)]
 
-      (if (not children)
-        (persistent! result)
+          (if (not children)
+            (persistent! result)
 
-        (let [child (first children)
-              child-id (dm/get-prop child :id)
-              child-bounds @(get bounds child-id)
-              [margin-top margin-right margin-bottom margin-left] (ctl/child-margins child)
+            (let [child (first children)
+                  child-id (dm/get-prop child :id)
+                  child-bounds-ref (get bounds child-id)
+                  child-bounds (some-> child-bounds-ref deref)
+                  [margin-top margin-right margin-bottom margin-left] (ctl/child-margins child)
 
-              [child-bounds correct-v]
-              (if (or (ctl/fill-width? child) (ctl/fill-height? child))
-                (child-layout-bound-points parent child parent-bounds child-bounds correct-v bounds objects)
-                [(->> child-bounds (map #(gpt/add % correct-v))) correct-v])
+                  [child-bounds correct-v]
+                  (if (and child-bounds
+                           (or (ctl/fill-width? child) (ctl/fill-height? child)))
+                    (child-layout-bound-points parent child parent-bounds child-bounds correct-v bounds objects)
+                    [(when child-bounds
+                       (->> child-bounds (map #(gpt/add % correct-v))))
+                     correct-v])
 
-              child-bounds
-              (when (d/not-empty? child-bounds)
-                (-> (gpo/parent-coords-bounds child-bounds parent-bounds)
-                    (gpo/pad-points (- margin-top) (- margin-right) (- margin-bottom) (- margin-left))))]
+                  child-bounds
+                  (when (d/not-empty? child-bounds)
+                    (-> (gpo/parent-coords-bounds child-bounds parent-bounds)
+                        (gpo/pad-points (- margin-top) (- margin-right) (- margin-bottom) (- margin-left))))]
 
-          (recur (next children)
-                 (cond-> result (some? child-bounds) (conj! child-bounds))
-                 correct-v))))))
+              (recur (next children)
+                     (cond-> result (some? child-bounds) (conj! child-bounds))
+                     correct-v))))))))
 
 (defn layout-content-bounds
   [bounds {:keys [layout-padding] :as parent} children objects]
 
-  (let [parent-id (:id parent)
-        parent-bounds @(get bounds parent-id)
+  (let [parent-id       (:id parent)
+        parent-bounds   (get bounds parent-id)]
+    (when-let [parent-bounds (some-> parent-bounds deref)]
+      (let [row?            (ctl/row? parent)
+            col?            (ctl/col? parent)
+            space-around?   (ctl/space-around? parent)
+            space-evenly?   (ctl/space-evenly? parent)
+            content-evenly? (ctl/content-evenly? parent)
+            [layout-gap-row layout-gap-col] (ctl/gaps parent)
 
-        row?            (ctl/row? parent)
-        col?            (ctl/col? parent)
-        space-around?   (ctl/space-around? parent)
-        space-evenly?   (ctl/space-evenly? parent)
-        content-evenly? (ctl/content-evenly? parent)
-        [layout-gap-row layout-gap-col] (ctl/gaps parent)
+            row-pad (if (or (and col? space-evenly?)
+                            (and col? space-around?)
+                            (and row? content-evenly?))
+                      layout-gap-row
+                      0)
 
-        row-pad (if (or (and col? space-evenly?)
-                        (and col? space-around?)
-                        (and row? content-evenly?))
-                  layout-gap-row
-                  0)
+            col-pad (if (or (and row? space-evenly?)
+                            (and row? space-around?)
+                            (and col? content-evenly?))
+                      layout-gap-col
+                      0)
 
-        col-pad (if (or (and row? space-evenly?)
-                        (and row? space-around?)
-                        (and col? content-evenly?))
-                  layout-gap-col
-                  0)
+            {pad-top :p1 pad-right :p2 pad-bottom :p3 pad-left :p4} layout-padding
+            pad-top    (+ (or pad-top 0) row-pad)
+            pad-right  (+ (or pad-right 0) col-pad)
+            pad-bottom (+ (or pad-bottom 0) row-pad)
+            pad-left   (+ (or pad-left 0) col-pad)
 
-        {pad-top :p1 pad-right :p2 pad-bottom :p3 pad-left :p4} layout-padding
-        pad-top    (+ (or pad-top 0) row-pad)
-        pad-right  (+ (or pad-right 0) col-pad)
-        pad-bottom (+ (or pad-bottom 0) row-pad)
-        pad-left   (+ (or pad-left 0) col-pad)
+            layout-points
+            (layout-content-points bounds parent children objects)]
 
-        layout-points
-        (layout-content-points bounds parent children objects)]
-
-    (if (d/not-empty? layout-points)
-      (-> layout-points
-          (gpo/merge-parent-coords-bounds parent-bounds)
-          (gpo/pad-points (- pad-top) (- pad-right) (- pad-bottom) (- pad-left)))
-      ;; Cannot create some bounds from the children so we return the parent's
-      parent-bounds)))
+        (if (d/not-empty? layout-points)
+          (-> layout-points
+              (gpo/merge-parent-coords-bounds parent-bounds)
+              (gpo/pad-points (- pad-top) (- pad-right) (- pad-bottom) (- pad-left)))
+          ;; Cannot create some bounds from the children so we return the parent's
+          parent-bounds)))))
diff --git a/common/src/app/common/geom/shapes/grid_layout/bounds.cljc b/common/src/app/common/geom/shapes/grid_layout/bounds.cljc
index 0628cf2060..caadff4766 100644
--- a/common/src/app/common/geom/shapes/grid_layout/bounds.cljc
+++ b/common/src/app/common/geom/shapes/grid_layout/bounds.cljc
@@ -12,36 +12,36 @@
 
 (defn layout-content-points
   [bounds parent {:keys [row-tracks column-tracks]}]
-  (let [parent-id (:id parent)
-        parent-bounds @(get bounds parent-id)
-
-        hv #(gpo/start-hv parent-bounds %)
-        vv #(gpo/start-vv parent-bounds %)]
-    (d/concat-vec
-     (->> row-tracks
-          (mapcat #(vector (:start-p %)
-                           (gpt/add (:start-p %) (vv (:size %))))))
-     (->> column-tracks
-          (mapcat #(vector (:start-p %)
-                           (gpt/add (:start-p %) (hv (:size %)))))))))
+  (let [parent-id     (:id parent)
+        parent-bounds (get bounds parent-id)]
+    (when-let [parent-bounds (some-> parent-bounds deref)]
+      (let [hv #(gpo/start-hv parent-bounds %)
+            vv #(gpo/start-vv parent-bounds %)]
+        (d/concat-vec
+         (->> row-tracks
+              (mapcat #(vector (:start-p %)
+                               (gpt/add (:start-p %) (vv (:size %))))))
+         (->> column-tracks
+              (mapcat #(vector (:start-p %)
+                               (gpt/add (:start-p %) (hv (:size %)))))))))))
 
 (defn layout-content-bounds
   [bounds {:keys [layout-padding] :as parent} layout-data]
 
-  (let [parent-id (:id parent)
-        parent-bounds @(get bounds parent-id)
+  (let [parent-id     (:id parent)
+        parent-bounds (get bounds parent-id)]
+    (when-let [parent-bounds (some-> parent-bounds deref)]
+      (let [{pad-top :p1 pad-right :p2 pad-bottom :p3 pad-left :p4} layout-padding
+            pad-top    (or pad-top 0)
+            pad-right  (or pad-right 0)
+            pad-bottom (or pad-bottom 0)
+            pad-left   (or pad-left 0)
 
-        {pad-top :p1 pad-right :p2 pad-bottom :p3 pad-left :p4} layout-padding
-        pad-top    (or pad-top 0)
-        pad-right  (or pad-right 0)
-        pad-bottom (or pad-bottom 0)
-        pad-left   (or pad-left 0)
+            layout-points (layout-content-points bounds parent layout-data)]
 
-        layout-points (layout-content-points bounds parent layout-data)]
-
-    (if (d/not-empty? layout-points)
-      (-> layout-points
-          (gpo/merge-parent-coords-bounds parent-bounds)
-          (gpo/pad-points (- pad-top) (- pad-right) (- pad-bottom) (- pad-left)))
-      ;; Cannot create some bounds from the children so we return the parent's
-      parent-bounds)))
+        (if (d/not-empty? layout-points)
+          (-> layout-points
+              (gpo/merge-parent-coords-bounds parent-bounds)
+              (gpo/pad-points (- pad-top) (- pad-right) (- pad-bottom) (- pad-left)))
+          ;; Cannot create some bounds from the children so we return the parent's
+          parent-bounds)))))
diff --git a/common/src/app/common/geom/shapes/min_size_layout.cljc b/common/src/app/common/geom/shapes/min_size_layout.cljc
index 89f17871e3..57375098e9 100644
--- a/common/src/app/common/geom/shapes/min_size_layout.cljc
+++ b/common/src/app/common/geom/shapes/min_size_layout.cljc
@@ -31,13 +31,17 @@
 
      (and (ctl/fill-width? child)
           (ctl/grid-layout? child))
-     (let [children
-           (->> (cfh/get-immediate-children objects (:id child))
-                (remove ctl/position-absolute?)
-                (map #(vector @(get bounds (:id %)) %)))
-           layout-data (gd/calc-layout-data child @(get bounds (:id child)) children bounds objects true)]
-       (max (ctl/child-min-width child)
-            (gpo/width-points (gb/layout-content-bounds bounds child layout-data))))
+     (let [child-bounds-ref (get bounds (:id child))]
+       (if child-bounds-ref
+         (let [children
+               (->> (cfh/get-immediate-children objects (:id child))
+                    (remove ctl/position-absolute?)
+                    (keep #(when-let [b (get bounds (:id %))]
+                             [@b %])))
+               layout-data (gd/calc-layout-data child @child-bounds-ref children bounds objects true)]
+           (max (ctl/child-min-width child)
+                (gpo/width-points (gb/layout-content-bounds bounds child layout-data))))
+         (ctl/child-min-width child)))
 
      (ctl/fill-width? child)
      (ctl/child-min-width child)
@@ -63,11 +67,15 @@
      (let [children
            (->> (cfh/get-immediate-children objects (dm/get-prop child :id))
                 (remove ctl/position-absolute?)
-                (map  (fn [child] [@(get bounds (:id  child)) child])))
+                (keep (fn [c]
+                        (when-let [b (get bounds (:id c))]
+                          [@b c]))))
            layout-data (gd/calc-layout-data child (:points child) children bounds objects true)
            auto-bounds (gb/layout-content-bounds bounds child layout-data)]
-       (max (ctl/child-min-height child)
-            (gpo/height-points auto-bounds)))
+       (if auto-bounds
+         (max (ctl/child-min-height child)
+              (gpo/height-points auto-bounds))
+         (ctl/child-min-height child)))
 
      (ctl/fill-height? child)
      (ctl/child-min-height child)
diff --git a/common/src/app/common/logging.cljc b/common/src/app/common/logging.cljc
index 0c96e7c22e..ffed8cc09f 100644
--- a/common/src/app/common/logging.cljc
+++ b/common/src/app/common/logging.cljc
@@ -253,7 +253,7 @@
                      (swap! log-record (constantly lrecord))))]
     (if sync?
       (logfn)
-      (px/exec! *default-executor* logfn))))
+      (px/exec *default-executor* logfn))))
 
 (defmacro log!
   "Emit a new log record to the global log-record state (asynchronously). "
diff --git a/common/src/app/common/logic/shapes.cljc b/common/src/app/common/logic/shapes.cljc
index 8f7aad2b49..831fce4076 100644
--- a/common/src/app/common/logic/shapes.cljc
+++ b/common/src/app/common/logic/shapes.cljc
@@ -113,6 +113,116 @@
     (-> changes
         (pcb/update-shapes ids update-fn {:attrs #{:blocked :hidden}}))))
 
+;; Deleting shapes inside a surviving component main transitively removes their
+;; copies across all pages. Whole-main and component-swap deletions are excluded.
+
+(defn- mutilates-main?
+  "Whether deleting `id` takes a shape out of a component main that survives.
+  `deleted-ids` are all the ids the deletion removes from the page."
+  [objects deleted-ids id]
+  (->> (cfh/get-parent-ids objects id)
+       (some (fn [parent-id]
+               (let [parent (get objects parent-id)]
+                 (and (:main-instance parent)
+                      (not (contains? deleted-ids parent-id))))))))
+
+(defn- build-shape-ref-index
+  "Index every referencing shape by shape-ref and page."
+  [pages-index page-objects]
+  (reduce (fn [index page-id]
+            (reduce (fn [index shape]
+                      (if-let [shape-ref (:shape-ref shape)]
+                        (update index shape-ref (fnil conj []) [page-id (:id shape)])
+                        index))
+                    index
+                    (vals (page-objects page-id))))
+          {}
+          (keys pages-index)))
+
+(defn- collect-copy-deletions
+  "Collect dangling copy roots and their subtree ids by page.
+  `scheduled` prevents duplicate deletions during transitive traversal."
+  [ref-index descendants-of dangling scheduled]
+  (loop [dangling  dangling
+         scheduled scheduled
+         result    {}]
+    (if (empty? dangling)
+      result
+      (let [hits
+            (into #{}
+                  (comp (mapcat ref-index)
+                        (remove (fn [[_ id]] (contains? scheduled id))))
+                  dangling)
+
+            ;; Ancestor subtrees already contain nested hits.
+            nested
+            (into #{}
+                  (mapcat (fn [[page-id id]] (descendants-of page-id id)))
+                  hits)
+
+            subtrees
+            (into []
+                  (comp (remove (fn [[_ id]] (contains? nested id)))
+                        (map (fn [[page-id id]]
+                               [page-id id (-> (descendants-of page-id id)
+                                               (set)
+                                               (conj id))])))
+                  hits)
+
+            deleted
+            (into #{} (mapcat #(nth % 2)) subtrees)]
+        (recur deleted
+               (into scheduled deleted)
+               (reduce (fn [result [page-id root-id ids]]
+                         (-> result
+                             (update-in [page-id :roots]
+                                        (fnil conj (d/ordered-set))
+                                        root-id)
+                             (update-in [page-id :ids] (fnil into #{}) ids)))
+                       result
+                       subtrees))))))
+
+(defn- propagated-copy-deletions
+  "Collect propagated copy deletions unless component sync owns the operation."
+  [objects pages-index page-objects deleted-ids allow-altering-copies]
+  (if (or allow-altering-copies (nil? pages-index))
+    {}
+    (let [dangling (into #{}
+                         (filter #(mutilates-main? objects deleted-ids %))
+                         deleted-ids)]
+      (if (empty? dangling)
+        {}
+        (collect-copy-deletions (build-shape-ref-index pages-index page-objects)
+                                ;; Cache subtrees shared by multiple references.
+                                (memoize (fn [page-id id]
+                                           (cfh/get-children-ids (page-objects page-id) id)))
+                                dangling
+                                deleted-ids)))))
+
+(declare generate-delete-shapes)
+
+(defn- generate-copy-deletions
+  "Delete propagated copy roots through each page's normal deletion workflow."
+  [changes data page pages-index copy-deletions]
+  (reduce-kv (fn [changes pid {:keys [roots]}]
+               (let [options     {:ignore-touched true
+                                  :allow-altering-copies true}
+                     target-page (if (= pid (:id page))
+                                   page
+                                   (get pages-index pid))]
+                 (if (= pid (:id page))
+                   (second (generate-delete-shapes changes roots options))
+                   (let [[_ target-changes]
+                         (generate-delete-shapes (pcb/empty-changes nil pid)
+                                                 data
+                                                 target-page
+                                                 (:objects target-page)
+                                                 roots
+                                                 options)]
+                     (pcb/concat-changes-without-local changes target-changes)))))
+             changes
+             copy-deletions))
+
 (defn generate-delete-shapes
   ([changes file page objects ids options]
    (generate-delete-shapes (-> changes
@@ -185,17 +295,19 @@
                    ids-to-delete)
            [])
 
-         interacting-shapes
-         (filter (fn [shape]
-                   ;; If any of the deleted shapes is the destination of
-                   ;; some interaction, this must be deleted, too.
-                   (let [interactions (:interactions shape)]
-                     (some #(and (ctsi/has-destination %)
-                                 (contains? ids-to-delete (:destination %)))
-                           interactions)))
-                 (vals objects))
-
          id-to-delete? (set ids-to-delete)
+
+         interacting-shapes
+         (into []
+               (filter (fn [shape]
+                         ;; If any of the deleted shapes is the destination of
+                         ;; some interaction, this must be deleted, too.
+                         (let [interactions (:interactions shape)]
+                           (some #(and (ctsi/has-destination %)
+                                       (id-to-delete? (:destination %)))
+                                 interactions))))
+               (vals objects))
+
          changes
          (->> (:flows page)
               (reduce
@@ -261,19 +373,43 @@
                  []
                  (into ids-to-delete descendants-to-delete))
 
+         ;; Empty main parents also leave their copies dangling.
+         all-deleted-ids
+         (-> (set ids-to-delete)
+             (into descendants-to-delete)
+             (into empty-parents))
 
-         ids-set (set ids-to-delete)
+         pages-index
+         (when data
+           (or (:pages-index data)
+               (dm/get-in data [:data :pages-index])))
+
+         page-objects
+         (fn [id]
+           (if (= id (:id page))
+             objects
+             (dm/get-in pages-index [id :objects])))
+
+         copy-deletions
+         (propagated-copy-deletions objects pages-index page-objects
+                                    all-deleted-ids allow-altering-copies)
+
+         ;; Propagated copy deletions supersede hiding the same shapes.
+         ids-to-hide
+         (if-let [deleted (seq (get-in copy-deletions [(:id page) :ids]))]
+           (into [] (remove (set deleted)) ids-to-hide)
+           ids-to-hide)
 
          guides-to-delete
          (->> (:guides page)
               (vals)
-              (filter #(contains? ids-set (:frame-id %)))
+              (filter #(id-to-delete? (:frame-id %)))
               (map :id))
 
          changes (reduce (fn [changes guide-id]
                            (-> changes
                                (pcb/with-page page)
-                               (pcb/set-flow guide-id nil)))
+                               (pcb/set-guide guide-id nil)))
                          changes
                          guides-to-delete)
 
@@ -289,6 +425,7 @@
                      (pcb/remove-objects descendants-to-delete {:ignore-touched true})
                      (pcb/remove-objects ids-to-delete {:ignore-touched ignore-touched})
                      (pcb/remove-objects empty-parents)
+                     (generate-copy-deletions data page pages-index copy-deletions)
                      (pcb/resize-parents all-parents)
                      (pcb/update-shapes groups-to-unmask
                                         (fn [shape]
@@ -299,7 +436,7 @@
                                                          (fn [interactions]
                                                            (into []
                                                                  (remove #(and (ctsi/has-destination %)
-                                                                               (contains? ids-to-delete (:destination %))))
+                                                                               (id-to-delete? (:destination %))))
                                                                  interactions))))))]
      [all-parents changes])))
 
diff --git a/common/src/app/common/math.cljc b/common/src/app/common/math.cljc
index 043559e257..839079efee 100644
--- a/common/src/app/common/math.cljc
+++ b/common/src/app/common/math.cljc
@@ -34,12 +34,14 @@
   #?(:cljs (js/isNaN v)
      :clj (Double/isNaN v)))
 
-;; NOTE: on cljs we don't need to check for `number?` so we explicitly
-;; ommit it for performance reasons.
+;; NOTE: we need `number?` guard on cljs because `js/isFinite` coerces
+;; strings to numbers, accepting "16" as finite when it shouldn't.
+;; This caused a bug where string values from format-number were
+;; propagated through the system until Malli rejected them (issue #10638).
 
 (defn finite?
   [v]
-  #?(:cljs (and (not (nil? v)) (js/isFinite v))
+  #?(:cljs (and (not (nil? v)) (number? v) (js/isFinite v))
      :clj (and (not (nil? v)) (number? v) (Double/isFinite v))))
 
 (defn finite
diff --git a/common/src/app/common/render_wasm/README.md b/common/src/app/common/render_wasm/README.md
new file mode 100644
index 0000000000..b153832e52
--- /dev/null
+++ b/common/src/app/common/render_wasm/README.md
@@ -0,0 +1,24 @@
+# `app.common.render-wasm.*`
+
+The host-agnostic ClojureScript side of the render-wasm binary protocol: byte
+layouts, memory helpers and serializers that turn Penpot shapes into the buffers
+`render-wasm` consumes.
+
+The workspace drives it from `app.render-wasm.*`, the headless exporter from
+`app.wasm.*` — same code underneath, so the two cannot drift.
+
+Font knowledge is *not* here even though both hosts need it for rendering: it is
+not specific to the wasm backend, so the google fonts catalog (baked from
+`common/resources/fonts/gfonts.*.json`), the bundled builtin family and the
+emoji/script fallback tables live in `app.common.fonts`. Likewise the image-id
+enumeration lives in `app.common.types.shape.images`.
+
+`shared.js` is not here: it is a per-build artifact, so each host compiles
+against the copy from its own render-wasm build and passes it to
+`wasm/init-serializers!` (see `app.render-wasm.api.enums`, `app.wasm.enums`).
+
+## Rules for anything added here
+
+**Nothing here may depend on a browser (no DOM, no WebGL, no app state) or on
+`frontend/src`.** Dependencies are `app.common.*` and this subtree only. It also
+has to run under plain Node — a `js/document` here breaks the exporter.
diff --git a/frontend/src/app/render_wasm/api/props.cljs b/common/src/app/common/render_wasm/api/props.cljs
similarity index 89%
rename from frontend/src/app/render_wasm/api/props.cljs
rename to common/src/app/common/render_wasm/api/props.cljs
index add4496c66..6caaac7de8 100644
--- a/frontend/src/app/render_wasm/api/props.cljs
+++ b/common/src/app/common/render_wasm/api/props.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.api.props
+(ns app.common.render-wasm.api.props
   "Browser-free WASM shape property setters, shared by the workspace render
   orchestrator (`app.render-wasm.api`) and the headless exporter
   (`app.wasm.serialize`).
@@ -15,15 +15,15 @@
   data sources (fonts, image bytes, SVG static markup) stay in `app.render-wasm.api`."
   (:require
    [app.common.math :as mth]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.mem.heap32 :as mem.h32]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.serializers.color :as sr-clr]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.fills :as types.fills]
    [app.common.types.fills.impl :as types.fills.impl]
-   [app.common.types.path :as path]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.mem.heap32 :as mem.h32]
-   [app.render-wasm.serializers :as sr]
-   [app.render-wasm.serializers.color :as sr-clr]
-   [app.render-wasm.wasm :as wasm]))
+   [app.common.types.path :as path]))
 
 (def ^:const MAX_BUFFER_CHUNK_SIZE (* 256 1024))
 
@@ -98,6 +98,18 @@
                  :inner (h/call wasm/internal-module "_add_shape_inner_stroke" width style cap-start cap-end dash gap)
                  :outer (h/call wasm/internal-module "_add_shape_outer_stroke" width style cap-start cap-end dash gap)
                  (h/call wasm/internal-module "_add_shape_center_stroke" width style cap-start cap-end dash gap))
+
+               ;; Per-side widths (rects/frames). Sides falling back to the
+               ;; uniform width; skipped when all sides end up equal, so the
+               ;; renderer keeps the uniform path (with dash/dot support).
+               (when (:stroke-per-side stroke)
+                 (let [top    (or (:stroke-width-top stroke) width)
+                       right  (or (:stroke-width-right stroke) width)
+                       bottom (or (:stroke-width-bottom stroke) width)
+                       left   (or (:stroke-width-left stroke) width)]
+                   (when-not (= top right bottom left)
+                     (h/call wasm/internal-module "_set_shape_stroke_sides" top right bottom left))))
+
                (cond
                  (some? gradient)
                  (do (types.fills.impl/write-gradient-fill offset dview opacity gradient)
diff --git a/frontend/src/app/render_wasm/api/shapes.cljs b/common/src/app/common/render_wasm/api/shapes.cljs
similarity index 92%
rename from frontend/src/app/render_wasm/api/shapes.cljs
rename to common/src/app/common/render_wasm/api/shapes.cljs
index aa5e4fe9c6..55f442d0d0 100644
--- a/frontend/src/app/render_wasm/api/shapes.cljs
+++ b/common/src/app/common/render_wasm/api/shapes.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.api.shapes
+(ns app.common.render-wasm.api.shapes
   "Batched shape property serialization for improved WASM performance.
 
    This module provides a single WASM call to set all base shape properties,
@@ -13,11 +13,11 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
-   [app.common.uuid :as uuid]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.serializers :as sr]
-   [app.render-wasm.wasm :as wasm]))
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.wasm :as wasm]
+   [app.common.uuid :as uuid]))
 
 ;; Binary layout constants matching Rust implementation:
 ;;
@@ -94,7 +94,7 @@
 
    Returns nil."
   [shape]
-  (when wasm/context-initialized?
+  (when (wasm/live?)
     (let [id           (dm/get-prop shape :id)
           parent-id    (get shape :parent-id)
           shape-type   (dm/get-prop shape :type)
@@ -110,13 +110,9 @@
 
           blend-mode   (sr/translate-blend-mode (get shape :blend-mode))
           constraint-h (let [c (get shape :constraints-h)]
-                         (if (some? c)
-                           (sr/translate-constraint-h c)
-                           CONSTRAINT-NONE))
+                         (sr/translate-constraint-h c))
           constraint-v (let [c (get shape :constraints-v)]
-                         (if (some? c)
-                           (sr/translate-constraint-v c)
-                           CONSTRAINT-NONE))
+                         (sr/translate-constraint-v c))
 
           opacity      (d/nilv (get shape :opacity) 1.0)
           rotation     (d/nilv (get shape :rotation) 0.0)
diff --git a/common/src/app/common/render_wasm/enums.clj b/common/src/app/common/render_wasm/enums.clj
new file mode 100644
index 0000000000..3bc382ec8d
--- /dev/null
+++ b/common/src/app/common/render_wasm/enums.clj
@@ -0,0 +1,54 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.common.render-wasm.enums
+  "Serializer enum table from `shared.js`")
+
+(def ^:private serializer-exports
+  [["raster-format" "RasterFormat"]
+   ["blur-type" "RawBlurType"]
+   ["blend-mode" "RawBlendMode"]
+   ["bool-type" "RawBoolType"]
+   ["font-style" "RawFontStyle"]
+   ["flex-direction" "RawFlexDirection"]
+   ["grid-direction" "RawGridDirection"]
+   ["grow-type" "RawGrowType"]
+   ["align-items" "RawAlignItems"]
+   ["align-self" "RawAlignSelf"]
+   ["align-content" "RawAlignContent"]
+   ["justify-items" "RawJustifyItems"]
+   ["justify-content" "RawJustifyContent"]
+   ["justify-self" "RawJustifySelf"]
+   ["wrap-type" "RawWrapType"]
+   ["grid-track-type" "RawGridTrackType"]
+   ["shadow-style" "RawShadowStyle"]
+   ["guide-kind" "RawGuideKind"]
+   ["stroke-style" "RawStrokeStyle"]
+   ["stroke-cap" "RawStrokeCap"]
+   ["shape-type" "RawShapeType"]
+   ["constraint-h" "RawConstraintH"]
+   ["constraint-v" "RawConstraintV"]
+   ["sizing" "RawSizing"]
+   ["vertical-align" "RawVerticalAlign"]
+   ["fill-data" "RawFillData"]
+   ["text-align" "RawTextAlign"]
+   ["text-direction" "RawTextDirection"]
+   ["text-decoration" "RawTextDecoration"]
+   ["text-transform" "RawTextTransform"]
+   ["multiple-state" "MultipleState"]
+   ["transform-entry-kind" "RawTransformEntryKind"]
+   ["segment-data" "RawSegmentData"]
+   ["stroke-linecap" "RawStrokeLineCap"]
+   ["stroke-linejoin" "RawStrokeLineJoin"]
+   ["fill-rule" "RawFillRule"]])
+
+(defmacro serializers
+  [alias]
+  (let [alias (name alias)]
+    `(cljs.core/js-obj
+      ~@(mapcat (fn [[key export]]
+                  [key (symbol alias export)])
+                serializer-exports))))
diff --git a/frontend/src/app/render_wasm/helpers.cljc b/common/src/app/common/render_wasm/helpers.cljc
similarity index 94%
rename from frontend/src/app/render_wasm/helpers.cljc
rename to common/src/app/common/render_wasm/helpers.cljc
index 452e3f1eb4..236a952248 100644
--- a/frontend/src/app/render_wasm/helpers.cljc
+++ b/common/src/app/common/render_wasm/helpers.cljc
@@ -4,8 +4,8 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.helpers
-  #?(:cljs (:require-macros [app.render-wasm.helpers]))
+(ns app.common.render-wasm.helpers
+  #?(:cljs (:require-macros [app.common.render-wasm.helpers]))
   (:require [app.common.data :as d]))
 
 (def error-code
diff --git a/frontend/src/app/render_wasm/mem.cljs b/common/src/app/common/render_wasm/mem.cljs
similarity index 97%
rename from frontend/src/app/render_wasm/mem.cljs
rename to common/src/app/common/render_wasm/mem.cljs
index d90d2f7fa7..3a64315ba0 100644
--- a/frontend/src/app/render_wasm/mem.cljs
+++ b/common/src/app/common/render_wasm/mem.cljs
@@ -4,11 +4,11 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.mem
+(ns app.common.render-wasm.mem
   (:require
    [app.common.buffer :as buf]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.wasm :as wasm]))
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.wasm :as wasm]))
 
 (defn ->offset-32
   "Convert a 8-bit (1 byte) offset to a 32-bit (4 bytes) offset"
diff --git a/frontend/src/app/render_wasm/mem/heap32.cljs b/common/src/app/common/render_wasm/mem/heap32.cljs
similarity index 97%
rename from frontend/src/app/render_wasm/mem/heap32.cljs
rename to common/src/app/common/render_wasm/mem/heap32.cljs
index 07ac6b749f..bfe7c49053 100644
--- a/frontend/src/app/render_wasm/mem/heap32.cljs
+++ b/common/src/app/common/render_wasm/mem/heap32.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.mem.heap32
+(ns app.common.render-wasm.mem.heap32
   "A memory write helpers that uses 32 bits addressed offsets."
   (:require
    [app.common.data.macros :as dm]
diff --git a/frontend/src/app/render_wasm/serialize_shape.cljs b/common/src/app/common/render_wasm/serialize_shape.cljs
similarity index 93%
rename from frontend/src/app/render_wasm/serialize_shape.cljs
rename to common/src/app/common/render_wasm/serialize_shape.cljs
index ffc659757e..a0e776a62f 100644
--- a/frontend/src/app/render_wasm/serialize_shape.cljs
+++ b/common/src/app/common/render_wasm/serialize_shape.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.serialize-shape
+(ns app.common.render-wasm.serialize-shape
   "Single source of truth for the host-independent part of serializing a whole
   shape into the WASM design state.
 
@@ -24,8 +24,8 @@
   The incremental workspace edit path (`set-wasm-attr!`) is unaffected; it keeps
   dispatching per changed key through the same underlying `props` setters."
   (:require
-   [app.render-wasm.api.props :as props]
-   [app.render-wasm.api.shapes :as shapes]))
+   [app.common.render-wasm.api.props :as props]
+   [app.common.render-wasm.api.shapes :as shapes]))
 
 (defn serialize-shape!
   "Applies every host-independent WASM property of `shape`. `set-shape-base-props`
diff --git a/frontend/src/app/render_wasm/serializers.cljs b/common/src/app/common/render_wasm/serializers.cljs
similarity index 87%
rename from frontend/src/app/render_wasm/serializers.cljs
rename to common/src/app/common/render_wasm/serializers.cljs
index 3cc62c3c0c..862eafae7c 100644
--- a/frontend/src/app/render_wasm/serializers.cljs
+++ b/common/src/app/common/render_wasm/serializers.cljs
@@ -4,16 +4,16 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
- (ns app.render-wasm.serializers
+ (ns app.common.render-wasm.serializers
    (:require
     [app.common.data :as d]
     [app.common.data.macros :as dm]
     [app.common.files.helpers :as cfh]
+    [app.common.render-wasm.serializers.color :as sr-clr]
+    [app.common.render-wasm.wasm :as wasm]
     [app.common.types.color :as clr]
     [app.common.types.shape-tree :as ctst]
     [app.common.uuid :as uuid]
-    [app.render-wasm.serializers.color :as sr-clr]
-    [app.render-wasm.wasm :as wasm]
     [cuerdas.core :as str]))
 
 (defn u8
@@ -116,13 +116,13 @@
 (defn translate-constraint-h
   [type]
   (let [values (unchecked-get wasm/serializers "constraint-h")
-        default 5] ;; TODO: fix code in rust so we have a proper None variant
+        default (unchecked-get values "none")]
     (d/nilv (unchecked-get values (d/name type)) default)))
 
 (defn translate-constraint-v
   [type]
   (let [values (unchecked-get wasm/serializers "constraint-v")
-        default 5] ;; TODO: fix code in rust so we have a proper None variant
+        default (unchecked-get values "none")]
     (d/nilv (unchecked-get values (d/name type)) default)))
 
 (defn translate-bool-type
@@ -138,6 +138,16 @@
         default (unchecked-get values "layer-blur")]
     (d/nilv (unchecked-get values (d/name blur-type)) default)))
 
+(defn translate-raster-format
+  "Export image format keyword (:png/:jpeg/:webp) -> `RasterFormat` code.
+  Unlike the other translators this one has NO default: falling back to png
+  would emit png bytes under a jpeg/webp mtype, which is exactly what the
+  explicit format threading exists to prevent."
+  [format]
+  (let [values (unchecked-get wasm/serializers "raster-format")]
+    (or (unchecked-get values (d/name format))
+        (throw (ex-info "unsupported raster format" {:format format})))))
+
 (defn translate-layout-flex-dir
   [flex-dir]
   (let [values (unchecked-get wasm/serializers "flex-direction")]
@@ -217,6 +227,22 @@
     :add-children    2
     :scale-content 3))
 
+(def ^:private reverse-enum
+  (memoize
+   (fn [id]
+     (let [values (unchecked-get wasm/serializers id)]
+       (reduce (fn [acc k] (assoc acc (unchecked-get values k) k))
+               {}
+               (js/Object.keys values))))))
+
+(defn- untranslate
+  "Reverse of `translate`: maps a wasm numeric discriminant back to its name.
+   Keywords (eg. `:multiple`) pass through untouched."
+  [id value default]
+  (if (keyword? value)
+    value
+    (d/nilv (get (reverse-enum id) value) default)))
+
 (defn translate-grow-type
   [grow-type]
   (let [values (unchecked-get wasm/serializers "grow-type")
@@ -229,12 +255,20 @@
         default (unchecked-get values "top")]
     (d/nilv (unchecked-get values (d/name vertical-align)) default)))
 
+(defn untranslate-vertical-align
+  [vertical-align]
+  (untranslate "vertical-align" vertical-align "top"))
+
 (defn translate-text-align
   [text-align]
   (let [values (unchecked-get wasm/serializers "text-align")
         default (unchecked-get values "left")]
     (d/nilv (unchecked-get values (d/name text-align)) default)))
 
+(defn untranslate-text-align
+  [text-align]
+  (untranslate "text-align" text-align "left"))
+
 
 ;; TODO: Find/Create a Rust enum for this
 (defn translate-text-transform
@@ -243,6 +277,10 @@
         default (unchecked-get values "none")]
     (d/nilv (unchecked-get values (d/name text-transform)) default)))
 
+(defn untranslate-text-transform
+  [text-transform]
+  (untranslate "text-transform" text-transform "none"))
+
 
 (defn translate-text-decoration
   [text-decoration]
@@ -250,12 +288,20 @@
         default (unchecked-get values "none")]
     (d/nilv (unchecked-get values (d/name text-decoration)) default)))
 
+(defn untranslate-text-decoration
+  [text-decoration]
+  (untranslate "text-decoration" text-decoration "none"))
+
 (defn translate-text-direction
   [text-direction]
   (let [values (unchecked-get wasm/serializers "text-direction")
         default (unchecked-get values "ltr")]
     (d/nilv (unchecked-get values (d/name text-direction)) default)))
 
+(defn untranslate-text-direction
+  [text-direction]
+  (untranslate "text-direction" text-direction "ltr"))
+
 
 (defn translate-font-style
   [font-style]
@@ -269,6 +315,10 @@
       "italic" (unchecked-get values "italic")
       default)))
 
+(defn untranslate-font-style
+  [font-style]
+  (untranslate "font-style" font-style "normal"))
+
 (defn translate-browser
   [browser]
   (case browser
diff --git a/frontend/src/app/render_wasm/serializers/color.cljs b/common/src/app/common/render_wasm/serializers/color.cljs
similarity index 90%
rename from frontend/src/app/render_wasm/serializers/color.cljs
rename to common/src/app/common/render_wasm/serializers/color.cljs
index 7d5d28b8c7..c3ef27fdfc 100644
--- a/frontend/src/app/render_wasm/serializers/color.cljs
+++ b/common/src/app/common/render_wasm/serializers/color.cljs
@@ -1,4 +1,4 @@
-(ns app.render-wasm.serializers.color
+(ns app.common.render-wasm.serializers.color
   (:require
    [app.common.math :as mth]))
 
diff --git a/frontend/src/app/render_wasm/text_content.cljs b/common/src/app/common/render_wasm/text_content.cljs
similarity index 90%
rename from frontend/src/app/render_wasm/text_content.cljs
rename to common/src/app/common/render_wasm/text_content.cljs
index 457a633066..51ce707fb4 100644
--- a/frontend/src/app/render_wasm/text_content.cljs
+++ b/common/src/app/common/render_wasm/text_content.cljs
@@ -4,23 +4,24 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.text-content
+(ns app.common.render-wasm.text-content
   "Single source of truth for writing a text shape's content into the WASM design
   state. The binary layout ([num-spans][paragraph attrs][span attrs][text]) is
-  identical for the workspace and the headless exporter — only *font resolution*
-  differs (the workspace uses the loaded fonts DB; the exporter uses its gfonts
-  catalog + custom variants). So the byte-writing lives here and font resolution
-  is injected via the `opts` map passed to `write-shape-text!`.
+  identical for the workspace and the headless exporter, and so is the font-id
+  -> uuid mapping (`cfnt/font-id->uuid`). Only *variant* resolution differs —
+  the workspace has a loaded fonts DB, the exporter does not — so that part is
+  injected via the `opts` map passed to `write-shape-text!`.
 
   Fully portable (no store/DOM/React), so it runs under Node too."
   (:require
    [app.common.data :as d]
+   [app.common.fonts :as cfnt]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.fills.impl :as types.fills.impl]
    [app.common.uuid :as uuid]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.serializers :as sr]
-   [app.render-wasm.wasm :as wasm]
    [cuerdas.core :as str]))
 
 (def ^:const PARAGRAPH-ATTR-U8-SIZE 12)
@@ -169,13 +170,15 @@
   "Writes one paragraph's spans + text into WASM and appends it to the current
   shape via `_set_shape_text_content`.
 
-  `opts` injects host-specific font resolution:
-   - `:normalize-font-id`  (string font-id -> wasm uuid) — required in practice,
+  `opts` injects host-specific font handling:
+   - `:normalize-font-id` (string font-id -> wasm uuid) defaults to the shared
+     `cfnt/font-id->uuid`, which is what both hosts want — a host only
+     overrides it if it keys its font store some other way,
    - `:normalize-paragraph`/`:normalize-span` — font-variant normalization from a
      fonts DB (workspace); default to identity (the exporter resolves variants
      differently / not at all)."
   [spans paragraph text {:keys [normalize-font-id normalize-paragraph normalize-span]
-                         :or   {normalize-font-id   identity
+                         :or   {normalize-font-id   cfnt/font-id->uuid
                                 normalize-paragraph identity
                                 normalize-span      (fn [span _paragraph] span)}}]
   (let [paragraph     (normalize-paragraph paragraph)
diff --git a/common/src/app/common/render_wasm/wasm.cljs b/common/src/app/common/render_wasm/wasm.cljs
new file mode 100644
index 0000000000..657b44047d
--- /dev/null
+++ b/common/src/app/common/render_wasm/wasm.cljs
@@ -0,0 +1,82 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.common.render-wasm.wasm)
+
+(defonce internal-frame-id nil)
+(defonce internal-frame-type 0)
+(defonce internal-module #js {})
+
+;; Reference to the HTML canvas element.
+(defonce canvas nil)
+;; Snapshot of the current canvas as an `ImageBitmap`, suitable for painting
+;; into an overlay canvas. Created via `createImageBitmap` so capturing never
+;; encodes pixels on the main thread.
+(defonce canvas-snapshot nil)
+
+;; Reference to the Emscripten GL context wrapper.
+(defonce gl-context-handle nil)
+
+;; Reference to the actual WebGL Context returned
+;; by the `.getContext` method of the canvas.
+(defonce gl-context nil)
+
+(defonce context-initialized? false)
+(defonce context-lost? (atom false))
+
+;; True while `reload-renderer!` is reconstructing the GL/WASM pipeline after a
+;; WebGL context restore (or an explicit reload). External app callers must not
+;; touch WASM until this clears (`ready?`); reload-internal ops use `live?`.
+(defonce reloading? (atom false))
+
+;; When we're rendering in a sync way we want to stop the asynchrous `request-render`
+(defonce disable-request-render? (atom false))
+
+(defn module-ready?
+  []
+  (and internal-module (fn? (unchecked-get internal-module "_init"))))
+
+(defn live?
+  "GL/WASM context exists and is not marked lost. True during reload after re-init."
+  []
+  (and context-initialized? (not @context-lost?)))
+
+(defn ready?
+  "Safe for normal application WASM calls (not lost, not mid-reload)."
+  []
+  (and (live?) (not @reloading?)))
+
+(defn reset-context-state!
+  "Clears canvas/GL handles and marks the context uninitialized.
+
+  Intentionally does **not** clear `context-lost?` or `reloading?`. During a
+  context-restore reload, `clear-canvas` runs while recovery is still in
+  progress; clearing those flags here would reopen a window where callers think
+  WebGL is ready before re-init finishes."
+  []
+  (set! internal-frame-id nil)
+  (set! canvas nil)
+  (set! canvas-snapshot nil)
+  (set! gl-context-handle nil)
+  (set! gl-context nil)
+  (set! context-initialized? false))
+
+(defonce serializers nil)
+
+(defn init-serializers!
+  "Binds the enum table produced by the `enums/serializers` macro."
+  [table]
+  (let [missing (array)]
+    (doseq [key (js/Object.keys table)]
+      (when (undefined? (unchecked-get table key))
+        (.push missing key)))
+
+    (when (pos? (alength missing))
+      (throw (ex-info "stale or incomplete render-wasm shared.js"
+                      {:missing (vec missing)})))
+
+    (set! serializers table)))
+
diff --git a/common/src/app/common/test_helpers/variants.cljc b/common/src/app/common/test_helpers/variants.cljc
index bf2e6fc973..07b4a58be7 100644
--- a/common/src/app/common/test_helpers/variants.cljc
+++ b/common/src/app/common/test_helpers/variants.cljc
@@ -13,6 +13,11 @@
    [app.common.types.text :as txt]))
 
 (defn add-variant
+  "Add a variant component to a file with two variants, each with a root shape.
+    :variant-label [:name Board]                            
+        {:root2-label} [:name Board]  # [Component :component2-label]
+        {:root1-label} [:name Board]  # [Component :component1-label]
+  "
   [file variant-label component1-label root1-label component2-label root2-label
    & {:keys [variant1-params variant2-params]
       :or   {variant1-params {} variant2-params {}}}]
diff --git a/common/src/app/common/types/file.cljc b/common/src/app/common/types/file.cljc
index accda94bc5..fe91dca8ad 100644
--- a/common/src/app/common/types/file.cljc
+++ b/common/src/app/common/types/file.cljc
@@ -429,6 +429,17 @@
                               (with-meta (meta parent-ref-shape))))]
     near-match))
 
+(defn swapped-subhead?
+  "Whether `shape` references outside its near main parent and needs a swap slot.
+  Same-parent positional differences are synchronized as reorders."
+  [shape container find-parent-ref-shape]
+  (let [parent-shape     (ctst/get-shape container (:parent-id shape))
+        parent-ref-shape (when parent-shape
+                           (find-parent-ref-shape parent-shape))]
+    (and (some? parent-ref-shape)
+         (not-any? #(= % (:shape-ref shape))
+                   (:shapes parent-ref-shape)))))
+
 (defn advance-shape-ref
   "Get the shape-ref of the near main of the shape, recursively repeated as many times
    as the given levels."
@@ -901,8 +912,10 @@
   (let [shape (get objects shape-id)]
     (println (str/pad (str (str/repeat "  " level)
                            (when (:main-instance shape) "{")
+                           (when (:is-variant-container shape) "{{")
                            (:name shape)
                            (when (:main-instance shape) "}")
+                           (when (:is-variant-container shape) "}}")
                            (when (seq (:touched shape)) "*")
                            (when show-ids (str/format " %s" (:id shape))))
                       {:length 20
diff --git a/common/src/app/common/types/nitrate_permissions.cljc b/common/src/app/common/types/nitrate_permissions.cljc
deleted file mode 100644
index a395da6709..0000000000
--- a/common/src/app/common/types/nitrate_permissions.cljc
+++ /dev/null
@@ -1,103 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.types.nitrate-permissions)
-
-(def ^:private defaults
-  {:create-teams "any"
-   :delete-teams "onlyOwners"
-   :move-teams "always"
-   :send-invitations "ownersAndAdmins"
-   :new-team-members "anyone"})
-
-(defn- can-create-team?
-  [{:keys [is-org-owner? permission-value]}]
-  (or is-org-owner?
-      (= permission-value "any")))
-
-(defn- can-delete-team?
-  [{:keys [is-org-owner? permission-value team-perms]}]
-  (cond
-    ;; Org owners can always delete teams inside their organizations.
-    is-org-owner?
-    true
-    (= permission-value "onlyOwners")
-    (boolean (:is-owner team-perms))
-    :else false))
-
-(defn- can-move-team?
-  [{:keys [permission-value target-org-same-owner?]}]
-  (cond
-    (= permission-value "never")
-    false
-    (= permission-value "always")
-    true
-    (= permission-value "myOrganizations")
-    (true? target-org-same-owner?)
-    :else false))
-
-(defn- can-invite-to-team?
-  [{:keys [permission-value team-perms]}]
-  (cond
-    (= permission-value "ownersAndAdmins")
-    (or (boolean (:is-owner team-perms))
-        (boolean (:is-admin team-perms)))
-
-    (= permission-value "owners")
-    (boolean (:is-owner team-perms))
-
-    :else false))
-
-(defn- can-add-anybody-to-team?
-  [{:keys [permission-value]}]
-  (= permission-value "anyone"))
-
-(def ^:private action-rules
-  {:create-team          {:permission-key :create-teams
-                          :check-fn       can-create-team?}
-   :delete-team          {:permission-key :delete-teams
-                          :check-fn       can-delete-team?}
-   :move-team            {:permission-key :move-teams
-                          :check-fn       can-move-team?}
-   :send-invitations     {:permission-key :send-invitations
-                          :check-fn        can-invite-to-team?}
-   :add-anybody-to-team  {:permission-key :new-team-members
-                          :check-fn       can-add-anybody-to-team?}})
-
-(defn- normalize-org-permissions
-  [org-perms]
-  (merge defaults (or (:permissions org-perms) {})))
-
-(defn- owner?
-  [org-perms profile-id]
-  (= profile-id (:owner-id org-perms)))
-
-(defn allowed?
-  "Returns true only for explicitly allowed actions (fail-closed)."
-  [action {:keys [org-perms profile-id team-perms target-org-same-owner?]}]
-  (let [{:keys [permission-key check-fn] :as rule}
-        (get action-rules action)
-        permissions (normalize-org-permissions org-perms)
-        is-org-owner? (owner? org-perms profile-id)
-        permission-value (get permissions permission-key)]
-    (cond
-      (nil? rule) false
-      :else (boolean (check-fn {:is-org-owner? is-org-owner?
-                                :permission-value permission-value
-                                :team-perms team-perms
-                                :target-org-same-owner? target-org-same-owner?})))))
-
-(defn can-send-invitations?
-  [{:keys [nitrate-enabled? organization profile-id team-permissions]}]
-  (let [in-org? (and nitrate-enabled? organization)]
-    (if in-org?
-      (allowed? :send-invitations
-                {:org-perms {:owner-id    (:owner-id organization)
-                             :permissions (:permissions organization)}
-                 :profile-id profile-id
-                 :team-perms team-permissions})
-      (or (boolean (:is-owner team-permissions))
-          (boolean (:is-admin team-permissions))))))
diff --git a/common/src/app/common/types/organization.cljc b/common/src/app/common/types/organization.cljc
index 16c5ab22aa..8a79598d74 100644
--- a/common/src/app/common/types/organization.cljc
+++ b/common/src/app/common/types/organization.cljc
@@ -6,6 +6,7 @@
 
 (ns app.common.types.organization
   (:require
+   [app.common.flags :as flags]
    [app.common.schema :as sm]))
 
 (def schema:organization
@@ -70,7 +71,106 @@
    [:active {:optional true} [:maybe :boolean]]
    [:provider {:optional true} [:maybe :string]]
    [:client-id {:optional true} [:maybe :string]]
-   [:base-url {:optional true} [:maybe :string]]
    [:client-secret {:optional true} [:maybe :string]]
-   [:issuer {:optional true} [:maybe :string]]
-   [:scopes {:optional true} [:maybe [::sm/set ::sm/text]]]])
+   [:issuer {:optional true} [:maybe :string]]])
+
+
+;; --- Organization permission rules ---
+
+(def ^:private defaults
+  {:create-teams "any"
+   :delete-teams "onlyOwners"
+   :move-teams "always"
+   :send-invitations "ownersAndAdmins"
+   :new-team-members "anyone"})
+
+(defn- can-create-team?
+  [{:keys [is-organization-owner? permission-value]}]
+  (or is-organization-owner?
+      (= permission-value "any")))
+
+(defn- can-delete-team?
+  [{:keys [is-organization-owner? permission-value team-perms]}]
+  (cond
+    ;; Organization owners can always delete teams inside their organizations.
+    is-organization-owner?
+    true
+    (= permission-value "onlyOwners")
+    (boolean (:is-owner team-perms))
+    :else false))
+
+(defn- can-move-team?
+  [{:keys [permission-value target-organization-same-owner?]}]
+  (cond
+    (= permission-value "never")
+    false
+    (= permission-value "always")
+    true
+    (= permission-value "myOrganizations")
+    (true? target-organization-same-owner?)
+    :else false))
+
+(defn- can-invite-to-team?
+  [{:keys [permission-value team-perms]}]
+  (cond
+    (= permission-value "ownersAndAdmins")
+    (or (boolean (:is-owner team-perms))
+        (boolean (:is-admin team-perms)))
+
+    (= permission-value "owners")
+    (boolean (:is-owner team-perms))
+
+    :else false))
+
+(defn- can-add-anybody-to-team?
+  [{:keys [permission-value]}]
+  (= permission-value "anyone"))
+
+(def ^:private action-rules
+  {:create-team          {:permission-key :create-teams
+                          :check-fn       can-create-team?}
+   :delete-team          {:permission-key :delete-teams
+                          :check-fn       can-delete-team?}
+   :move-team            {:permission-key :move-teams
+                          :check-fn       can-move-team?}
+   :send-invitations     {:permission-key :send-invitations
+                          :check-fn        can-invite-to-team?}
+   :add-anybody-to-team  {:permission-key :new-team-members
+                          :check-fn       can-add-anybody-to-team?}})
+
+(defn- normalize-organization-permissions
+  [organization-perms]
+  (merge defaults (or (:permissions organization-perms) {})))
+
+(defn- owner?
+  [organization-perms profile-id]
+  (= profile-id (:owner-id organization-perms)))
+
+(defn allowed?
+  "Returns true only for explicitly allowed actions (fail-closed)."
+  [action {:keys [organization-perms profile-id team-perms target-organization-same-owner?]}]
+  (let [{:keys [permission-key check-fn] :as rule}
+        (get action-rules action)
+        permissions (normalize-organization-permissions organization-perms)
+        is-organization-owner? (owner? organization-perms profile-id)
+        permission-value (get permissions permission-key)]
+    (cond
+      (nil? rule) false
+      :else (boolean (check-fn {:is-organization-owner? is-organization-owner?
+                                :permission-value permission-value
+                                :team-perms team-perms
+                                :target-organization-same-owner? target-organization-same-owner?})))))
+
+(defn can-send-invitations?
+  "Returns true when the user can send invitations to a team.
+  Falls back to team-level permissions (owner/admin) when the
+  admin-console flag is off or the team has no organization."
+  [{:keys [organization profile-id team-permissions]}]
+  (if (and (contains? flags/*current* :admin-console) organization)
+    (allowed? :send-invitations
+              {:organization-perms {:owner-id    (:owner-id organization)
+                                    :permissions (:permissions organization)}
+               :profile-id profile-id
+               :team-perms team-permissions})
+    (or (boolean (:is-owner team-permissions))
+        (boolean (:is-admin team-permissions)))))
diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index c7334d1717..2a3af1ffeb 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -139,6 +139,12 @@
    [:stroke-style {:optional true}
     [::sm/one-of #{:solid :dotted :dashed :mixed}]]
    [:stroke-width {:optional true} ::sm/safe-number]
+   ;; wasm-render only, backwards compatible
+   [:stroke-per-side {:optional true} :boolean]
+   [:stroke-width-top {:optional true} ::sm/safe-number]
+   [:stroke-width-right {:optional true} ::sm/safe-number]
+   [:stroke-width-bottom {:optional true} ::sm/safe-number]
+   [:stroke-width-left {:optional true} ::sm/safe-number]
    [:stroke-dash {:optional true} ::sm/safe-number]
    [:stroke-gap {:optional true} ::sm/safe-number]
    [:stroke-alignment {:optional true}
@@ -227,7 +233,50 @@
    [:grow-type {:optional true}
     [::sm/one-of grow-types]]
    [:applied-tokens {:optional true} cto/schema:applied-tokens]
-   [:plugin-data {:optional true} ctpg/schema:plugin-data]])
+   [:plugin-data {:optional true} ctpg/schema:plugin-data]
+
+   ;; `rotation`, `flip-x` and `flip-y` are fields of the `Shape` record (see
+   ;; `cr/defrecord Shape` above) and this schema did not declare them.
+   ;; `rotation` was already named in `allowed-shape-attrs` here and in
+   ;; `app.common.types.shape.attrs/editable-attrs`, so the omission was in this
+   ;; schema and not in the model. Anything reading the model from the schema
+   ;; rather than from a live shape missed all three: the graph projection
+   ;; derives one column per entry (`app.graph.schema.projection`), so shape
+   ;; nodes carried no rotation at all, and a consumer cannot place a shape
+   ;; without it.
+   ;;
+   ;; Nilable, because `app.common.record/defrecord` cannot remove a base
+   ;; field: its `without` assocs nil and its `containsKey` answers true
+   ;; whatever the field holds, so nil is how a record field says "unset".
+   ;; `flip-x` and `flip-y` are nil on every shape `setup-shape` builds, since
+   ;; `make-minimal-shape` gives them no default.
+   ;;
+   ;; Optional as well, unlike the geometry group below, because this schema
+   ;; has a second job: `check-shape-generic-attrs` validates partial update
+   ;; payloads with it, such as the `{:blocked true}` that
+   ;; `app.main.data.workspace/update-shape` passes. A required key here would
+   ;; reject every such payload.
+   [:rotation {:optional true} [:maybe ::sm/safe-number]]
+   [:flip-x {:optional true} [:maybe :boolean]]
+   [:flip-y {:optional true} [:maybe :boolean]]
+
+   ;; Carried on circles, rects and texts too, not only on frames, so it
+   ;; belongs here rather than in `schema:frame-attrs`. Not nilable: the key
+   ;; lives outside the record, `app.common.logic.shapes` dissocs it to unset
+   ;; it, and `setup-shape` drops it when a caller passes nil.
+   [:hide-in-viewer {:optional true} :boolean]
+
+   ;; The SVG provenance an import leaves on a shape. Typed `:map` rather than
+   ;; more precisely on purpose: legacy files hold `svg-transform` as a plain
+   ;; `{:a … :f}` map rather than a `::gmt/matrix` record, and `svg-viewbox` as
+   ;; either a `::grc/rect` record or a plain map, so a tighter schema here
+   ;; would reject files that are otherwise valid. The graph *column* types are
+   ;; tightened separately, where a wrong guess costs a column rather than a
+   ;; rejected file (`app.graph.schema.contract/type-overrides`).
+   [:svg-attrs {:optional true} :map]
+   [:svg-defs {:optional true} :map]
+   [:svg-transform {:optional true} :map]
+   [:svg-viewbox {:optional true} :map]])
 
 (def schema:group-attrs
   [:map {:title "GroupAttrs"}
@@ -238,7 +287,30 @@
    [:shapes [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]
    [:hide-fill-on-export {:optional true} :boolean]
    [:show-content {:optional true} :boolean]
-   [:hide-in-viewer {:optional true} :boolean]])
+   ;; `hide-in-viewer` moved to `schema:shape-generic-attrs`: stored files carry
+   ;; it on circles, rects and texts too, not only on frames.
+   ;; `use-for-thumbnail` is a frame attribute the model has long had, since
+   ;; `app.common.files.migrations` renames `:use-for-thumbnail?` to it and
+   ;; `app.common.logic.libraries` reads it, and this schema had not declared.
+   [:use-for-thumbnail {:optional true} :boolean]])
+
+(def ^:private schema:nilable-geom-attrs
+  "`schema:shape-geom-attrs`, but nilable.
+
+  Bools and paths are the only two shape types whose geometry can be nil:
+  `make-minimal-shape` gives `x`, `y`, `width` and `height` a default for every
+  other type and skips those two, whose extent their content and `selrect`
+  imply instead. The four keys stay required, because they are `Shape` record
+  fields and `app.common.record/defrecord` keeps a base field present whatever
+  it holds. So these two branches cannot merge `schema:shape-geom-attrs`, which
+  rejects the nil, and declare the same four keys nilable instead. A
+  schema-derived reader previously saw a bool or a path as having no position or
+  size at all."
+  [:map {:title "NilableGeometryAttrs"}
+   [:x [:maybe ::sm/safe-number]]
+   [:y [:maybe ::sm/safe-number]]
+   [:width [:maybe ::sm/safe-number]]
+   [:height [:maybe ::sm/safe-number]]])
 
 (def ^:private schema:bool-attrs
   [:map {:title "BoolAttrs"}
@@ -247,13 +319,37 @@
    [:content path/schema:content]])
 
 (def ^:private schema:rect-attrs
-  [:map {:title "RectAttrs"}])
+  [:map {:title "RectAttrs"}
+   ;; Legacy radii, set by SVG import (`app.common.files.shapes-builder` parses
+   ;; `rx`/`ry` off the element) and by migration 0003, which assocs `0`.
+   ;; Superseded by `r1` to `r4`, but stored files still carry them. Not
+   ;; nilable: both keys live outside the `Shape` record, so a dissoc removes
+   ;; them, and `setup-shape` drops a nil before the merge.
+   [:rx {:optional true} ::sm/safe-number]
+   [:ry {:optional true} ::sm/safe-number]])
 
 (def ^:private schema:circle-attrs
-  [:map {:title "CircleAttrs"}])
+  [:map {:title "CircleAttrs"}
+   [:rx {:optional true} ::sm/safe-number]
+   [:ry {:optional true} ::sm/safe-number]])
 
 (def ^:private schema:svg-raw-attrs
-  [:map {:title "SvgRawAttrs"}])
+  [:map {:title "SvgRawAttrs"}
+   ;; An svg-raw shape can be a container: importing an SVG builds a
+   ;; tree of svg-raw shapes, and `cfh/group-like-shape?` treats an
+   ;; svg-raw with children as group-like. Declaring `:shapes` here
+   ;; keeps the child ids typed as uuid, so a JSON round trip (binfile
+   ;; export/import) decodes them back to uuids instead of leaving
+   ;; strings that no longer resolve against the objects map.
+   [:shapes {:optional true} [:vector {:gen/max 10} ::sm/uuid]]
+   ;; The raw SVG node an import kept.
+   ;; `app.common.files.shapes-builder/create-raw-svg` sets it and
+   ;; `allowed-svg-attrs` names it. Usually the parsed element,
+   ;; `{:tag … :attrs … :content …}`, but a bare text node arrives as the
+   ;; string itself: `<text>hi</text>` becomes one svg-raw for the element
+   ;; and another for `"hi"`. `app.common.files.shapes-builder/parse-svg-element`
+   ;; carries a FIXME about exactly that. Both forms are legal and stored.
+   [:content {:optional true} [:or :map :string]]])
 
 (def schema:image-attrs
   [:map {:title "ImageAttrs"}
@@ -288,7 +384,10 @@
   (->> (sg/generator schema:shape-base-attrs)
        (sg/mcat (fn [{:keys [type] :as shape}]
                   (sg/let [attrs1 (sg/generator schema:shape-generic-attrs)
-                           attrs2 (sg/generator schema:shape-geom-attrs)
+                           attrs2 (if (or (= type :path)
+                                          (= type :bool))
+                                    (sg/generator schema:nilable-geom-attrs)
+                                    (sg/generator schema:shape-geom-attrs))
                            attrs3 (case type
                                     :text    (sg/generator schema:text-attrs)
                                     :path    (sg/generator schema:path-attrs)
@@ -299,10 +398,7 @@
                                     :bool    (sg/generator schema:bool-attrs)
                                     :group   (sg/generator schema:group-attrs)
                                     :frame   (sg/generator schema:frame-attrs))]
-                    (if (or (= type :path)
-                            (= type :bool))
-                      (merge attrs1 shape attrs3)
-                      (merge attrs1 shape attrs2 attrs3)))))
+                    (merge attrs1 shape attrs2 attrs3))))
        (sg/fmap create-shape)))
 
 (def schema:shape-attrs
@@ -334,6 +430,7 @@
      ctsl/schema:layout-child-attrs
      schema:bool-attrs
      schema:shape-generic-attrs
+     schema:nilable-geom-attrs
      schema:shape-base-attrs]]
 
    [:rect
@@ -373,6 +470,7 @@
      ctsl/schema:layout-child-attrs
      schema:path-attrs
      schema:shape-generic-attrs
+     schema:nilable-geom-attrs
      schema:shape-base-attrs]]
 
    [:text
@@ -692,6 +790,31 @@
     :r3
     :r4})
 
+(def ^:private text-extract-props
+  (into #{} cat [txt/root-attrs txt/paragraph-attrs txt/text-node-attrs]))
+
+(def ^:private layout-extract-props
+  (set ctsl/layout-attrs))
+
+;; Token attrs are not shape attrs (:fill token vs :fills attr, :m1..:m4 vs
+;; :layout-item-margin). A token may only travel with the value it resolves to,
+;; so its domain is derived from the props that are actually written. The attrs
+;; holding a map of edges are patched edge by edge, so only the edges present
+;; in the map are written.
+(defn- token-attrs
+  [props]
+  (reduce-kv (fn [result attr value]
+               (let [sub-attrs (when (map? value)
+                                 (not-empty (set (keys value))))]
+                 (into result
+                       (if (= :layout-gap attr)
+                         (if (some? sub-attrs)
+                           (filter cto/spacing-gap-keys sub-attrs)
+                           cto/spacing-gap-keys)
+                         (cto/shape-attr->token-attrs attr sub-attrs)))))
+             #{}
+             props))
+
 (defn extract-props
   "Retrieves an object with the 'pasteable' properties for a shape."
   [shape]
@@ -723,7 +846,15 @@
                   props)))
 
           (extract-layout-attrs [props shape]
-            (d/patch-object props (select-keys shape ctsl/layout-attrs)))]
+            (d/patch-object props (select-keys shape ctsl/layout-attrs)))
+
+          (extract-token-props [props shape]
+            (let [tokens (-> (:applied-tokens shape)
+                             (select-keys (token-attrs props))
+                             (not-empty))]
+              (cond-> props
+                (some? tokens)
+                (assoc :applied-tokens tokens))))]
 
     (let [;; For texts we don't extract the fill
           extract-props
@@ -731,7 +862,8 @@
       (-> shape
           (select-keys extract-props)
           (cond-> (cfh/text-shape? shape) (extract-text-props shape))
-          (cond-> (ctsl/any-layout? shape) (extract-layout-attrs shape))))))
+          (cond-> (ctsl/any-layout? shape) (extract-layout-attrs shape))
+          (extract-token-props shape)))))
 
 (defn patch-props
   "Given the object of `extract-props` applies it to a shape. Adapt the shape if necessary"
@@ -759,12 +891,33 @@
             (let [shape (d/patch-object shape (select-keys props ctsl/layout-attrs))]
               (cond-> shape
                 (ctsl/grid-layout? shape)
-                (ctsl/assign-cells objects))))]
+                (ctsl/assign-cells objects))))
+
+          (patched-props [shape props]
+            (let [text?  (cfh/text-shape? shape)
+                  frame? (cfh/frame-shape? shape)]
+              (select-keys props
+                           (filter (fn [attr]
+                                     (or (contains? basic-extract-props attr)
+                                         (and text? (contains? text-extract-props attr))
+                                         (and frame? (contains? layout-extract-props attr))))
+                                   (keys props)))))
+
+          (patch-token-props [shape props]
+            (let [attrs  (token-attrs (patched-props shape props))
+                  tokens (-> (:applied-tokens shape)
+                             (d/without-keys attrs)
+                             (merge (select-keys (:applied-tokens props) attrs))
+                             (not-empty))]
+              (if (some? tokens)
+                (assoc shape :applied-tokens tokens)
+                (dissoc shape :applied-tokens))))]
 
     (-> shape
         (d/patch-object (select-keys props basic-extract-props))
         (cond-> (cfh/text-shape? shape) (patch-text-props props))
-        (cond-> (cfh/frame-shape? shape) (patch-layout-props props)))))
+        (cond-> (cfh/frame-shape? shape) (patch-layout-props props))
+        (patch-token-props props))))
 
 
 
diff --git a/frontend/src/app/render_wasm/resources.cljs b/common/src/app/common/types/shape/images.cljs
similarity index 91%
rename from frontend/src/app/render_wasm/resources.cljs
rename to common/src/app/common/types/shape/images.cljs
index 9f564aa990..54e6fef6c3 100644
--- a/frontend/src/app/render_wasm/resources.cljs
+++ b/common/src/app/common/types/shape/images.cljs
@@ -4,12 +4,12 @@
 ;;
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
-(ns app.render-wasm.resources
+(ns app.common.types.shape.images
   "Host-agnostic enumeration of the external resources a scene needs to
   render: which image bytes its shapes reference. Pure data walking — no
   browser or Node dependencies — so the workspace and the headless exporter
-  derive the same set from the same source (sibling of
-  `app.render-wasm.fallback-fonts`, which does the same for fonts)."
+  derive the same set from the same source (counterpart of
+  `app.common.fonts`, which does the same for fonts)."
   (:require
    [app.common.types.fills :as types.fills]))
 
diff --git a/common/src/app/common/types/shape/interactions.cljc b/common/src/app/common/types/shape/interactions.cljc
index 6b06b68897..99f25fad00 100644
--- a/common/src/app/common/types/shape/interactions.cljc
+++ b/common/src/app/common/types/shape/interactions.cljc
@@ -9,7 +9,6 @@
    [app.common.data :as d]
    [app.common.files.helpers :as cfh]
    [app.common.geom.point :as gpt]
-   [app.common.geom.shapes.bounds :as gsb]
    [app.common.schema :as sm]
    [app.common.schema.generators :as sg]))
 
@@ -482,7 +481,13 @@
 
     (if (nil? dest-frame)
       [(gpt/point 0 0) [:top :left]]
-      (let [overlay-size           (gsb/get-object-bounds objects dest-frame)
+      (let [;; Use the destination frame selrect (the visible frame box) to compute
+            ;; the overlay position, not its full object bounds. Bounds include
+            ;; padding for shadows, blur, strokes and overflowing children, which
+            ;; would make centered/right/bottom positions off by half that padding
+            ;; (the visible frame ends up shifted). The viewer reserves the bounds
+            ;; size and re-aligns the selrect separately (see viewer/calculate-delta).
+            overlay-size           (:selrect dest-frame)
             base-frame-size        (:selrect base-frame)
             relative-to-shape-size (:selrect relative-to-shape)
             relative-to-adjusted-to-base-frame {:x (- (:x relative-to-shape-size) (:x base-frame-size))
diff --git a/common/src/app/common/types/shape/layout.cljc b/common/src/app/common/types/shape/layout.cljc
index 8b7831d5ab..03532db4ec 100644
--- a/common/src/app/common/types/shape/layout.cljc
+++ b/common/src/app/common/types/shape/layout.cljc
@@ -1525,20 +1525,37 @@
       (some? target-cell)
       (add-children-to-cell ids objects [(:row target-cell) (:column target-cell)]))))
 
+(defn- refill-slots
+  "Fill matching positions in `shapes` from `ordered`, preserving other indices.
+  `ordered` must contain exactly the ids accepted by `slot?`."
+  [shapes slot? ordered]
+  (loop [shapes  (seq shapes)
+         ordered (seq ordered)
+         result  (transient [])]
+    (if (nil? shapes)
+      (persistent! result)
+      (let [id (first shapes)]
+        (if (slot? id)
+          (recur (next shapes) (next ordered) (conj! result (first ordered)))
+          (recur (next shapes) ordered (conj! result id)))))))
+
 (defn reorder-grid-children
+  "Order cell children by grid position while preserving the indices of
+  hidden and absolute-positioned children."
   [parent]
-  (let [cells (get-cells parent {:sort? true})
+  (let [cells  (get-cells parent {:sort? true})
         child? (set (:shapes parent))
-        new-shapes
-        (into (d/ordered-set)
+
+        in-cell-ids
+        (into []
               (comp (keep (comp first :shapes))
-                    (filter child?))
-              cells)
-
-        ;; Add the children that are not in cells (absolute positioned for example)
-        new-shapes (into new-shapes (:shapes parent))]
-
-    (assoc parent :shapes (into [] (reverse new-shapes)))))
+                    (filter child?)
+                    (distinct))
+              cells)]
+    ;; :shapes is ordered in reverse relative to the visual cell order
+    (assoc parent :shapes (refill-slots (:shapes parent)
+                                        (set in-cell-ids)
+                                        (reverse in-cell-ids)))))
 
 (defn cells-by-row
   ([parent index]
diff --git a/common/src/app/common/types/shape/text.cljc b/common/src/app/common/types/shape/text.cljc
index c5211e8a4a..8c0595daa6 100644
--- a/common/src/app/common/types/shape/text.cljc
+++ b/common/src/app/common/types/shape/text.cljc
@@ -20,44 +20,42 @@
    [:type [:= "root"]]
    [:key {:optional true} :string]
    [:children
-    {:optional true}
-    [:maybe
-     [:vector {:min 1 :gen/max 2 :gen/min 1}
-      [:map
-       [:type [:= "paragraph-set"]]
-       [:key {:optional true} :string]
-       [:children
-        [:vector {:min 1 :gen/max 2 :gen/min 1}
-         [:map
-          [:type [:= "paragraph"]]
-          [:key {:optional true} :string]
-          [:fills {:optional true}
-           [:maybe schema:fills]]
-          [:font-family {:optional true} ::sm/text]
-          [:font-size {:optional true} ::sm/text]
-          [:font-style {:optional true} ::sm/text]
-          [:font-weight {:optional true} ::sm/text]
-          [:direction {:optional true} ::sm/text]
-          [:text-decoration {:optional true} ::sm/text]
-          [:text-transform {:optional true} ::sm/text]
-          [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
-          [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]
-          [:children
-           [:vector {:min 1 :gen/max 2 :gen/min 1}
-            [:map
-             [:text :string]
-             [:key {:optional true} :string]
-             [:fills {:optional true}
-              [:maybe schema:fills]]
-             [:font-family {:optional true} ::sm/text]
-             [:font-size {:optional true} ::sm/text]
-             [:font-style {:optional true} ::sm/text]
-             [:font-weight {:optional true} ::sm/text]
-             [:direction {:optional true} ::sm/text]
-             [:text-decoration {:optional true} ::sm/text]
-             [:text-transform {:optional true} ::sm/text]
-             [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
-             [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]]]]]]]]]]]])
+    [:vector {:min 1 :gen/max 2 :gen/min 1}
+     [:map
+      [:type [:= "paragraph-set"]]
+      [:key {:optional true} :string]
+      [:children
+       [:vector {:min 1 :gen/max 2 :gen/min 1}
+        [:map
+         [:type [:= "paragraph"]]
+         [:key {:optional true} :string]
+         [:fills {:optional true}
+          [:maybe schema:fills]]
+         [:font-family {:optional true} ::sm/text]
+         [:font-size {:optional true} ::sm/text]
+         [:font-style {:optional true} ::sm/text]
+         [:font-weight {:optional true} ::sm/text]
+         [:direction {:optional true} ::sm/text]
+         [:text-decoration {:optional true} ::sm/text]
+         [:text-transform {:optional true} ::sm/text]
+         [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
+         [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]
+         [:children
+          [:vector {:min 1 :gen/max 2 :gen/min 1}
+           [:map
+            [:text :string]
+            [:key {:optional true} :string]
+            [:fills {:optional true}
+             [:maybe schema:fills]]
+            [:font-family {:optional true} ::sm/text]
+            [:font-size {:optional true} ::sm/text]
+            [:font-style {:optional true} ::sm/text]
+            [:font-weight {:optional true} ::sm/text]
+            [:direction {:optional true} ::sm/text]
+            [:text-decoration {:optional true} ::sm/text]
+            [:text-transform {:optional true} ::sm/text]
+            [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
+            [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]]]]]]]]]]])
 
 (def valid-content?
   (sm/lazy-validator schema:content))
diff --git a/common/src/app/common/types/token.cljc b/common/src/app/common/types/token.cljc
index 619bc5e2b8..10cedd5c19 100644
--- a/common/src/app/common/types/token.cljc
+++ b/common/src/app/common/types/token.cljc
@@ -235,6 +235,8 @@
    [:row-gap {:optional true} schema:token-name]
    [:column-gap {:optional true} schema:token-name]])
 
+(def spacing-gap-keys (schema-keys schema:spacing-gap))
+
 (def ^:private schema:spacing-padding
   [:map {:title "SpacingPaddingTokenAttrs"}
    [:p1 {:optional true} schema:token-name]
diff --git a/common/test/common_tests/data_test.cljc b/common/test/common_tests/data_test.cljc
index 39f3370de8..46f12fd8fb 100644
--- a/common/test/common_tests/data_test.cljc
+++ b/common/test/common_tests/data_test.cljc
@@ -36,6 +36,24 @@
   (t/is (= "" (d/get-initials nil)))
   (t/is (= "" (d/get-initials "!!! ???"))))
 
+(t/deftest normalize-string-test
+  ;; nil input returns empty string
+  (t/is (= "" (d/normalize-string nil)))
+  ;; empty string returns empty string
+  (t/is (= "" (d/normalize-string "")))
+  ;; leading whitespace is trimmed
+  (t/is (= "hello" (d/normalize-string "  hello")))
+  ;; trailing whitespace is trimmed
+  (t/is (= "hello" (d/normalize-string "hello  ")))
+  ;; both leading and trailing whitespace are trimmed
+  (t/is (= "hello" (d/normalize-string "  hello  ")))
+  ;; internal whitespace is preserved
+  (t/is (= "hello world" (d/normalize-string "  hello world  ")))
+  ;; non-string input is returned unchanged
+  (t/is (= 42 (d/normalize-string 42)))
+  (t/is (= :keyword (d/normalize-string :keyword)))
+  (t/is (= true (d/normalize-string true))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Ordered Data Structures
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/common/test/common_tests/files/repair_test.cljc b/common/test/common_tests/files/repair_test.cljc
new file mode 100644
index 0000000000..a5021baf03
--- /dev/null
+++ b/common/test/common_tests/files/repair_test.cljc
@@ -0,0 +1,230 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns common-tests.files.repair-test
+  "Tests for the validate / repair functions in app.common.files.validate
+   and app.common.files.repair. 
+
+   The tests generate cases of broken files and check that the validation functions
+   generate accurate errors, and that the repair functions return the file to
+   a stable state."
+  (:require
+   [app.common.files.repair :as cfr]
+   [app.common.files.validate :as cfv]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
+   [app.common.test-helpers.variants :as thv]
+   [app.common.uuid :as uuid]
+   [clojure.test :as t]))
+
+(t/use-fixtures :each thi/test-fixture)
+
+(t/deftest repair-main-instance-not-a-variant
+  (t/testing "detect and repair a variant component whose root shape is not a variant"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      (ths/update-shape :root1 :variant-id nil))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+
+          root1'  (ths/get-shape file' :root1 :page-label :page1)]
+
+      (t/is (= 2 (count errors)))  ;; There are two different checks that detect the same problem
+      (t/is (= :main-instance-not-a-variant (:code (first errors))))
+
+      (t/is (nil? errors'))
+      (t/is (= (thi/id :variant1) (:variant-id root1'))))))
+
+(t/deftest repair-invalid-variant-id-variant-component-bad-id
+  (t/testing "detect and repair a variant component whose variant id does not match the container's id"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      (ths/update-shape :root1 :variant-id (uuid/next)))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+
+          root1'  (ths/get-shape file' :root1 :page-label :page1)]
+
+      (t/is (= 2 (count errors)))  ;; There are two different validation that actually check the same problem
+      (t/is (= :main-instance-invalid-variant-id (:code (first errors))))
+      (t/is (= :variant-component-bad-id (:code (second errors))))
+
+      (t/is (nil? errors'))
+      (t/is (= (thi/id :variant1) (:variant-id root1'))))))
+
+(t/deftest repair-invalid-variant-properties
+  (t/testing "detect and repair a second variant component whose properties do not match the first variant component's properties"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      ;; Component1 has ["Property 1", "Property 2"], component2 gets ["Property 1", "Property 3"]
+                      ;; This breaks validation: prop-names mismatch (missing "Property 2", extra "Property 3")
+                      (thc/update-component :component1 {:variant-properties [{:name "Property 1" :value "Value1"}
+                                                                              {:name "Property 2" :value "ValueA"}]})
+                      (thc/update-component :component2 {:variant-properties [{:name "Property 1" :value "Value2"}
+                                                                              {:name "Property 3" :value "ValueB"}]})
+                      (ths/update-shape :root1 :variant-name "Value1, ValueA")
+                      (ths/update-shape :root2 :variant-name "Value2, ValueB"))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+
+          comp1'  (thc/get-component file' :component1)
+          comp2'  (thc/get-component file' :component2)
+          root1'  (ths/get-shape file' :root1)
+          root2'  (ths/get-shape file' :root2)]
+
+      (t/is (= 1 (count errors)))
+      (t/is (= :invalid-variant-properties (:code (first errors))))
+
+      (t/is (nil? errors'))
+
+      ;; After repair, component1's properties are rebuilt to match component2's property names
+      ;; (the first child in the variant container is root2, so prop-names come from component2)
+      ;; "Property 1" keeps its value, "Property 3" is added with empty value, "Property 2" is removed
+      (t/is (= [{:name "Property 1" :value "Value1"}
+                {:name "Property 3" :value ""}]
+               (:variant-properties comp1')))
+
+      (t/is (= "Value1" (:variant-name root1')))
+
+      ;; Component2 is unchanged (it was the reference for the property names)
+      (t/is (= [{:name "Property 1" :value "Value2"}
+                {:name "Property 3" :value "ValueB"}]
+               (:variant-properties comp2')))
+
+      (t/is (= "Value2, ValueB" (:variant-name root2'))))))
+
+(t/deftest repair-variant-not-main
+  (t/testing "detect and repair a non-main-instance shape inside a variant container"
+    (let [file       (-> (thf/sample-file :file1 :page-label :page1)
+                         (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                         ;; Add a third child to the variant container with :variant-id but NOT a main-instance
+                         (ths/add-sample-shape :bad-shape
+                                               :type :frame
+                                               :parent-label :variant1
+                                               :variant-id (thi/id :variant1)
+                                               :variant-name "")
+                         ;; Add a child to the bad shape (to verify the repair deletes it too)
+                         (ths/add-sample-shape :bad-child
+                                               :type :rect
+                                               :parent-label :bad-shape))
+
+          errors     (cfv/validate-file file {})
+          changes    (cfr/repair-file file {} errors)
+          file'      (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors'    (cfv/validate-file file' {})
+
+          bad-shape' (ths/get-shape file' :bad-shape)
+          bad-child' (ths/get-shape file' :bad-child)]
+
+      (t/is (= 4 (count errors)))  ;; The bad container also triggers other errors
+      (t/is (= :invalid-variant-properties (:code (nth errors 0))))
+      (t/is (= :variant-not-main (:code (nth errors 1))))
+      (t/is (= :variant-component-bad-name (:code (nth errors 2))))
+      (t/is (= :variant-component-bad-id (:code (nth errors 3))))
+      (t/is (nil? errors'))
+
+      (t/is (nil? bad-shape'))
+      (t/is (nil? bad-child')))))
+
+(t/deftest repair-parent-not-variant
+  (t/testing "detect and repair a variant shape whose parent is not a variant-container"
+    (let [file       (-> (thf/sample-file :file1 :page-label :page1)
+                         (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                         ;; Break the variant container
+                         (ths/update-shape :variant1 :is-variant-container false))
+
+          errors     (cfv/validate-file file {})
+          changes    (cfr/repair-file file {} errors)
+          file'      (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors'    (cfv/validate-file file' {})
+
+          container' (ths/get-shape file' :variant1)]
+
+      (t/is (= 2 (count errors)))  ;; The error is detected twice, once for each child of the variant container
+      (t/is (= :parent-not-variant (:code (first errors))))
+      (t/is (= :parent-not-variant (:code (second errors))))
+      (t/is (nil? errors'))
+
+      (t/is (true? (:is-variant-container container'))))))
+
+(t/deftest repair-variant-main-bad-name
+  (t/testing "detect and repair a main instance whose name doesn't match the variant container's name"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      ;; Change root1's name so it doesn't match the container
+                      (ths/update-shape :root1 :name "WrongName"))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+          root1'  (ths/get-shape file' :root1)]
+
+      (t/is (= 1 (count errors)))
+      (t/is (= :variant-main-bad-name (:code (first errors))))
+      (t/is (nil? errors'))
+      (t/is (= "Board" (:name root1'))))))
+
+(t/deftest repair-variant-main-bad-variant-name
+  (t/testing "detect and repair a variant shape whose :variant-name doesn't match the component's properties"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      (thc/update-component :component1 {:variant-properties [{:name "Property 1" :value "Value1"}
+                                                                              {:name "Property 2" :value "ValueA"}]})
+                      (thc/update-component :component2 {:variant-properties [{:name "Property 1" :value "Value2"}
+                                                                              {:name "Property 2" :value "ValueB"}]})
+                      ;; Change root1's :variant-name to something wrong
+                      (ths/update-shape :root1 :variant-name "WrongVariantName")
+                      (ths/update-shape :root2 :variant-name "Value2, ValueB"))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+
+          root1'  (ths/get-shape file' :root1)]
+
+      (t/is (= 1 (count errors)))
+      (t/is (= :variant-main-bad-variant-name (:code (first errors))))
+      (t/is (nil? errors'))
+      (t/is (= "Value1, ValueA" (:variant-name root1'))))))
+
+(t/deftest repair-variant-component-bad-name
+  (t/testing "detect and repair a variant component whose path/name doesn't match the container name"
+    (let [file    (-> (thf/sample-file :file1 :page-label :page1)
+                      (thv/add-variant :variant1 :component1 :root1 :component2 :root2)
+                      ;; Update names to have path structure
+                      (ths/update-shape :variant1 :name "Group / Subgroup / Component")
+                      (ths/update-shape :root1 :name "Group / Subgroup / Component")
+                      (ths/update-shape :root2 :name "Group / Subgroup / Component")
+                      ;; Update component paths and names
+                      (thc/update-component :component1 {:path "Group / Subgroup" :name "Component"})
+                      (thc/update-component :component2 {:path "Group / Subgroup" :name "Component"})
+                      ;; Break component1's name
+                      (thc/update-component :component1 {:name "WrongName"}))
+
+          errors  (cfv/validate-file file {})
+          changes (cfr/repair-file file {} errors)
+          file'   (thf/apply-changes file {:redo-changes changes} :validate? false)
+          errors' (cfv/validate-file file' {})
+          comp1'  (thc/get-component file' :component1)]
+
+      (t/is (= 1 (count errors)))
+      (t/is (= :variant-component-bad-name (:code (first errors))))
+      (t/is (nil? errors'))
+      (t/is (= "Group / Subgroup" (:path comp1')))
+      (t/is (= "Component" (:name comp1'))))))
diff --git a/common/test/common_tests/files_changes_test.cljc b/common/test/common_tests/files_changes_test.cljc
index 3cbc475000..7671f7a787 100644
--- a/common/test/common_tests/files_changes_test.cljc
+++ b/common/test/common_tests/files_changes_test.cljc
@@ -912,3 +912,4 @@
               (nil? (get-in result2 [:pages-index page-id :default-grids])))))
 
      {:num 1000})))
+
diff --git a/common/test/common_tests/files_migrations_0025_test.cljc b/common/test/common_tests/files_migrations_0025_test.cljc
new file mode 100644
index 0000000000..4d57398953
--- /dev/null
+++ b/common/test/common_tests/files_migrations_0025_test.cljc
@@ -0,0 +1,833 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns common-tests.files-migrations-0025-test
+  (:require
+   [app.common.files.migrations :as cfm]
+   [app.common.types.shape :as cts]
+   [app.common.uuid :as uuid]
+   [clojure.test :as t]))
+
+;; 0025-repair-empty-text-content
+;; Text shapes whose :content is a root with an empty/missing :children
+;; vector used to slip past the schema (children was optional). With the
+;; schema tightening those shapes must be repaired on next load.
+(defn- make-text-shape-with-content
+  "Build a text shape with arbitrary content structure"
+  [shape-id content]
+  (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+      (assoc :content content)))
+
+(defn- make-broken-text-shape
+  "Build a fully-initialised text shape with a broken :content and the
+  supplied root-level attrs overlaid on it."
+  [shape-id root-attrs]
+  (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+      (assoc :content (merge {:type "root"}
+                             (when (seq root-attrs) root-attrs)
+                             {:children []}))))
+
+(t/deftest migration-0025-repair-empty-text-content-empty-children
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-broken-text-shape shape-id {:vertical-align "top"})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "root type preserved")
+    (t/is (vector? (:children content)) "children is now a vector")
+    (t/is (= 1 (count (:children content))) "exactly one paragraph-set seeded")
+    (t/is (= "paragraph-set" (get-in content [:children 0 :type])))
+    (t/is (pos? (count (get-in content [:children 0 :children])))
+          "paragraph-set has at least one paragraph")
+    (t/is (= "" (get-in content [:children 0 :children 0 :children 0 :text]))
+          "seeded span has empty text")
+    (t/is (= "top" (:vertical-align content))
+          "preserves pre-existing :vertical-align")))
+
+(t/deftest migration-0025-repair-empty-text-content-missing-children
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        ;; A text shape whose :content has no :children key at all.
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "center"}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (:children content)) "missing children becomes a vector")
+    (t/is (pos? (count (:children content))) "missing children gets a paragraph-set")
+    (t/is (= "center" (:vertical-align content))
+          "preserves pre-existing :vertical-align")))
+
+(t/deftest migration-0025-repair-empty-text-content-no-content
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        ;; A text shape with no :content at all. Should be repaired with default content.
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (map? content) "content is now a map")
+    (t/is (= "root" (:type content)) "content has root type")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-repair-empty-text-content-idempotent
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        ;; A healthy text shape with a proper paragraph-set/paragraph/
+        ;; span tree. The migration must leave it untouched.
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "top"
+                                                   :children [{:type "paragraph-set"
+                                                               :children [{:type "paragraph"
+                                                                           :children [{:text "hello"}]}]}]}))}}}}
+        original (get-in data [:pages-index page-id :objects shape-id])
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape'   (get-in data' [:pages-index page-id :objects shape-id])]
+
+    (t/is (cts/valid-shape? original) "baseline shape is valid")
+    (t/is (= original shape') "healthy content is unchanged")))
+
+(t/deftest migration-0025-repair-empty-text-content-component
+  ;; The migration also walks :components, so a broken text inside a
+  ;; component is also repaired.
+  (let [shape-id (uuid/next)
+        comp-id  (uuid/next)
+        data     {:components
+                  {comp-id
+                   {:objects
+                    {shape-id (make-broken-text-shape shape-id nil)}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:components comp-id :objects shape-id])]
+
+    (t/is (cts/valid-shape? shape) "repaired component shape is valid")
+    (t/is (pos? (count (get-in shape [:content :children])))
+          "children vector is no longer empty")))
+
+(t/deftest migration-0025-repair-empty-text-content-level2
+  ;; Level 2: paragraph-set with empty/missing children
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "top"
+                                                   :children [{:type "paragraph-set"
+                                                               :children []}]}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "paragraph-set" (get-in content [:children 0 :type])) "paragraph-set preserved")
+    (t/is (pos? (count (get-in content [:children 0 :children])))
+          "paragraph-set now has at least one paragraph")
+    (t/is (= "paragraph" (get-in content [:children 0 :children 0 :type]))
+          "seeded child is a paragraph")
+    (t/is (= "top" (:vertical-align content))
+          "preserves pre-existing :vertical-align")))
+
+(t/deftest migration-0025-repair-empty-text-content-level3
+  ;; Level 3: paragraph with empty/missing children
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "top"
+                                                   :children [{:type "paragraph-set"
+                                                               :children [{:type "paragraph"
+                                                                           :children []}]}]}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "paragraph" (get-in content [:children 0 :children 0 :type])) "paragraph preserved")
+    (t/is (pos? (count (get-in content [:children 0 :children 0 :children])))
+          "paragraph now has at least one span")
+    (t/is (= "" (get-in content [:children 0 :children 0 :children 0 :text]))
+          "seeded span has empty text")
+    (t/is (= "top" (:vertical-align content))
+          "preserves pre-existing :vertical-align")))
+
+(t/deftest migration-0025-repair-empty-text-content-mixed-levels
+  ;; Valid level 1, but broken at levels 2 and 3 in different paragraph-sets
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "top"
+                                                   :children [{:type "paragraph-set"
+                                                               :children []}
+                                                              {:type "paragraph-set"
+                                                               :children [{:type "paragraph"
+                                                                           :children []}]}]}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= 2 (count (:children content))) "both paragraph-sets preserved")
+    ;; First paragraph-set had empty children (level 2 broken)
+    (t/is (pos? (count (get-in content [:children 0 :children])))
+          "first paragraph-set now has paragraphs")
+    ;; Second paragraph-set had a paragraph with empty children (level 3 broken)
+    (t/is (pos? (count (get-in content [:children 1 :children 0 :children])))
+          "second paragraph's paragraph now has spans")))
+
+;; ============================================================================
+;; Category A: Shape-level guards (fix-shape)
+;; ============================================================================
+
+(t/deftest migration-0025-non-text-shape-untouched
+  ;; A: Non-text shape should not be processed
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (cts/setup-shape {:id shape-id :type :rect :x 0 :y 0})}}}}
+        original (get-in data [:pages-index page-id :objects shape-id])
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape'   (get-in data' [:pages-index page-id :objects shape-id])]
+
+    (t/is (= original shape') "non-text shape is unchanged")))
+
+(t/deftest migration-0025-text-shape-non-map-content-repaired
+  ;; A: Text shape with non-map content should be repaired
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content "not a map"))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (map? content) "content is now a map")
+    (t/is (= "root" (:type content)) "content has root type")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-text-shape-wrong-root-type-repaired
+  ;; A: Text shape with content :type not "root" should be repaired, preserving root-level attrs
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "paragraph"
+                                                   :vertical-align "center"
+                                                   :children []}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "type is now root")
+    (t/is (= "center" (:vertical-align content)) "root-level attrs preserved")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-text-shape-nil-content
+  ;; I: Text shape with :content nil should be repaired with default content
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content nil))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (map? content) "content is now a map")
+    (t/is (= "root" (:type content)) "content has root type")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-text-shape-empty-map-content
+  ;; I: Text shape with :content {} (empty map) should be repaired with default content
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "type is now root")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-text-shape-wrong-type-with-root-attrs
+  ;; I: Text shape with wrong type but valid root-level attrs should preserve attrs
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "paragraph"
+                                                   :vertical-align "bottom"
+                                                   :children []}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "type is now root")
+    (t/is (= "bottom" (:vertical-align content)) "root-level attrs preserved")
+    (t/is (vector? (:children content)) "children is a vector")
+    (t/is (pos? (count (:children content))) "has at least one paragraph-set")))
+
+(t/deftest migration-0025-text-shape-partial-salvage-paragraphs-under-root
+  ;; K: Root has children but they're paragraphs (not paragraph-sets) - should preserve level 1 attrs
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (-> (cts/setup-shape {:id shape-id :type :text :x 0 :y 0 :grow-type :auto-width})
+                                  (assoc :content {:type "root"
+                                                   :vertical-align "top"
+                                                   :children [{:type "paragraph"
+                                                               :children [{:text "hello"}]}]}))}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "root type preserved")
+    (t/is (= "top" (:vertical-align content)) "root-level attrs preserved")
+    (t/is (= 1 (count (:children content))) "has one paragraph-set")
+    (t/is (= "paragraph-set" (get-in content [:children 0 :type])) "child is paragraph-set")
+    (t/is (pos? (count (get-in content [:children 0 :children]))) "paragraph-set has paragraphs")))
+
+;; ============================================================================
+;; Category B: Level 1 (root) variants
+;; ============================================================================
+
+(t/deftest migration-0025-root-non-vector-children-map
+  ;; B: Root with non-vector children (map) - GAP: should repair
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :vertical-align "top"
+                                :children {:invalid "map"}})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "root" (:type content)) "root type preserved")
+    (t/is (vector? (:children content)) "children is now a vector")
+    (t/is (= "top" (:vertical-align content)) "preserves vertical-align")))
+
+(t/deftest migration-0025-root-non-vector-children-string
+  ;; B: Root with non-vector children (string) - GAP: should repair
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :vertical-align "center"
+                                :children "not a vector"})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (:children content)) "children is now a vector")
+    (t/is (= "center" (:vertical-align content)) "preserves vertical-align")))
+
+;; ============================================================================
+;; Category C: Level 2 (paragraph-set) variants
+;; ============================================================================
+
+(t/deftest migration-0025-paragraph-set-nil-children
+  ;; C: Paragraph-set with nil children key
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children])) "children is a vector")
+    (t/is (pos? (count (get-in content [:children 0 :children]))) "has at least one paragraph")))
+
+(t/deftest migration-0025-paragraph-set-non-vector-children-map
+  ;; C: Paragraph-set with non-vector children (map)
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children {:invalid "map"}}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children])) "children is now a vector")
+    (t/is (= "paragraph" (get-in content [:children 0 :children 0 :type])) "seeded with default paragraph")))
+
+(t/deftest migration-0025-paragraph-set-non-vector-children-string
+  ;; C: Paragraph-set with non-vector children (string)
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children "not a vector"}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children])) "children is now a vector")))
+
+(t/deftest migration-0025-paragraph-set-item-not-map
+  ;; C: Paragraph-set with non-map item in children vector
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children ["not a map"]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "paragraph" (get-in content [:children 0 :children 0 :type])) "non-map item replaced with default paragraph")))
+
+(t/deftest migration-0025-paragraph-set-mixed-valid-nil-non-map
+  ;; C: Paragraph-set with mix of valid paragraphs, nil, and non-map items
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children [{:text "ok"}]}
+                                                       nil
+                                                       "not-a-map"
+                                                       {:type "paragraph"
+                                                        :children [{:text "also ok"}]}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        paragraphs (get-in shape [:content :children 0 :children])]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= 4 (count paragraphs)) "all items preserved as paragraphs")
+    (t/is (= "paragraph" (:type (nth paragraphs 0))) "valid paragraph preserved")
+    (t/is (= "ok" (:text (get-in (nth paragraphs 0) [:children 0]))) "valid span text preserved")
+    (t/is (= "paragraph" (:type (nth paragraphs 1))) "nil replaced with default paragraph")
+    (t/is (= "paragraph" (:type (nth paragraphs 2))) "non-map replaced with default paragraph")
+    (t/is (= "paragraph" (:type (nth paragraphs 3))) "valid paragraph preserved")
+    (t/is (= "also ok" (:text (get-in (nth paragraphs 3) [:children 0]))) "valid span text preserved")))
+
+(t/deftest migration-0025-paragraph-set-wrong-type
+  ;; C: Paragraph-set with wrong :type
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph"
+                                            :children []}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "paragraph-set" (get-in content [:children 0 :type])) "wrong type replaced with default paragraph-set")))
+
+;; ============================================================================
+;; Category D: Level 3 (paragraph) variants
+;; ============================================================================
+
+(t/deftest migration-0025-paragraph-nil-children
+  ;; D: Paragraph with nil children key
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children 0 :children])) "paragraph children is a vector")
+    (t/is (pos? (count (get-in content [:children 0 :children 0 :children]))) "has at least one span")))
+
+(t/deftest migration-0025-paragraph-non-vector-children-map
+  ;; D: Paragraph with non-vector children (map) - GAP: should repair
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children {:invalid "map"}}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children 0 :children])) "paragraph children is now a vector")
+    (t/is (= "" (get-in content [:children 0 :children 0 :children 0 :text])) "seeded with default span")))
+
+(t/deftest migration-0025-paragraph-non-vector-children-string
+  ;; D: Paragraph with non-vector children (string) - GAP: should repair
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children "not a vector"}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (vector? (get-in content [:children 0 :children 0 :children])) "paragraph children is now a vector")))
+
+(t/deftest migration-0025-paragraph-item-not-map
+  ;; D: Paragraph with non-map item in children vector
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children ["not a map"]}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "" (get-in content [:children 0 :children 0 :children 0 :text])) "non-map item replaced with default span")))
+
+(t/deftest migration-0025-paragraph-wrong-type
+  ;; D: Paragraph with wrong :type
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "span"
+                                                        :text "hello"}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "paragraph" (get-in content [:children 0 :children 0 :type])) "wrong type replaced with default paragraph")))
+
+(t/deftest migration-0025-paragraph-valid-spans-preserved
+  ;; D: Paragraph with valid spans should be preserved
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children [{:text "hello"}
+                                                                   {:text "world"}]}]}]})}}}}
+        original-spans (get-in data [:pages-index page-id :objects shape-id :content :children 0 :children 0 :children])
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= 2 (count (get-in content [:children 0 :children 0 :children]))) "both spans preserved")
+    (t/is (= original-spans (get-in content [:children 0 :children 0 :children])) "spans unchanged")))
+
+;; ============================================================================
+;; Category E: Preservation tests
+;; ============================================================================
+
+(t/deftest migration-0025-root-attrs-preserved-level2-repair
+  ;; E: Root-level attrs preserved when level 2 repaired
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :vertical-align "bottom"
+                                :children [{:type "paragraph-set"
+                                            :children []}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "bottom" (:vertical-align content)) "root attrs preserved during level 2 repair")))
+
+(t/deftest migration-0025-paragraph-set-attrs-preserved
+  ;; E: Paragraph-set attrs preserved when repaired at level 2
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :custom-attr "preserve-me"
+                                            :children []}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "preserve-me" (get-in content [:children 0 :custom-attr])) "paragraph-set attrs preserved")))
+
+(t/deftest migration-0025-paragraph-attrs-preserved
+  ;; E: Paragraph attrs preserved when repaired at level 3
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :text-align "center"
+                                                        :children []}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= "center" (get-in content [:children 0 :children 0 :text-align])) "paragraph attrs preserved")))
+
+;; ============================================================================
+;; Category F: Multi-item tests
+;; ============================================================================
+
+(t/deftest migration-0025-multiple-paragraphs-mixed-valid-broken
+  ;; F: Multiple paragraphs within one paragraph-set, mix of valid and broken
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children [{:text "valid"}]}
+                                                       {:type "paragraph"
+                                                        :children []}
+                                                       {:type "paragraph"
+                                                        :children [{:text "also valid"}]}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= 3 (count (get-in content [:children 0 :children]))) "all three paragraphs preserved")
+    (t/is (= "valid" (get-in content [:children 0 :children 0 :children 0 :text])) "first paragraph preserved")
+    (t/is (= "" (get-in content [:children 0 :children 1 :children 0 :text])) "second paragraph repaired")
+    (t/is (= "also valid" (get-in content [:children 0 :children 2 :children 0 :text])) "third paragraph preserved")))
+
+(t/deftest migration-0025-multiple-spans-all-preserved
+  ;; F: Multiple spans within one paragraph (all should be preserved)
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root"
+                                :children [{:type "paragraph-set"
+                                            :children [{:type "paragraph"
+                                                        :children [{:text "span1"}
+                                                                   {:text "span2"}
+                                                                   {:text "span3"}]}]}]})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape    (get-in data' [:pages-index page-id :objects shape-id])
+        content  (:content shape)]
+
+    (t/is (cts/valid-shape? shape) "repaired shape is valid")
+    (t/is (= 3 (count (get-in content [:children 0 :children 0 :children]))) "all spans preserved")
+    (t/is (= "span1" (get-in content [:children 0 :children 0 :children 0 :text])))
+    (t/is (= "span2" (get-in content [:children 0 :children 0 :children 1 :text])))
+    (t/is (= "span3" (get-in content [:children 0 :children 0 :children 2 :text])))))
+
+;; ============================================================================
+;; Category G: Container coverage
+;; ============================================================================
+
+(t/deftest migration-0025-multiple-pages-broken-shapes
+  ;; G: Multiple pages, each with broken shapes
+  (let [shape-id-1 (uuid/next)
+        shape-id-2 (uuid/next)
+        page-id-1  (uuid/next)
+        page-id-2  (uuid/next)
+        data       {:pages-index
+                    {page-id-1
+                     {:objects
+                      {shape-id-1 (make-text-shape-with-content
+                                   shape-id-1
+                                   {:type "root" :children []})}}
+                     page-id-2
+                     {:objects
+                      {shape-id-2 (make-text-shape-with-content
+                                   shape-id-2
+                                   {:type "root" :children []})}}}}
+        data'      (cfm/migrate-data data "0025-repair-empty-text-content")
+        shape-1    (get-in data' [:pages-index page-id-1 :objects shape-id-1])
+        shape-2    (get-in data' [:pages-index page-id-2 :objects shape-id-2])]
+
+    (t/is (cts/valid-shape? shape-1) "first page shape is valid")
+    (t/is (cts/valid-shape? shape-2) "second page shape is valid")
+    (t/is (pos? (count (get-in shape-1 [:content :children]))) "first page shape repaired")
+    (t/is (pos? (count (get-in shape-2 [:content :children]))) "second page shape repaired")))
+
+(t/deftest migration-0025-container-without-objects
+  ;; G: Container without :objects key should not crash
+  (let [page-id (uuid/next)
+        data    {:pages-index
+                 {page-id {}}}
+        data'   (cfm/migrate-data data "0025-repair-empty-text-content")]
+
+    (t/is (= data data') "container without objects is unchanged")))
+
+;; ============================================================================
+;; Category H: Idempotency
+;; ============================================================================
+
+(t/deftest migration-0025-already-repaired-unchanged
+  ;; H: Already-repaired content unchanged (run migration twice)
+  (let [shape-id (uuid/next)
+        page-id  (uuid/next)
+        data     {:pages-index
+                  {page-id
+                   {:objects
+                    {shape-id (make-text-shape-with-content
+                               shape-id
+                               {:type "root" :children []})}}}}
+        data'    (cfm/migrate-data data "0025-repair-empty-text-content")
+        data''   (cfm/migrate-data data' "0025-repair-empty-text-content")
+        shape'   (get-in data' [:pages-index page-id :objects shape-id])
+        shape''  (get-in data'' [:pages-index page-id :objects shape-id])]
+
+    (t/is (cts/valid-shape? shape') "first repair produces valid shape")
+    (t/is (cts/valid-shape? shape'') "second repair produces valid shape")
+    (t/is (= shape' shape'') "migration is idempotent")))
diff --git a/common/test/common_tests/files_migrations_test.cljc b/common/test/common_tests/files_migrations_test.cljc
index 3f6bd635fa..36ff3a09e2 100644
--- a/common/test/common_tests/files_migrations_test.cljc
+++ b/common/test/common_tests/files_migrations_test.cljc
@@ -8,7 +8,6 @@
   (:require
    [app.common.data :as d]
    [app.common.files.migrations :as cfm]
-   [app.common.pprint :as pp]
    [app.common.types.file :as ctf]
    [app.common.uuid :as uuid]
    [clojure.test :as t]))
diff --git a/common/test/common_tests/fressian_test.clj b/common/test/common_tests/fressian_test.clj
index 9af54464a5..3eda0f34d4 100644
--- a/common/test/common_tests/fressian_test.clj
+++ b/common/test/common_tests/fressian_test.clj
@@ -21,7 +21,8 @@
   (:import
    java.time.Instant
    java.time.OffsetDateTime
-   java.time.ZoneOffset))
+   java.time.ZoneOffset
+   java.util.UUID))
 
 ;; ---------------------------------------------------------------------------
 ;; Helpers
@@ -524,3 +525,18 @@
     (t/is (d/ordered-map? rt))
     (t/is (= om rt))
     (t/is (= (keys om) (keys rt)))))
+
+(t/deftest decode-rejects-excessive-recursion-depth
+  ;; N2-01: deeply nested structures must be rejected before stack overflow
+  (let [depth  (+ fres/max-read-depth 50)
+        data   (reduce (fn [acc _i] [acc])
+                       :leaf
+                       (range depth))
+        encoded (fres/encode data)]
+    (try
+      (fres/decode encoded)
+      (t/is false "expected exception for excessive recursion depth")
+      (catch clojure.lang.ExceptionInfo e
+        (let [d (ex-data e)]
+          (t/is (= :validation (:type d)))
+          (t/is (= :max-read-depth-reached (:code d))))))))
diff --git a/common/test/common_tests/geom_bounds_layout_nil_test.cljc b/common/test/common_tests/geom_bounds_layout_nil_test.cljc
new file mode 100644
index 0000000000..db070ce4f4
--- /dev/null
+++ b/common/test/common_tests/geom_bounds_layout_nil_test.cljc
@@ -0,0 +1,213 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns common-tests.geom-bounds-layout-nil-test
+  (:require
+   [app.common.data :as d]
+   [app.common.geom.bounds-map :as gbm]
+   [app.common.geom.point :as gpt]
+   [app.common.geom.rect :as grc]
+   [app.common.geom.shapes.flex-layout.bounds :as fb]
+   [app.common.geom.shapes.grid-layout.bounds :as gb]
+   [app.common.geom.shapes.min-size-layout :as msl]
+   [app.common.types.shape :as cts]
+   [app.common.types.shape.layout :as ctl]
+   [app.common.uuid :as uuid]
+   [clojure.test :as t]))
+
+;; ---- Helpers ----
+
+(defn- make-rect
+  [id x y w h]
+  (-> (cts/setup-shape {:id id
+                        :type :rect
+                        :name (str "rect-" id)
+                        :x x :y y :width w :height h})
+      (assoc :parent-id uuid/zero
+             :frame-id uuid/zero)))
+
+(defn- make-flex-frame
+  [id child-ids & {:keys [x y w h dir]
+                   :or {x 0 y 0 w 200 h 200 dir :row}}]
+  (-> (cts/setup-shape {:id id
+                        :type :frame
+                        :name (str "flex-" id)
+                        :layout :flex
+                        :layout-flex-dir dir
+                        :x x :y y :width w :height h})
+      (assoc :parent-id uuid/zero
+             :frame-id uuid/zero
+             :shapes (vec child-ids))))
+
+(defn- make-grid-frame
+  [id child-ids & {:keys [x y w h dir]
+                   :or {x 0 y 0 w 200 h 200 dir :row}}]
+  (let [cell-id (uuid/next)]
+    (-> (cts/setup-shape {:id id
+                          :type :frame
+                          :name (str "grid-" id)
+                          :layout :grid
+                          :layout-grid-dir dir
+                          :layout-grid-columns [{:type :flex :value 1}]
+                          :layout-grid-rows [{:type :flex :value 1}]
+                          :layout-grid-cells
+                          {cell-id {:id cell-id
+                                    :row 1
+                                    :row-span 1
+                                    :column 1
+                                    :column-span 1
+                                    :shapes (vec child-ids)}}
+                          :layout-padding-type :multiple
+                          :layout-padding {:p1 0 :p2 0 :p3 0 :p4 0}
+                          :layout-gap {:column-gap 0 :row-gap 0}
+                          :x x :y y :width w :height h})
+        (assoc :parent-id uuid/zero
+               :frame-id uuid/zero
+               :shapes (vec child-ids)))))
+
+(defn- make-objects
+  [shapes]
+  (let [shape-map (into {} (map (fn [s] [(:id s) s]) shapes))]
+    (reduce-kv (fn [m _id shape]
+                 (if (contains? shape :shapes)
+                   (reduce (fn [m' child-id]
+                             (assoc-in m' [child-id :parent-id] (:id shape)))
+                           m
+                           (:shapes shape))
+                   m))
+               shape-map
+               shape-map)))
+
+(defn- bounds-map-from-objects
+  "Build a bounds map from objects, optionally excluding some IDs."
+  [objects & {:keys [exclude-ids]}]
+  (let [full (gbm/objects->bounds-map objects)]
+    (if (seq exclude-ids)
+      (apply dissoc full exclude-ids)
+      full)))
+
+;; ---- Tests for flex layout bounds with nil bounds ----
+
+(t/deftest layout-content-points-with-missing-parent-bounds
+  (t/testing "layout-content-points returns nil when parent is not in bounds map"
+    (let [child-id (uuid/next)
+          parent-id (uuid/next)
+          child (make-rect child-id 10 10 50 50)
+          parent (make-flex-frame parent-id [child-id])
+          objects (make-objects [parent child])
+          bounds (bounds-map-from-objects objects :exclude-ids #{parent-id})]
+
+      (t/is (nil? (fb/layout-content-points bounds parent [child] objects))))))
+
+(t/deftest layout-content-points-with-missing-child-bounds
+  (t/testing "layout-content-points skips children with missing bounds"
+    (let [child1-id (uuid/next)
+          child2-id (uuid/next)
+          parent-id (uuid/next)
+          child1 (make-rect child1-id 10 10 50 50)
+          child2 (make-rect child2-id 70 10 50 50)
+          parent (make-flex-frame parent-id [child1-id child2-id])
+          objects (make-objects [parent child1 child2])
+          bounds (bounds-map-from-objects objects :exclude-ids #{child1-id})]
+
+      (let [result (fb/layout-content-points bounds parent [child1 child2] objects)]
+        (t/is (some? result))
+        ;; Only child2's bounds should be in the result
+        (t/is (pos? (count result)))))))
+
+(t/deftest layout-content-bounds-with-missing-parent-bounds
+  (t/testing "layout-content-bounds returns nil when parent is not in bounds map"
+    (let [child-id (uuid/next)
+          parent-id (uuid/next)
+          child (make-rect child-id 10 10 50 50)
+          parent (make-flex-frame parent-id [child-id])
+          objects (make-objects [parent child])
+          bounds (bounds-map-from-objects objects :exclude-ids #{parent-id})]
+
+      (t/is (nil? (fb/layout-content-bounds bounds parent [child] objects))))))
+
+;; ---- Tests for grid layout bounds with nil bounds ----
+
+(t/deftest grid-layout-content-points-with-missing-parent-bounds
+  (t/testing "grid layout-content-points returns nil when parent is not in bounds map"
+    (let [parent-id (uuid/next)
+          parent (make-grid-frame parent-id [])
+          objects (make-objects [parent])
+          bounds (bounds-map-from-objects objects :exclude-ids #{parent-id})
+          layout-data {:row-tracks [{:start-p (gpt/point 0 0) :size 100}]
+                       :column-tracks [{:start-p (gpt/point 0 0) :size 100}]}]
+
+      (t/is (nil? (gb/layout-content-points bounds parent layout-data))))))
+
+(t/deftest grid-layout-content-bounds-with-missing-parent-bounds
+  (t/testing "grid layout-content-bounds returns nil when parent is not in bounds map"
+    (let [parent-id (uuid/next)
+          parent (make-grid-frame parent-id [])
+          objects (make-objects [parent])
+          bounds (bounds-map-from-objects objects :exclude-ids #{parent-id})
+          layout-data {:row-tracks [{:start-p (gpt/point 0 0) :size 100}]
+                       :column-tracks [{:start-p (gpt/point 0 0) :size 100}]}]
+
+      (t/is (nil? (gb/layout-content-bounds bounds parent layout-data))))))
+
+;; ---- Tests for min-size-layout with nil bounds ----
+
+(t/deftest child-min-width-grid-with-missing-child-bounds
+  (t/testing "child-min-width falls back when grid layout child bounds are missing"
+    (let [grandchild-id (uuid/next)
+          child-id (uuid/next)
+          grandchild (make-rect grandchild-id 0 0 30 30)
+          child (-> (make-grid-frame child-id [grandchild-id] :w 100 :h 100)
+                    (assoc :layout-grid-dir :row
+                           :layout-item-h-sizing :fill))
+          objects (make-objects [child grandchild])
+          ;; Exclude grandchild from bounds to simulate missing entry
+          bounds (bounds-map-from-objects objects :exclude-ids #{grandchild-id})
+          child-bounds (grc/rect->points (grc/make-rect 0 0 100 100))]
+
+      (let [result (msl/child-min-width child child-bounds bounds objects)]
+        (t/is (= (ctl/child-min-width child) result))))))
+
+(t/deftest child-min-height-grid-with-missing-child-bounds
+  (t/testing "child-min-height falls back when grid layout child bounds are missing"
+    (let [grandchild-id (uuid/next)
+          child-id (uuid/next)
+          grandchild (make-rect grandchild-id 0 0 30 30)
+          child (-> (make-grid-frame child-id [grandchild-id] :w 100 :h 100)
+                    (assoc :layout-grid-dir :column
+                           :layout-item-v-sizing :fill))
+          objects (make-objects [child grandchild])
+          bounds (bounds-map-from-objects objects :exclude-ids #{grandchild-id})
+          child-bounds (grc/rect->points (grc/make-rect 0 0 100 100))]
+
+      (let [result (msl/child-min-height child child-bounds bounds objects)]
+        (t/is (= (ctl/child-min-height child) result))))))
+
+(t/deftest child-min-width-grid-with-present-child-bounds
+  (t/testing "child-min-width handles bounded children in a fill-width grid"
+    (let [grandchild-id (uuid/next)
+          child-id (uuid/next)
+          grandchild (make-rect grandchild-id 0 0 30 30)
+          child (-> (make-grid-frame child-id [grandchild-id] :w 100 :h 100)
+                    (assoc :layout-item-h-sizing :fill))
+          objects (make-objects [child grandchild])
+          bounds (bounds-map-from-objects objects)
+          child-bounds (grc/rect->points (grc/make-rect 0 0 100 100))]
+
+      (t/is (number? (msl/child-min-width child child-bounds bounds objects))))))
+
+(t/deftest child-min-height-grid-with-present-child-bounds
+  (t/testing "child-min-height handles bounded children in a fill-height grid"
+    (let [grandchild-id (uuid/next)
+          child-id (uuid/next)
+          grandchild (make-rect grandchild-id 0 0 30 30)
+          child (-> (make-grid-frame child-id [grandchild-id] :w 100 :h 100)
+                    (assoc :layout-item-v-sizing :fill))
+          objects (make-objects [child grandchild])
+          bounds (bounds-map-from-objects objects)
+          child-bounds (grc/rect->points (grc/make-rect 0 0 100 100))]
+
+      (t/is (number? (msl/child-min-height child child-bounds bounds objects))))))
diff --git a/common/test/common_tests/logic/comp_main_edit_breaks_copy_slots_test.cljc b/common/test/common_tests/logic/comp_main_edit_breaks_copy_slots_test.cljc
new file mode 100644
index 0000000000..03ceb6b8ee
--- /dev/null
+++ b/common/test/common_tests/logic/comp_main_edit_breaks_copy_slots_test.cljc
@@ -0,0 +1,221 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns common-tests.logic.comp-main-edit-breaks-copy-slots-test
+  (:require
+   [app.common.files.changes :as cpc]
+   [app.common.files.changes-builder :as pcb]
+   [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
+   [clojure.test :as t]))
+
+(t/use-fixtures :each thi/test-fixture)
+
+;; Main-side reorder and deletion preserve copy reference integrity and support
+;; exact undo across pages.
+(defn- setup-main
+  [file]
+  (-> file
+      (tho/add-simple-component :icon :icon-main :icon-child)
+      (tho/add-frame :row-main :name "Row")
+      (thc/instantiate-component :icon :icon-1 :parent-label :row-main)
+      (thc/instantiate-component :icon :icon-2 :parent-label :row-main)
+      (thc/instantiate-component :icon :icon-3 :parent-label :row-main)
+      (thc/make-component :row :row-main)))
+
+(defn- setup-file
+  []
+  (-> (thf/sample-file :file1)
+      (setup-main)
+      (thc/instantiate-component :row :row-copy :children-labels [:copy-1 :copy-2 :copy-3])))
+
+(defn- add-copy-page-metadata
+  [file]
+  (let [page-id  (thi/id :page2)
+        copy-id  (thi/id :copy-1)
+        flow-id  (thi/new-id! :copy-flow)
+        guide-id (thi/new-id! :copy-guide)]
+    (-> file
+        (ths/add-interaction :copy-2 :copy-1)
+        (assoc-in [:data :pages-index page-id :flows flow-id]
+                  {:id flow-id :name "Copy flow" :starting-frame copy-id})
+        (assoc-in [:data :pages-index page-id :guides guide-id]
+                  {:id guide-id :axis :x :position 10 :frame-id copy-id}))))
+
+;; Same structure, but with :row-copy on a second page: the propagated
+;; deletions then leave the page mounted in the changes builder.
+(defn- setup-cross-page-file
+  []
+  (-> (thf/sample-file :file1 :page-label :page1)
+      (setup-main)
+      (thf/add-sample-page :page2)
+      (thc/instantiate-component :row :row-copy :children-labels [:copy-1 :copy-2 :copy-3])
+      (add-copy-page-metadata)
+      (thf/switch-to-page :page1)))
+
+(defn- delete-changes
+  [file shape-label]
+  (let [page (thf/current-page file)]
+    (second (cls/generate-delete-shapes (pcb/empty-changes nil (:id page))
+                                        file
+                                        page
+                                        (:objects page)
+                                        #{(:id (ths/get-shape file shape-label))}
+                                        {}))))
+
+(defn- deleted-ids
+  [changes]
+  (->> (:redo-changes changes)
+       (filter #(= :del-obj (:type %)))
+       (map :id)))
+
+;; Deleting a nested sub-head of a COPY only hides it (deleted-subinstance).
+(t/deftest deleting-a-copy-subhead-only-hides-it
+  (let [file    (setup-file)
+        file'   (tho/delete-shape file :copy-1)
+        copy-1' (ths/get-shape file' :copy-1)]
+    (t/is (some? copy-1'))
+    (t/is (true? (:hidden copy-1')))))
+
+;; Reordering a nested sub-head within a COPY keeps referential integrity.
+(t/deftest reordering-a-copy-subhead-keeps-referential-integrity
+  (let [file     (setup-file)
+        page     (thf/current-page file)
+        copy-1   (ths/get-shape file :copy-1)
+        row-copy (ths/get-shape file :row-copy)
+        changes  (cls/generate-relocate (-> (pcb/empty-changes nil)
+                                            (pcb/with-page-id (:id page))
+                                            (pcb/with-objects (:objects page)))
+                                        (:id row-copy) 2 #{(:id copy-1)})
+        file'    (thf/apply-changes file changes)]
+    (t/is (some? (ths/get-shape file' :copy-2)))
+    (t/is (some? (ths/get-shape file' :copy-3)))))
+
+;; Main-side reorders remain valid while component sync realigns copy children.
+(t/deftest reordering-a-main-subhead-must-not-break-copies
+  (let [file     (setup-file)
+        page     (thf/current-page file)
+        row-main (ths/get-shape file :row-main)
+        icon-1   (ths/get-shape file :icon-1)
+        ;; move the main's first sub-head to the end (index 2)
+        changes  (cls/generate-relocate (-> (pcb/empty-changes nil)
+                                            (pcb/with-page-id (:id page))
+                                            (pcb/with-objects (:objects page)))
+                                        (:id row-main) 2 #{(:id icon-1)})
+        file'    (thf/apply-changes file changes)]
+    (t/is (some? (ths/get-shape file' :copy-1)))
+    (t/is (some? (ths/get-shape file' :copy-2)))
+    (t/is (some? (ths/get-shape file' :copy-3)))))
+
+;; Main-side deletions remove corresponding copy shapes and dangling refs.
+(t/deftest deleting-a-main-subhead-must-not-break-copies
+  (let [file  (setup-file)
+        file' (tho/delete-shape file :icon-1)]
+    (t/is (nil? (ths/get-shape file' :copy-1)))
+    (t/is (some? (ths/get-shape file' :copy-2)))
+    (t/is (some? (ths/get-shape file' :copy-3)))))
+
+;; Each propagated shape is deleted once so undo restores a valid tree.
+(t/deftest propagated-deletions-are-emitted-once
+  (let [file    (setup-file)
+        changes (delete-changes file :icon-1)
+        ids     (deleted-ids changes)]
+    (t/is (= (count ids) (count (distinct ids))))))
+
+;; Empty main groups propagate deletion to their corresponding copy groups.
+(t/deftest emptied-main-groups-propagate-to-copies
+  (let [file  (-> (thf/sample-file :file1)
+                  (tho/add-simple-component :icon :icon-main :icon-child)
+                  (tho/add-frame :row-main :name "Row")
+                  (tho/add-group :grp-main :parent-label :row-main)
+                  (thc/instantiate-component :icon :icon-1 :parent-label :grp-main)
+                  (thc/make-component :row :row-main)
+                  (thc/instantiate-component :row :row-copy :children-labels [:grp-copy])
+                  (tho/delete-shape :icon-1))]
+    (t/is (nil? (ths/get-shape file :grp-main)))
+    (t/is (nil? (ths/get-shape file :grp-copy)))))
+
+;; Propagated deletion supersedes hiding the same selected copy shape.
+(t/deftest propagated-deletions-are-not-hidden-first
+  (let [file    (setup-file)
+        page    (thf/current-page file)
+        icon-1  (ths/get-shape file :icon-1)
+        copy-1  (ths/get-shape file :copy-1)
+        [_ changes] (cls/generate-delete-shapes (pcb/empty-changes nil (:id page))
+                                                file page (:objects page)
+                                                #{(:id icon-1) (:id copy-1)}
+                                                {})
+        file'   (thf/apply-changes file changes)]
+    (t/is (nil? (ths/get-shape file' :copy-1)))
+    (t/is (not (contains? (->> (:redo-changes changes)
+                               (filter #(= :mod-obj (:type %)))
+                               (map :id)
+                               (set))
+                          (:id copy-1))))))
+
+;; Cross-page propagation restores the exact original structure on undo.
+(t/deftest deleting-a-main-subhead-propagates-across-pages
+  (let [file      (setup-cross-page-file)
+        changes   (delete-changes file :icon-1)
+        ids       (deleted-ids changes)
+        file'     (thf/apply-changes file changes)
+        file''    (thf/apply-undo-changes file' changes)
+        page2-id  (thi/id :page2)
+        copy-2'   (ths/get-shape file' :copy-2 :page-label :page2)]
+    (t/is (= (count ids) (count (distinct ids))))
+    (t/is (nil? (ths/get-shape file' :copy-1 :page-label :page2)))
+    (t/is (some? (ths/get-shape file' :copy-2 :page-label :page2)))
+    (t/is (some? (ths/get-shape file' :copy-3 :page-label :page2)))
+    (t/is (empty? (:interactions copy-2')))
+    (t/is (nil? (get-in file' [:data :pages-index page2-id :flows (thi/id :copy-flow)])))
+    (t/is (nil? (get-in file' [:data :pages-index page2-id :guides (thi/id :copy-guide)])))
+    (t/is (= (:pages-index (:data file))
+             (:pages-index (:data file''))))))
+
+;; A persisted main reorder remains valid before and after a later copy edit.
+(t/deftest main-reorder-keeps-copies-valid-for-later-edits
+  (let [file     (setup-file)
+        page     (thf/current-page file)
+        row-main (ths/get-shape file :row-main)
+        icon-1   (ths/get-shape file :icon-1)
+        reorder  (cls/generate-relocate (-> (pcb/empty-changes nil)
+                                            (pcb/with-page-id (:id page))
+                                            (pcb/with-objects (:objects page)))
+                                        (:id row-main) 2 #{(:id icon-1)})
+        ;; Apply without validation to model persisted intermediate state.
+        file'    (thf/apply-changes file reorder :validate? false)]
+    (thf/validate-file! file')
+    (let [file''  (tho/delete-shape file' :copy-2)
+          copy-2' (ths/get-shape file'' :copy-2)]
+      (t/is (some? copy-2'))
+      (t/is (true? (:hidden copy-2'))))))
+
+;; Copy ordering rejects local reorders unless component sync owns the operation.
+(t/deftest reorder-children-change-cannot-alter-copies
+  (let [file      (setup-file)
+        page      (thf/current-page file)
+        row-copy  (ths/get-shape file :row-copy)
+        scrambled (vec (reverse (:shapes row-copy)))
+        change    {:type :reorder-children
+                   :page-id (:id page)
+                   :parent-id (:id row-copy)
+                   :shapes scrambled}
+        get-order (fn [data]
+                    (get-in data [:pages-index (:id page)
+                                  :objects (:id row-copy) :shapes]))]
+    ;; without allow-altering-copies the reorder is rejected
+    (t/is (= (:shapes row-copy)
+             (get-order (cpc/process-changes (:data file) [change] false))))
+    ;; the sync engine can still restructure copies explicitly
+    (t/is (= scrambled
+             (get-order (cpc/process-changes
+                         (:data file)
+                         [(assoc change :allow-altering-copies true)]
+                         false))))))
diff --git a/common/test/common_tests/math_test.cljc b/common/test/common_tests/math_test.cljc
new file mode 100644
index 0000000000..e644101895
--- /dev/null
+++ b/common/test/common_tests/math_test.cljc
@@ -0,0 +1,59 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns common-tests.math-test
+  (:require
+   [app.common.math :as mth]
+   [clojure.test :as t]))
+
+(t/deftest finite?-number-test
+  (t/testing "finite? returns true for positive integer"
+    (t/is (true? (mth/finite? 16))))
+
+  (t/testing "finite? returns true for zero"
+    (t/is (true? (mth/finite? 0))))
+
+  (t/testing "finite? returns true for negative float"
+    (t/is (true? (mth/finite? -42.5))))
+
+  (t/testing "finite? returns true for very large number"
+    (t/is (true? (mth/finite? 1e308)))))
+
+(t/deftest finite?-string-test
+  (t/testing "finite? returns false for numeric string"
+    (t/is (false? (mth/finite? "16"))))
+
+  (t/testing "finite? returns false for non-numeric string"
+    (t/is (false? (mth/finite? "abc"))))
+
+  (t/testing "finite? returns false for empty string"
+    (t/is (false? (mth/finite? ""))))
+
+  (t/testing "finite? returns false for string with spaces"
+    (t/is (false? (mth/finite? "  ")))))
+
+(t/deftest finite?-nil-test
+  (t/testing "finite? returns false for nil"
+    (t/is (false? (mth/finite? nil)))))
+
+(t/deftest finite?-other-types-test
+  (t/testing "finite? returns false for keyword"
+    (t/is (false? (mth/finite? :foo))))
+
+  (t/testing "finite? returns false for vector"
+    (t/is (false? (mth/finite? [1 2 3]))))
+
+  (t/testing "finite? returns false for map"
+    (t/is (false? (mth/finite? {:a 1})))))
+
+#_:clj-kondo/ignore
+(t/deftest finite?-nan-test
+  #?(:cljs
+     (t/testing "finite? returns false for js/NaN (CLJS)"
+       (t/is (false? (mth/finite? js/NaN))))
+     :clj
+     (t/testing "finite? returns false for Double/NaN (CLJ)"
+       (t/is (false? (mth/finite? Double/NaN))))))
diff --git a/common/test/common_tests/runner.cljc b/common/test/common_tests/runner.cljc
index 7738c5dd9e..b24b045e1a 100644
--- a/common/test/common_tests/runner.cljc
+++ b/common/test/common_tests/runner.cljc
@@ -18,10 +18,12 @@
    [common-tests.data-test]
    [common-tests.files-builder-test]
    [common-tests.files-changes-test]
+   [common-tests.files-migrations-0025-test]
    [common-tests.files-migrations-test]
    [common-tests.files.shapes-builder-test]
    [common-tests.files.validate-test]
    [common-tests.geom-align-test]
+   [common-tests.geom-bounds-layout-nil-test]
    [common-tests.geom-bounds-map-test]
    [common-tests.geom-flex-layout-test]
    [common-tests.geom-grid-layout-test]
@@ -46,6 +48,7 @@
    [common-tests.logic.chained-propagation-test]
    [common-tests.logic.comp-creation-test]
    [common-tests.logic.comp-detach-with-nested-test]
+   [common-tests.logic.comp-main-edit-breaks-copy-slots-test]
    [common-tests.logic.comp-remove-swap-slots-test]
    [common-tests.logic.comp-reset-test]
    [common-tests.logic.comp-sync-test]
@@ -58,6 +61,7 @@
    [common-tests.logic.swap-as-override-test]
    [common-tests.logic.token-test]
    [common-tests.logic.variants-switch-test]
+   [common-tests.math-test]
    [common-tests.media-test]
    [common-tests.path-names-test]
    [common-tests.record-test]
@@ -73,8 +77,8 @@
    [common-tests.types.container-test]
    [common-tests.types.fill-test]
    [common-tests.types.modifiers-test]
-   [common-tests.types.nitrate-permissions-test]
    [common-tests.types.objects-map-test]
+   [common-tests.types.organization-test]
    [common-tests.types.path-data-test]
    [common-tests.types.shape-decode-encode-test]
    [common-tests.types.shape-interactions-test]
@@ -92,9 +96,11 @@
    'common-tests.data-test
    'common-tests.files-changes-test
    'common-tests.files-builder-test
+   'common-tests.files-migrations-0025-test
    'common-tests.files-migrations-test
    'common-tests.files.validate-test
    'common-tests.geom-align-test
+   'common-tests.geom-bounds-layout-nil-test
    'common-tests.geom-bounds-map-test
    'common-tests.geom-flex-layout-test
    'common-tests.geom-grid-layout-test
@@ -119,6 +125,7 @@
    'common-tests.logic.chained-propagation-test
    'common-tests.logic.comp-creation-test
    'common-tests.logic.comp-detach-with-nested-test
+   'common-tests.logic.comp-main-edit-breaks-copy-slots-test
    'common-tests.logic.comp-remove-swap-slots-test
    'common-tests.logic.comp-reset-test
    'common-tests.logic.comp-sync-test
@@ -131,6 +138,7 @@
    'common-tests.logic.swap-as-override-test
    'common-tests.logic.token-test
    'common-tests.logic.variants-switch-test
+   'common-tests.math-test
    'common-tests.media-test
    'common-tests.path-names-test
    'common-tests.record-test
@@ -146,8 +154,8 @@
    'common-tests.types.container-test
    'common-tests.types.fill-test
    'common-tests.types.modifiers-test
-   'common-tests.types.nitrate-permissions-test
    'common-tests.types.objects-map-test
+   'common-tests.types.organization-test
    'common-tests.types.path-data-test
    'common-tests.types.shape-decode-encode-test
    'common-tests.types.shape-interactions-test
diff --git a/common/test/common_tests/types/nitrate_permissions_test.cljc b/common/test/common_tests/types/nitrate_permissions_test.cljc
deleted file mode 100644
index 795b94cf74..0000000000
--- a/common/test/common_tests/types/nitrate_permissions_test.cljc
+++ /dev/null
@@ -1,178 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns common-tests.types.nitrate-permissions-test
-  (:require
-   [app.common.types.nitrate-permissions :as nitrate-perms]
-   [clojure.test :as t]))
-
-(def org-perms
-  {:owner-id :owner
-   :permissions {:create-teams "any"
-                 :delete-teams "onlyOwners"
-                 :send-invitations "ownersAndAdmins"}})
-
-(t/deftest unknown-action-is-denied
-  (t/is (false? (nitrate-perms/allowed? :unknown
-                                        {:org-perms org-perms
-                                         :profile-id :member
-                                         :team-perms {:is-admin true}}))))
-
-(t/deftest org-owner-is-allowed-for-create-and-delete
-  (t/is (true? (nitrate-perms/allowed? :create-team
-                                       {:org-perms org-perms
-                                        :profile-id :owner
-                                        :team-perms {:is-admin false}})))
-  (t/is (true? (nitrate-perms/allowed? :delete-team
-                                       {:org-perms org-perms
-                                        :profile-id :owner
-                                        :team-perms {:is-admin false}}))))
-
-(t/deftest create-team-permission-rules
-  (t/is (true? (nitrate-perms/allowed? :create-team
-                                       {:org-perms org-perms
-                                        :profile-id :member
-                                        :team-perms {:is-admin false}})))
-  (t/is (false? (nitrate-perms/allowed? :create-team
-                                        {:org-perms (assoc org-perms :permissions {:create-teams "none"
-                                                                                   :delete-teams "onlyOwners"})
-                                         :profile-id :member
-                                         :team-perms {:is-admin false}}))))
-
-(t/deftest delete-team-onlyowners-allows-only-team-owners
-  (t/is (true? (nitrate-perms/allowed? :delete-team
-                                       {:org-perms org-perms
-                                        :profile-id :member
-                                        :team-perms {:is-owner true :is-admin true}})))
-  (t/is (false? (nitrate-perms/allowed? :delete-team
-                                        {:org-perms org-perms
-                                         :profile-id :member
-                                         :team-perms {:is-admin true}})))
-  (t/is (false? (nitrate-perms/allowed? :delete-team
-                                        {:org-perms (assoc org-perms :permissions {:create-teams "any"
-                                                                                   :delete-teams "invalid-value"})
-                                         :profile-id :member
-                                         :team-perms {:is-admin true}}))))
-
-(t/deftest delete-team-onlyme-still-allows-org-owner
-  (let [only-me-org (assoc org-perms :permissions {:create-teams "any"
-                                                   :delete-teams "onlyMe"})]
-    (t/is (true? (nitrate-perms/allowed? :delete-team
-                                         {:org-perms only-me-org
-                                          :profile-id :owner
-                                          :team-perms {:is-owner false :is-admin false}})))
-    (t/is (false? (nitrate-perms/allowed? :delete-team
-                                          {:org-perms only-me-org
-                                           :profile-id :member
-                                           :team-perms {:is-owner true :is-admin true}})))))
-
-(t/deftest move-team-always-allows-any-org-owner-or-all-users
-  (let [always-org (assoc org-perms :permissions {:create-teams "any"
-                                                  :delete-teams "onlyOwners"
-                                                  :move-teams "always"})]
-    ;; Org owner should always be allowed
-    (t/is (true? (nitrate-perms/allowed? :move-team
-                                         {:org-perms always-org
-                                          :profile-id :owner
-                                          :team-perms {}})))
-    ;; Regular member should be allowed when move-teams is "always"
-    (t/is (true? (nitrate-perms/allowed? :move-team
-                                         {:org-perms always-org
-                                          :profile-id :member
-                                          :team-perms {}})))))
-
-(t/deftest move-team-myorganizations-allows-only-within-same-owner
-  (let [my-orgs (assoc org-perms :permissions {:create-teams "any"
-                                               :delete-teams "onlyOwners"
-                                               :move-teams "myOrganizations"})]
-    ;; Org owner must also stay within same-owner organizations
-    (t/is (false? (nitrate-perms/allowed? :move-team
-                                          {:org-perms my-orgs
-                                           :profile-id :owner
-                                           :team-perms {}
-                                           :target-org-same-owner? false})))
-    (t/is (true? (nitrate-perms/allowed? :move-team
-                                         {:org-perms my-orgs
-                                          :profile-id :owner
-                                          :team-perms {}
-                                          :target-org-same-owner? true})))
-    ;; Regular member should be allowed only if target has same owner
-    (t/is (true? (nitrate-perms/allowed? :move-team
-                                         {:org-perms my-orgs
-                                          :profile-id :member
-                                          :team-perms {}
-                                          :target-org-same-owner? true})))
-    (t/is (false? (nitrate-perms/allowed? :move-team
-                                          {:org-perms my-orgs
-                                           :profile-id :member
-                                           :team-perms {}
-                                           :target-org-same-owner? false})))))
-
-(t/deftest move-team-never-denies-all
-  (let [never-org (assoc org-perms :permissions {:create-teams "any"
-                                                 :delete-teams "onlyOwners"
-                                                 :move-teams "never"})]
-    ;; Even org owner should be denied
-    (t/is (false? (nitrate-perms/allowed? :move-team
-                                          {:org-perms never-org
-                                           :profile-id :owner
-                                           :team-perms {}})))
-    ;; Regular member should be denied
-    (t/is (false? (nitrate-perms/allowed? :move-team
-                                          {:org-perms never-org
-                                           :profile-id :member
-                                           :team-perms {}})))))
-
-(t/deftest move-team-defaults-to-always
-  (let [default-org (assoc org-perms :permissions {:create-teams "any"
-                                                   :delete-teams "onlyOwners"})]
-    ;; Should default to "always" when not specified
-    (t/is (true? (nitrate-perms/allowed? :move-team
-                                         {:org-perms default-org
-                                          :profile-id :member
-                                          :team-perms {}})))))
-
-(t/deftest send-invitations-defaults-to-owners-and-admins
-  (let [default-org (assoc org-perms :permissions {:create-teams "any"
-                                                   :delete-teams "onlyOwners"})]
-    (t/is (true? (nitrate-perms/allowed? :send-invitations
-                                         {:org-perms default-org
-                                          :profile-id :owner
-                                          :team-perms {:is-owner true :is-admin false}})))
-    (t/is (true? (nitrate-perms/allowed? :send-invitations
-                                         {:org-perms default-org
-                                          :profile-id :member
-                                          :team-perms {:is-owner false :is-admin true}})))
-    (t/is (false? (nitrate-perms/allowed? :send-invitations
-                                          {:org-perms default-org
-                                           :profile-id :member
-                                           :team-perms {:is-owner false :is-admin false}})))))
-
-(t/deftest send-invitations-owners-allows-only-team-owners
-  (let [only-owners-org (assoc org-perms :permissions {:create-teams "any"
-                                                       :delete-teams "onlyOwners"
-                                                       :send-invitations "owners"})]
-    (t/is (true? (nitrate-perms/allowed? :send-invitations
-                                         {:org-perms only-owners-org
-                                          :profile-id :member
-                                          :team-perms {:is-owner true :is-admin true}})))
-    (t/is (false? (nitrate-perms/allowed? :send-invitations
-                                          {:org-perms only-owners-org
-                                           :profile-id :owner
-                                           :team-perms {:is-owner false :is-admin false}})))
-    (t/is (false? (nitrate-perms/allowed? :send-invitations
-                                          {:org-perms only-owners-org
-                                           :profile-id :member
-                                           :team-perms {:is-owner false :is-admin true}})))))
-
-(t/deftest send-invitations-invalid-value-is-denied
-  (let [invalid-org (assoc org-perms :permissions {:create-teams "any"
-                                                   :delete-teams "onlyOwners"
-                                                   :send-invitations "invalid-value"})]
-    (t/is (false? (nitrate-perms/allowed? :send-invitations
-                                          {:org-perms invalid-org
-                                           :profile-id :member
-                                           :team-perms {:is-owner true :is-admin true}})))))
diff --git a/common/test/common_tests/types/organization_test.cljc b/common/test/common_tests/types/organization_test.cljc
new file mode 100644
index 0000000000..e6a24aeb00
--- /dev/null
+++ b/common/test/common_tests/types/organization_test.cljc
@@ -0,0 +1,178 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns common-tests.types.organization-test
+  (:require
+   [app.common.types.organization :as cto]
+   [clojure.test :as t]))
+
+(def organization-perms
+  {:owner-id :owner
+   :permissions {:create-teams "any"
+                 :delete-teams "onlyOwners"
+                 :send-invitations "ownersAndAdmins"}})
+
+(t/deftest unknown-action-is-denied
+  (t/is (false? (cto/allowed? :unknown
+                              {:organization-perms organization-perms
+                               :profile-id :member
+                               :team-perms {:is-admin true}}))))
+
+(t/deftest organization-owner-is-allowed-for-create-and-delete
+  (t/is (true? (cto/allowed? :create-team
+                             {:organization-perms organization-perms
+                              :profile-id :owner
+                              :team-perms {:is-admin false}})))
+  (t/is (true? (cto/allowed? :delete-team
+                             {:organization-perms organization-perms
+                              :profile-id :owner
+                              :team-perms {:is-admin false}}))))
+
+(t/deftest create-team-permission-rules
+  (t/is (true? (cto/allowed? :create-team
+                             {:organization-perms organization-perms
+                              :profile-id :member
+                              :team-perms {:is-admin false}})))
+  (t/is (false? (cto/allowed? :create-team
+                              {:organization-perms (assoc organization-perms :permissions {:create-teams "none"
+                                                                                           :delete-teams "onlyOwners"})
+                               :profile-id :member
+                               :team-perms {:is-admin false}}))))
+
+(t/deftest delete-team-onlyowners-allows-only-team-owners
+  (t/is (true? (cto/allowed? :delete-team
+                             {:organization-perms organization-perms
+                              :profile-id :member
+                              :team-perms {:is-owner true :is-admin true}})))
+  (t/is (false? (cto/allowed? :delete-team
+                              {:organization-perms organization-perms
+                               :profile-id :member
+                               :team-perms {:is-admin true}})))
+  (t/is (false? (cto/allowed? :delete-team
+                              {:organization-perms (assoc organization-perms :permissions {:create-teams "any"
+                                                                                           :delete-teams "invalid-value"})
+                               :profile-id :member
+                               :team-perms {:is-admin true}}))))
+
+(t/deftest delete-team-onlyme-still-allows-organization-owner
+  (let [only-me-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                     :delete-teams "onlyMe"})]
+    (t/is (true? (cto/allowed? :delete-team
+                               {:organization-perms only-me-organization
+                                :profile-id :owner
+                                :team-perms {:is-owner false :is-admin false}})))
+    (t/is (false? (cto/allowed? :delete-team
+                                {:organization-perms only-me-organization
+                                 :profile-id :member
+                                 :team-perms {:is-owner true :is-admin true}})))))
+
+(t/deftest move-team-always-allows-any-organization-owner-or-all-users
+  (let [always-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                    :delete-teams "onlyOwners"
+                                                                    :move-teams "always"})]
+    ;; Organization owner should always be allowed
+    (t/is (true? (cto/allowed? :move-team
+                               {:organization-perms always-organization
+                                :profile-id :owner
+                                :team-perms {}})))
+    ;; Regular member should be allowed when move-teams is "always"
+    (t/is (true? (cto/allowed? :move-team
+                               {:organization-perms always-organization
+                                :profile-id :member
+                                :team-perms {}})))))
+
+(t/deftest move-team-myorganizations-allows-only-within-same-owner
+  (let [my-organizations (assoc organization-perms :permissions {:create-teams "any"
+                                                                 :delete-teams "onlyOwners"
+                                                                 :move-teams "myOrganizations"})]
+    ;; Organization owner must also stay within same-owner organizations
+    (t/is (false? (cto/allowed? :move-team
+                                {:organization-perms my-organizations
+                                 :profile-id :owner
+                                 :team-perms {}
+                                 :target-organization-same-owner? false})))
+    (t/is (true? (cto/allowed? :move-team
+                               {:organization-perms my-organizations
+                                :profile-id :owner
+                                :team-perms {}
+                                :target-organization-same-owner? true})))
+    ;; Regular member should be allowed only if target has same owner
+    (t/is (true? (cto/allowed? :move-team
+                               {:organization-perms my-organizations
+                                :profile-id :member
+                                :team-perms {}
+                                :target-organization-same-owner? true})))
+    (t/is (false? (cto/allowed? :move-team
+                                {:organization-perms my-organizations
+                                 :profile-id :member
+                                 :team-perms {}
+                                 :target-organization-same-owner? false})))))
+
+(t/deftest move-team-never-denies-all
+  (let [never-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                   :delete-teams "onlyOwners"
+                                                                   :move-teams "never"})]
+    ;; Even organization owner should be denied
+    (t/is (false? (cto/allowed? :move-team
+                                {:organization-perms never-organization
+                                 :profile-id :owner
+                                 :team-perms {}})))
+    ;; Regular member should be denied
+    (t/is (false? (cto/allowed? :move-team
+                                {:organization-perms never-organization
+                                 :profile-id :member
+                                 :team-perms {}})))))
+
+(t/deftest move-team-defaults-to-always
+  (let [default-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                     :delete-teams "onlyOwners"})]
+    ;; Should default to "always" when not specified
+    (t/is (true? (cto/allowed? :move-team
+                               {:organization-perms default-organization
+                                :profile-id :member
+                                :team-perms {}})))))
+
+(t/deftest send-invitations-defaults-to-owners-and-admins
+  (let [default-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                     :delete-teams "onlyOwners"})]
+    (t/is (true? (cto/allowed? :send-invitations
+                               {:organization-perms default-organization
+                                :profile-id :owner
+                                :team-perms {:is-owner true :is-admin false}})))
+    (t/is (true? (cto/allowed? :send-invitations
+                               {:organization-perms default-organization
+                                :profile-id :member
+                                :team-perms {:is-owner false :is-admin true}})))
+    (t/is (false? (cto/allowed? :send-invitations
+                                {:organization-perms default-organization
+                                 :profile-id :member
+                                 :team-perms {:is-owner false :is-admin false}})))))
+
+(t/deftest send-invitations-owners-allows-only-team-owners
+  (let [only-owners-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                         :delete-teams "onlyOwners"
+                                                                         :send-invitations "owners"})]
+    (t/is (true? (cto/allowed? :send-invitations
+                               {:organization-perms only-owners-organization
+                                :profile-id :member
+                                :team-perms {:is-owner true :is-admin true}})))
+    (t/is (false? (cto/allowed? :send-invitations
+                                {:organization-perms only-owners-organization
+                                 :profile-id :owner
+                                 :team-perms {:is-owner false :is-admin false}})))
+    (t/is (false? (cto/allowed? :send-invitations
+                                {:organization-perms only-owners-organization
+                                 :profile-id :member
+                                 :team-perms {:is-owner false :is-admin true}})))))
+
+(t/deftest send-invitations-invalid-value-is-denied
+  (let [invalid-organization (assoc organization-perms :permissions {:create-teams "any"
+                                                                     :delete-teams "onlyOwners"
+                                                                     :send-invitations "invalid-value"})]
+    (t/is (false? (cto/allowed? :send-invitations
+                                {:organization-perms invalid-organization
+                                 :profile-id :member
+                                 :team-perms {:is-owner true :is-admin true}})))))
diff --git a/common/test/common_tests/types/shape_decode_encode_test.cljc b/common/test/common_tests/types/shape_decode_encode_test.cljc
index 0068633d32..044c48ede3 100644
--- a/common/test/common_tests/types/shape_decode_encode_test.cljc
+++ b/common/test/common_tests/types/shape_decode_encode_test.cljc
@@ -146,3 +146,24 @@
          ;; (app.common.pprint/pprint shape-3)
          (= shape shape-3)))
      {:num 200})))
+
+(t/deftest shape-generator-key-presence
+  "The generator must produce the keys the schema declares required, even when
+  nilable. This is a targeted check for the attributes added to
+  `schema:shape-generic-attrs` and `schema:nilable-geom-attrs`."
+  (let [shapes (sg/sample (sg/generator schema:shape) {:size 200})
+        by-type (group-by :type shapes)]
+    ;; All shapes: rotation, flip-x, flip-y are base record fields, always
+    ;; present (possibly nil).
+    (doseq [shape shapes]
+      (t/is (contains? shape :rotation) "missing :rotation")
+      (t/is (contains? shape :flip-x) "missing :flip-x")
+      (t/is (contains? shape :flip-y) "missing :flip-y"))
+    ;; Bool and path: x/y/width/height are required-but-nilable in the
+    ;; schema. The generator must produce them (nil is a valid value).
+    (doseq [shape (concat (get by-type :bool [])
+                          (get by-type :path []))]
+      (t/is (contains? shape :x) "bool/path missing :x")
+      (t/is (contains? shape :y) "bool/path missing :y")
+      (t/is (contains? shape :width) "bool/path missing :width")
+      (t/is (contains? shape :height) "bool/path missing :height"))))
diff --git a/common/test/common_tests/types/shape_interactions_test.cljc b/common/test/common_tests/types/shape_interactions_test.cljc
index da056ae136..7daac0ab8a 100644
--- a/common/test/common_tests/types/shape_interactions_test.cljc
+++ b/common/test/common_tests/types/shape_interactions_test.cljc
@@ -10,6 +10,7 @@
    [app.common.geom.point :as gpt]
    [app.common.geom.rect :as grc]
    [app.common.geom.shapes :as gsh]
+   [app.common.geom.shapes.bounds :as gsb]
    [app.common.math :as mth]
    [app.common.types.shape :as cts]
    [app.common.types.shape.interactions :as ctsi]
@@ -1078,3 +1079,49 @@
             [overlay-pos snap] (ctsi/calc-overlay-position frame-relative base-frame objects base-frame base-frame overlay-frame frame-offset)]
         (t/is (= (gpt/point 18 22) overlay-pos))
         (t/is (= [:top :left] snap))))))
+
+(t/deftest calc-overlay-position-ignores-filter-bounds
+  ;; Regression for #9048: the overlay position must be computed from the
+  ;; destination frame selrect (the visible frame box), not from its
+  ;; filter-inflated object bounds. Shadows, blur, strokes or overflowing
+  ;; children make get-object-bounds larger than the selrect, which used to
+  ;; shift centered/right/bottom overlays by half that extra padding (the
+  ;; overlay appeared offset, e.g. "a bit to the left").
+  (let [base-frame     (cts/setup-shape {:type :frame :width 100 :height 100})
+        overlay-plain  (cts/setup-shape {:type :frame :width 30 :height 20})
+        ;; same selrect as overlay-plain, but with a drop shadow that widens
+        ;; and heightens its object bounds well beyond the selrect.
+        overlay-shadow (-> (cts/setup-shape {:type :frame :width 30 :height 20})
+                           (assoc :shadow [{:style :drop-shadow
+                                            :offset-x 0 :offset-y 0
+                                            :spread 10 :blur 0 :hidden false}]))
+        objects        {(:id base-frame) base-frame
+                        (:id overlay-plain) overlay-plain
+                        (:id overlay-shadow) overlay-shadow}
+        frame-offset   (gpt/point 5 5)
+        interaction    (-> ctsi/default-interaction
+                           (ctsi/set-action-type :open-overlay)
+                           (ctsi/set-position-relative-to (:id base-frame)))]
+
+    ;; Precondition: the shadow really does inflate the object bounds, so the
+    ;; assertions below are meaningful (otherwise the test would be vacuous).
+    (t/is (> (:width (gsb/get-object-bounds objects overlay-shadow))
+             (:width (:selrect overlay-shadow))))
+    (t/is (> (:height (gsb/get-object-bounds objects overlay-shadow))
+             (:height (:selrect overlay-shadow))))
+
+    ;; For every position type that depends on the overlay size, the computed
+    ;; position must be identical whether or not the destination frame has a
+    ;; bounds-inflating shadow.
+    (doseq [pos-type [:center :top-center :top-right :bottom-center :bottom-right]]
+      (let [i-plain  (-> interaction
+                         (ctsi/set-destination (:id overlay-plain))
+                         (ctsi/set-overlay-pos-type pos-type base-frame objects))
+            i-shadow (-> interaction
+                         (ctsi/set-destination (:id overlay-shadow))
+                         (ctsi/set-overlay-pos-type pos-type base-frame objects))
+            [pos-plain snap-plain]   (ctsi/calc-overlay-position i-plain base-frame objects base-frame base-frame overlay-plain frame-offset)
+            [pos-shadow snap-shadow] (ctsi/calc-overlay-position i-shadow base-frame objects base-frame base-frame overlay-shadow frame-offset)]
+        (t/testing (str "overlay position ignores filter bounds for " pos-type)
+          (t/is (= pos-plain pos-shadow))
+          (t/is (= snap-plain snap-shadow)))))))
diff --git a/common/test/common_tests/types/shape_layout_test.cljc b/common/test/common_tests/types/shape_layout_test.cljc
index 81bec62349..e655c66713 100644
--- a/common/test/common_tests/types/shape_layout_test.cljc
+++ b/common/test/common_tests/types/shape_layout_test.cljc
@@ -1211,7 +1211,29 @@
       ;; so shape-id-2 before shape-id-1 in new order; reorder-grid-children reverses
       (let [result (layout/reorder-grid-children parent)]
         (t/is (vector? (:shapes result)))
-        (t/is (= 2 (count (:shapes result))))))))
+        (t/is (= [shape-id-1 shape-id-2] (:shapes result)))))))
+
+(t/deftest reorder-grid-children-keeps-cell-less-children-in-place-test
+  ;; Cell-less children keep their index while cell children follow grid order.
+  (let [shape-id-1 (uuid/next)
+        shape-id-2 (uuid/next)
+        hidden-id  (uuid/next)
+        ;; Grid storage reverses the visual cell order.
+        cell-a (make-cell :row 1 :column 1 :shapes [shape-id-2])
+        cell-b (make-cell :row 1 :column 2 :shapes [shape-id-1])
+        parent {:layout-grid-dir :row
+                :shapes [shape-id-2 shape-id-1 hidden-id]
+                :layout-grid-cells {(:id cell-a) cell-a
+                                    (:id cell-b) cell-b}}]
+
+    (t/testing "cell-less child at the end stays at the end"
+      (let [result (layout/reorder-grid-children parent)]
+        (t/is (= [shape-id-1 shape-id-2 hidden-id] (:shapes result)))))
+
+    (t/testing "cell-less child in the middle stays in the middle"
+      (let [parent (assoc parent :shapes [shape-id-2 hidden-id shape-id-1])
+            result (layout/reorder-grid-children parent)]
+        (t/is (= [shape-id-1 hidden-id shape-id-2] (:shapes result)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; merge-cells
diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index f0932a78db..a4896a5b58 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:26.04 AS base
+FROM dhi.io/debian-base:trixie-debian13-dev AS base
 
 ENV LANG='C.UTF-8' \
     LC_ALL='C.UTF-8' \
@@ -13,6 +13,8 @@ RUN set -ex; \
         rsync \
         wget \
         sudo \
+        libpam-modules \
+        libpam-runtime \
         tmux \
         vim \
         curl \
@@ -24,7 +26,39 @@ RUN set -ex; \
         ca-certificates \
         \
         binutils \
-        build-essential autoconf libtool pkg-config
+        build-essential autoconf libtool pkg-config \
+    ; \
+    mkdir -p /usr/lib/pam.d; \
+    printf '%s\n' \
+        '#%PAM-1.0' \
+        'auth       required   pam_unix.so nullok' \
+        'account    required   pam_unix.so' \
+        'password   required   pam_unix.so' \
+        'session    required   pam_unix.so' \
+        'session    required   pam_limits.so' \
+        | tee /etc/pam.d/sudo /usr/lib/pam.d/sudo > /dev/null; \
+    printf '%s\n' \
+        '#%PAM-1.0' \
+        'auth       required   pam_deny.so' \
+        'account    required   pam_deny.so' \
+        'password   required   pam_deny.so' \
+        'session    required   pam_deny.so' \
+        | tee /etc/pam.d/other /usr/lib/pam.d/other > /dev/null; \
+    if [ ! -s /etc/nsswitch.conf ]; then \
+        printf '%s\n' \
+            'passwd:         files' \
+            'group:          files' \
+            'shadow:         files' \
+            'gshadow:        files' \
+            'hosts:          files dns' \
+            'networks:       files' \
+            'protocols:      files' \
+            'services:       files' \
+            'ethers:         files' \
+            'rpc:            files' \
+            'netgroup:       files' \
+            > /etc/nsswitch.conf; \
+    fi
 
 ################################################################################
 ## NODE SETUP
@@ -32,7 +66,7 @@ RUN set -ex; \
 
 FROM base AS setup-node
 
-ENV NODE_VERSION=v24.18.0 \
+ENV NODE_VERSION=v24.18.1 \
     PATH=/opt/node/bin:$PATH
 
 RUN set -eux; \
@@ -66,7 +100,7 @@ RUN set -eux; \
 
 FROM base AS setup-opencode
 
-ENV OPENCODE_VERSION=1.18.2
+ENV OPENCODE_VERSION=1.18.11
 
 RUN set -ex; \
     ARCH="$(dpkg --print-architecture)"; \
@@ -126,18 +160,18 @@ RUN set -eux; \
 FROM base AS setup-jvm
 
 # https://clojure.org/releases/tools
-ENV CLOJURE_VERSION=1.12.5.1654
+ENV CLOJURE_VERSION=1.12.5.1664
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='cc1b459dc442d7422b46a3b5fe52acaea54879fa7913e29a05650cef54687f5f'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.30.11-ca-jdk26.0.1-linux_aarch64.tar.gz'; \
+         ESUM='5b222fce0b7076a10ac7ae3b1009a6c2caf4f35bc4e81de72010af6750c5e146'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.13-ca-jdk26.0.2-linux_aarch64.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='7d6663ea8d4298df65de065e32f9f449745ff607d30ba5d13777cb92e9d4613d'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.30.11-ca-jdk26.0.1-linux_x64.tar.gz'; \
+         ESUM='4b7c114917aebd0fc6284fc7111245d7747a4d9603bd12d86b384b1abc9d575d'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.13-ca-jdk26.0.2-linux_x64.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -208,13 +242,13 @@ RUN set -eux; \
 
 FROM base AS setup-utils
 
-ENV CLJKONDO_VERSION=2026.05.25 \
-    BABASHKA_VERSION=1.12.218 \
-    CLJFMT_VERSION=0.16.4 \
-    PIXI_VERSION=0.67.2 \
+ENV CLJKONDO_VERSION=2026.07.24 \
+    BABASHKA_VERSION=1.13.219 \
+    CLJFMT_VERSION=0.16.5 \
+    PIXI_VERSION=0.75.0 \
     K6_VERSION=2.0.0 \
-    GITHUB_CLI_VERSION=2.96.0 \
-    UV_VERSION=0.11.9 \
+    GITHUB_CLI_VERSION=2.97.0 \
+    UV_VERSION=0.12.1 \
     UV_TOOL_DIR=/opt/uv/tools \
     UV_TOOL_BIN_DIR=/opt/utils/bin \
     UV_PYTHON_INSTALL_DIR=/opt/uv/python \
@@ -397,13 +431,17 @@ RUN set -ex; \
 FROM base AS devenv-base
 
 RUN set -ex; \
-    usermod -l penpot -d /home/penpot -G users -s /bin/bash ubuntu; \
+    apt-get -qq update; \
+    apt-get -qqy --no-install-recommends install passwd; \
+    groupadd -f users; \
+    useradd -u 1000 -m -d /home/penpot -G users -s /bin/bash penpot; \
     passwd penpot -d; \
     echo "penpot ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 RUN set -ex; \
     apt-get -qq update; \
     apt-get -qq dist-upgrade; \
+    apt-get -qqy --no-install-recommends install init-system-helpers; \
     apt-get -qqy install --no-install-recommends \
       redis-tools \
       gnupg2 \
@@ -437,16 +475,16 @@ RUN set -ex; \
       fonts-freefont-ttf \
       poppler-utils \
       \
-      libasound2t64 \
-      libatk-bridge2.0-0t64 \
-      libatk1.0-0t64 \
-      libatspi2.0-0t64 \
+      libasound2 \
+      libatk-bridge2.0-0 \
+      libatk1.0-0 \
+      libatspi2.0-0 \
       libcairo2 \
-      libcups2t64 \
+      libcups2 \
       libdbus-1-3 \
       libdrm2 \
       libgbm1 \
-      libglib2.0-0t64 \
+      libglib2.0-0 \
       libnspr4 \
       libnss3 \
       libpango-1.0-0 \
@@ -460,14 +498,14 @@ RUN set -ex; \
       libxrandr2 \
       \
       libpng16-16 \
-      libjpeg-turbo8 \
+      libjpeg62-turbo \
       libtiff6 \
       libwebp7 \
       libopenexr-3-1-30 \
       libfreetype6 \
       libfontconfig1 \
       libglib2.0-0 \
-      libxml2-16 \
+      libxml2 \
       liblcms2-2 \
       libheif1 \
       libopenjp2-7 \
@@ -478,12 +516,15 @@ RUN set -ex; \
       libwebpdemux2 \
       libzip5 \
     ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    mkdir -p /usr/local/bin; \
+    ln -sf /usr/bin/fdfind /usr/local/bin/fd; \
+    ln -sf /usr/bin/batcat /usr/local/bin/bat;
 
 RUN set -ex; \
     install -d /usr/share/postgresql-common/pgdg; \
     curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc; \
-    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt noble-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
+    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt trixie-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
     apt-get -qq update; \
     apt-get -qqy install postgresql-client-16; \
     apt-get clean; \
@@ -510,7 +551,7 @@ ENV LANG='C.UTF-8' \
     SERENA_CONTEXT="claude-code" \
     PATH="/opt/jdk/bin:/opt/gh/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
 
-COPY --from=penpotapp/imagemagick:7.1.2-24 /opt/imagick /opt/imagick
+COPY --from=penpotapp/imagemagick:7.1.2-27 /opt/imagick /opt/imagick
 COPY --from=setup-jvm /opt/jdk /opt/jdk
 COPY --from=setup-jvm /opt/clojure /opt/clojure
 COPY --from=setup-node /opt/node /opt/node
@@ -542,3 +583,4 @@ COPY files/init.sh             /home/init.sh
 
 ENTRYPOINT ["/home/entrypoint.sh"]
 CMD ["/home/init.sh"]
+
diff --git a/docker/devenv/docker-compose.main.yml b/docker/devenv/docker-compose.main.yml
index f5cbe95620..35bac398ca 100644
--- a/docker/devenv/docker-compose.main.yml
+++ b/docker/devenv/docker-compose.main.yml
@@ -10,7 +10,7 @@ volumes:
 services:
   main:
     privileged: true
-    image: "penpotapp/devenv:latest"
+    image: "penpotapp/devenv:${DEVENV_TAG:-latest}"
     build:
       context: "."
     container_name: "${PENPOT_MAIN_CONTAINER_NAME}"
diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh
index 1cae3f8e3f..d7a00a670a 100755
--- a/docker/devenv/files/entrypoint.sh
+++ b/docker/devenv/files/entrypoint.sh
@@ -19,7 +19,7 @@ chown -R penpot:users ${SERENA_HOME}
 
 chown penpot:users /home/penpot
 # we need to be able to install rust-analyzer and possibly other dependencies with rustup
-chown -R penpot:ubuntu /opt/rustup
+chown -R penpot:penpot /opt/rustup
 
 rsync -ar --chown=penpot:users /opt/cargo/ /home/penpot/.cargo/
 
diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf
index ce5566079f..3d3d70263f 100644
--- a/docker/devenv/files/nginx.conf
+++ b/docker/devenv/files/nginx.conf
@@ -86,6 +86,7 @@ http {
             set $real_mtype "$upstream_http_x_mtype";
 
             proxy_set_header Host "$redirect_host";
+            proxy_set_header Authorization "";
             proxy_hide_header etag;
             proxy_hide_header x-amz-id-2;
             proxy_hide_header x-amz-request-id;
diff --git a/docker/imagemagick/Dockerfile b/docker/imagemagick/Dockerfile
index e53fb65d8a..92ff766acb 100644
--- a/docker/imagemagick/Dockerfile
+++ b/docker/imagemagick/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:26.04
+FROM dhi.io/debian-base:trixie-debian13-dev AS build
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG='C.UTF-8' \
@@ -6,11 +6,12 @@ ENV LANG='C.UTF-8' \
     DEBIAN_FRONTEND=noninteractive \
     TZ=Etc/UTC
 
-ARG IMAGEMAGICK_VERSION=7.1.2-24
+ARG IMAGEMAGICK_VERSION=7.1.2-27
 
 RUN set -e; \
     apt-get -qq update; \
     apt-get -qq upgrade; \
+    apt-get -qqy --no-install-recommends install init-system-helpers; \
     apt-get -qqy --no-install-recommends install \
         autoconf \
         binutils \
@@ -38,42 +39,24 @@ RUN set -e; \
     mkdir -p /tmp/magick; \
     cd /tmp/magick; \
     tar -xf /tmp/magick.tar.gz --strip-components=1; \
-    ./configure  --prefix=/opt/imagick; \
+    ./configure --prefix=/opt/imagick; \
     make -j 2; \
     make install; \
     rm -rf /opt/imagick/lib/libMagick++*; \
     rm -rf /opt/imagick/include; \
-    rm -rf /opt/imagick/share; \
-    apt-get -qqy --autoremove purge \
-        autoconf \
-        binutils \
-        build-essential \
-        ca-certificates \
-        curl \
-        libfftw3-dev \
-        libheif-dev \
-        libjpeg-dev \
-        libxml2-dev \
-        liblcms2-dev \
-        libltdl-dev \
-        liblzma-dev \
-        libopenexr-dev \
-        libpng-dev \
-        librsvg2-dev \
-        libtiff-dev \
-        libtool\
-        libwebp-dev \
-        libzip-dev \
-        libzstd-dev \
-        pkg-config \
-    ;\
+    rm -rf /opt/imagick/share;
+
+# The DHI runtime image ships no apt/dpkg, so `magick`'s ~15 runtime shared
+# libs (libheif, libopenjp2, librsvg2, etc.) are vendored here via `ldd` into
+# a self-contained bundle instead of relying on system packages at runtime.
+RUN set -ex; \
     apt-get -qqy --no-install-recommends install \
         libfontconfig1 \
         libfreetype6 \
         libglib2.0-0 \
         libgomp1 \
         libheif1 \
-        libjpeg-turbo8 \
+        libjpeg62-turbo \
         liblcms2-2 \
         libopenexr-3-1-30 \
         libopenjp2-7 \
@@ -83,11 +66,25 @@ RUN set -e; \
         libwebp7 \
         libwebpdemux2 \
         libwebpmux3 \
-        libxml2-16 \
+        libxml2 \
         libzip5 \
         libzstd1 \
-    ;\
+    ; \
+    mkdir -p /opt/imagick/lib/deps; \
+    ldd /opt/imagick/bin/magick | awk '{print $3}' | grep '^/' | sort -u \
+      | xargs -I{} cp -L --no-clobber {} /opt/imagick/lib/deps/; \
     apt-get -qqy clean; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*
+
+
+FROM dhi.io/debian-base:trixie-debian13 AS image
+LABEL maintainer="Penpot <docker@penpot.app>"
+
+ENV LANG='C.UTF-8' \
+    LC_ALL='C.UTF-8' \
+    TZ=Etc/UTC \
+    LD_LIBRARY_PATH=/opt/imagick/lib/deps
+
+COPY --from=build /opt/imagick /opt/imagick
 
 ENTRYPOINT ["/opt/imagick/bin/magick"]
diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 583da3612d..98b3e02ab8 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -1,4 +1,4 @@
-FROM ubuntu:26.04 AS build
+FROM dhi.io/debian-base:trixie-debian13-dev AS build
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG='C.UTF-8' \
@@ -22,12 +22,12 @@ RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='cc1b459dc442d7422b46a3b5fe52acaea54879fa7913e29a05650cef54687f5f'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.30.11-ca-jdk26.0.1-linux_aarch64.tar.gz'; \
+         ESUM='5b222fce0b7076a10ac7ae3b1009a6c2caf4f35bc4e81de72010af6750c5e146'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.13-ca-jdk26.0.2-linux_aarch64.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='7d6663ea8d4298df65de065e32f9f449745ff607d30ba5d13777cb92e9d4613d'; \
-         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.30.11-ca-jdk26.0.1-linux_x64.tar.gz'; \
+         ESUM='4b7c114917aebd0fc6284fc7111245d7747a4d9603bd12d86b384b1abc9d575d'; \
+         BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.13-ca-jdk26.0.2-linux_x64.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -47,7 +47,8 @@ RUN set -eux; \
        --add-modules java.base,jdk.net,jdk.management.agent,java.se,jdk.compiler,jdk.javadoc,jdk.attach,jdk.unsupported,jdk.jfr,jdk.jcmd \
        --output /opt/jre;
 
-FROM ubuntu:26.04 AS image
+
+FROM dhi.io/debian-base:trixie-debian13-dev AS image
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG='C.UTF-8' \
@@ -55,11 +56,13 @@ ENV LANG='C.UTF-8' \
     JAVA_HOME="/opt/jre" \
     PATH=/opt/jre/bin:/opt/imagick/bin:$PATH \
     DEBIAN_FRONTEND=noninteractive \
-    TZ=Etc/UTC
+    TZ=Etc/UTC \
+    LD_LIBRARY_PATH=/opt/imagick/lib/deps
 
 RUN set -ex; \
-    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
     apt-get -qq update; \
+    apt-get -qqy --no-install-recommends install passwd; \
+    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
     apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
         ca-certificates \
@@ -71,7 +74,7 @@ RUN set -ex; \
         libglib2.0-0 \
         libgomp1 \
         libheif1 \
-        libjpeg-turbo8 \
+        libjpeg62-turbo \
         liblcms2-2 \
         libopenexr-3-1-30 \
         libopenjp2-7 \
@@ -81,7 +84,7 @@ RUN set -ex; \
         libwebp7 \
         libwebpdemux2 \
         libwebpmux3 \
-        libxml2-16 \
+        libxml2 \
         libzip5 \
         libzstd1 \
         python3 \
@@ -100,7 +103,7 @@ RUN set -ex; \
     chown -R penpot:penpot /opt/data;
 
 COPY --from=build /opt/jre /opt/jre
-COPY --from=penpotapp/imagemagick:7.1.2-24 /opt/imagick /opt/imagick
+COPY --from=penpotapp/imagemagick:7.1.2-27 /opt/imagick /opt/imagick
 
 COPY files/imagemagick-policy.xml /opt/imagick/etc/ImageMagick-7/policy.xml
 
diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter
index 260e5fda8d..7c0b1a14ff 100644
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -1,18 +1,16 @@
-FROM ubuntu:26.04
+FROM dhi.io/node:24.18.1-debian13-dev
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
-    NODE_VERSION=v24.18.0 \
     DEBIAN_FRONTEND=noninteractive \
-    PATH=/opt/node/bin:/opt/imagick/bin:$PATH \
+    PATH=/opt/imagick/bin:$PATH \
     PLAYWRIGHT_BROWSERS_PATH=/opt/penpot/browsers
 
 RUN set -ex; \
-    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
-    mkdir -p /etc/resolvconf/resolv.conf.d; \
-    echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \
     apt-get -qq update; \
+    apt-get -qqy --no-install-recommends install passwd; \
+    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
     apt-get -qq dist-upgrade; \
     apt-get -qqy --no-install-recommends install \
       curl \
@@ -44,16 +42,16 @@ RUN set -ex; \
       fonts-freefont-ttf \
       poppler-utils \
       \
-      libasound2t64 \
-      libatk-bridge2.0-0t64 \
-      libatk1.0-0t64 \
-      libatspi2.0-0t64 \
+      libasound2 \
+      libatk-bridge2.0-0 \
+      libatk1.0-0 \
+      libatspi2.0-0 \
       libcairo2 \
-      libcups2t64 \
+      libcups2 \
       libdbus-1-3 \
       libdrm2 \
       libgbm1 \
-      libglib2.0-0t64 \
+      libglib2.0-0 \
       libnspr4 \
       libnss3 \
       libpango-1.0-0 \
@@ -68,7 +66,7 @@ RUN set -ex; \
       \
       libgomp1 \
       libheif1 \
-      libjpeg-turbo8 \
+      libjpeg62-turbo \
       liblcms2-2 \
       libopenexr-3-1-30 \
       libopenjp2-7 \
@@ -78,44 +76,26 @@ RUN set -ex; \
       libwebp7 \
       libwebpdemux2 \
       libwebpmux3 \
-      libxml2-16 \
+      libxml2 \
       libzip5 \
       libzstd1 \
     ; \
     apt-get clean; \
-    rm -rf /var/lib/apt/lists/*;
-
-RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
-    case "${ARCH}" in \
-       aarch64|arm64) \
-         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz"; \
-         ;; \
-       amd64|x86_64) \
-         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz"; \
-         ;; \
-       *) \
-         echo "Unsupported arch: ${ARCH}"; \
-         exit 1; \
-         ;; \
-    esac; \
-    curl -LfsSo /tmp/nodejs.tar.gz ${BINARY_URL}; \
-    mkdir -p /opt/node; \
-    cd /opt/node; \
-    tar -xf /tmp/nodejs.tar.gz --strip-components=1; \
-    chown -R root /opt/node; \
-    rm -rf /tmp/nodejs.tar.gz; \
-    corepack enable; \
+    rm -rf /var/lib/apt/lists/*; \
     mkdir -p /opt/penpot; \
     chown -R penpot:penpot /opt/penpot;
 
 ARG BUNDLE_PATH="./bundle-exporter/"
 COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/exporter/
-COPY --from=penpotapp/imagemagick:7.1.2-24 /opt/imagick /opt/imagick
+COPY --from=penpotapp/imagemagick:7.1.2-27 /opt/imagick /opt/imagick
 
 WORKDIR /opt/penpot/exporter
+
+# DHI Node image installs Node at the system level (symlinked into
+# /usr/bin), so `./setup`'s internal `corepack enable` needs root to write
+# there. Ownership is fixed right after.
+RUN ./setup && chown -R penpot:penpot /opt/penpot/exporter
+
 USER penpot:penpot
 
-RUN ./setup
-
 CMD ["node", "app.js"]
diff --git a/docker/images/Dockerfile.frontend b/docker/images/Dockerfile.frontend
index 0772aab00c..a134f15f27 100644
--- a/docker/images/Dockerfile.frontend
+++ b/docker/images/Dockerfile.frontend
@@ -1,15 +1,17 @@
-FROM nginxinc/nginx-unprivileged:1.31.1-alpine
+FROM dhi.io/nginx:1.31.1-debian13-dev
 LABEL maintainer="Penpot <docker@penpot.app>"
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 USER root
 
 RUN set -ex; \
-    apk update; \
-    apk upgrade; \
-    apk add --no-cache bash gettext; \
-    rm -rf /var/cache/apk/*; \
-    addgroup -g 1001 penpot; \
-    adduser -D -H -u 1001 -s /bin/false -h /opt/penpot -G penpot penpot; \
+    apt-get -qq update; \
+    apt-get -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade; \
+    apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --no-install-recommends install bash gettext-base passwd; \
+    rm -rf /var/lib/apt/lists/*; \
+    groupadd -f -g 1001 penpot; \
+    useradd -M -u 1001 -s /usr/sbin/nologin -d /opt/penpot -g penpot penpot; \
     mkdir -p /opt/data/assets; \
     chown -R penpot:penpot /opt/data; \
     mkdir -p /etc/nginx/overrides/main.d/; \
@@ -23,6 +25,7 @@ COPY $BUNDLE_PATH /var/www/app/
 COPY ./files/config.js /var/www/app/js/config.js
 COPY ./files/nginx.conf.template /tmp/nginx.conf.template
 COPY ./files/nginx-resolvers.conf.template /tmp/resolvers.conf.template
+COPY ./files/nginx-admin-console-locations.conf.template /tmp/nginx-admin-console-locations.conf.template
 COPY ./files/nginx-mcp-locations.conf.template /tmp/nginx-mcp-locations.conf.template
 COPY ./files/nginx-security-headers.conf /etc/nginx/nginx-security-headers.conf
 COPY ./files/nginx-mime.types /etc/nginx/mime.types
diff --git a/docker/images/Dockerfile.mcp b/docker/images/Dockerfile.mcp
index ee1c9f4399..8d943c7e27 100644
--- a/docker/images/Dockerfile.mcp
+++ b/docker/images/Dockerfile.mcp
@@ -1,61 +1,26 @@
-FROM ubuntu:26.04
+FROM dhi.io/node:24.18.1-debian13-dev AS build
+LABEL maintainer="Penpot <docker@penpot.app>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+ARG BUNDLE_PATH="./bundle-mcp/"
+COPY $BUNDLE_PATH /opt/penpot/mcp/
+
+WORKDIR /opt/penpot/mcp
+
+RUN ./setup
+
+
+FROM dhi.io/node:24.18.1-debian13 AS image
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
-    NODE_VERSION=v24.18.0 \
-    DEBIAN_FRONTEND=noninteractive \
-    PATH=/opt/node/bin:$PATH \
     PENPOT_MCP_SERVER_HOST=0.0.0.0
 
-RUN set -ex; \
-    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
-    mkdir -p /etc/resolvconf/resolv.conf.d; \
-    echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \
-    apt-get -qq update; \
-    apt-get -qq dist-upgrade; \
-    apt-get -qqy --no-install-recommends install \
-      curl \
-      tzdata \
-      locales \
-      ca-certificates \
-    ; \
-    apt-get clean; \
-    rm -rf /var/lib/apt/lists/*; \
-    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
-    locale-gen; \
-    find /usr/share/i18n/locales/ -type f ! -name "en_US" ! -name "POSIX" ! -name "C" -delete;
-
-RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
-    case "${ARCH}" in \
-       aarch64|arm64) \
-         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz"; \
-         ;; \
-       amd64|x86_64) \
-         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz"; \
-         ;; \
-       *) \
-         echo "Unsupported arch: ${ARCH}"; \
-         exit 1; \
-         ;; \
-    esac; \
-    curl -LfsSo /tmp/nodejs.tar.gz ${BINARY_URL}; \
-    mkdir -p /opt/node; \
-    cd /opt/node; \
-    tar -xf /tmp/nodejs.tar.gz --strip-components=1; \
-    chown -R root /opt/node; \
-    rm -rf /tmp/nodejs.tar.gz; \
-    corepack enable; \
-    mkdir -p /opt/penpot; \
-    chown -R penpot:penpot /opt/penpot;
-
-ARG BUNDLE_PATH="./bundle-mcp/"
-COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/mcp/
+COPY --from=build --chown=node:node /opt/penpot/mcp /opt/penpot/mcp
 
 WORKDIR /opt/penpot/mcp
-USER penpot:penpot
-
-RUN ./setup
+USER node
 
 CMD ["node", "index.js", "--multi-user"]
diff --git a/docker/images/Dockerfile.media-processor b/docker/images/Dockerfile.media-processor
new file mode 100644
index 0000000000..bc83e9e5a5
--- /dev/null
+++ b/docker/images/Dockerfile.media-processor
@@ -0,0 +1,86 @@
+FROM ubuntu:26.04
+LABEL maintainer="Penpot <docker@penpot.app>"
+
+ENV LANG=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8 \
+    NODE_VERSION=v24.18.0 \
+    DEBIAN_FRONTEND=noninteractive \
+    PATH=/opt/node/bin:$PATH
+
+RUN set -ex; \
+    useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \
+    mkdir -p /etc/resolvconf/resolv.conf.d; \
+    echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \
+    apt-get -qq update; \
+    apt-get -qq dist-upgrade; \
+    apt-get -qqy --no-install-recommends install \
+      curl \
+      tzdata \
+      locales \
+      ca-certificates \
+    ; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*; \
+    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
+    locale-gen; \
+    find /usr/share/i18n/locales/ -type f ! -name "en_US" ! -name "POSIX" ! -name "C" -delete;
+
+RUN set -ex; \
+    apt-get -qq update; \
+    apt-get -qqy --no-install-recommends install \
+      fontforge \
+      woff-tools \
+      woff2 \
+      \
+      libgomp1 \
+      libheif1 \
+      libjpeg-turbo8 \
+      liblcms2-2 \
+      libopenexr-3-1-30 \
+      libopenjp2-7 \
+      libpng16-16 \
+      librsvg2-2 \
+      libtiff6 \
+      libwebp7 \
+      libwebpdemux2 \
+      libwebpmux3 \
+      libxml2-16 \
+      libzip5 \
+      libzstd1 \
+    ; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
+RUN set -eux; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz"; \
+         ;; \
+       amd64|x86_64) \
+         BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz"; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/nodejs.tar.gz ${BINARY_URL}; \
+    mkdir -p /opt/node; \
+    cd /opt/node; \
+    tar -xf /tmp/nodejs.tar.gz --strip-components=1; \
+    chown -R root /opt/node; \
+    rm -rf /tmp/nodejs.tar.gz; \
+    corepack enable; \
+    mkdir -p /opt/penpot; \
+    chown -R penpot:penpot /opt/penpot;
+
+ARG BUNDLE_PATH="./bundle-media-processor/"
+COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/media-processor/
+
+WORKDIR /opt/penpot/media-processor
+USER penpot:penpot
+
+RUN ./setup
+
+CMD ["node", "dist/index.js"]
diff --git a/docker/images/Dockerfile.storybook b/docker/images/Dockerfile.storybook
index 26bb326383..3904604a25 100644
--- a/docker/images/Dockerfile.storybook
+++ b/docker/images/Dockerfile.storybook
@@ -1,24 +1,11 @@
-FROM nginxinc/nginx-unprivileged:1.31.1-alpine
+FROM dhi.io/nginx:1.31.1-alpine3.22
 LABEL maintainer="Penpot <docker@penpot.app>"
 
-USER root
-
-RUN set -ex; \
-    apk update; \
-    apk upgrade; \
-    rm -rf /var/cache/apk/*; \
-    addgroup -g 1001 penpot; \
-    adduser -D -H -u 1001 -s /bin/false -h /opt/penpot -G penpot penpot;
-
 ARG BUNDLE_PATH="./bundle-storybook/"
-COPY $BUNDLE_PATH /var/www/
-COPY ./files/nginx.storybook.conf /etc/nginx/conf.d/default.conf
 
-RUN chown -R 1001:0 /var/cache/nginx; \
-    chmod -R g+w /var/cache/nginx; \
-    chown -R 1001:0 /etc/nginx; \
-    chmod -R g+w /etc/nginx; \
-    chown -R 1001:0 /var/www; \
-    chmod -R g+w /var/www;
+COPY --chown=65532:65532 $BUNDLE_PATH /var/www/
+COPY --chown=65532:65532 ./files/nginx.storybook.conf /etc/nginx/conf.d/default.conf
 
-USER penpot:penpot
+# Already the default user in the DHI runtime; explicit for clarity. Numeric
+# UID, not by name -- this image has no "nonroot" entry in /etc/passwd.
+USER 65532:65532
diff --git a/docker/images/files/nginx-admin-console-locations.conf.template b/docker/images/files/nginx-admin-console-locations.conf.template
new file mode 100644
index 0000000000..fead3783c9
--- /dev/null
+++ b/docker/images/files/nginx-admin-console-locations.conf.template
@@ -0,0 +1,7 @@
+location /admin-console {
+    proxy_http_version 1.1;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $http_cf_connecting_ip;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass $PENPOT_ADMIN_CONSOLE_URI$request_uri;
+}
diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh
index 999e14ad3f..47a8a5544b 100644
--- a/docker/images/files/nginx-entrypoint.sh
+++ b/docker/images/files/nginx-entrypoint.sh
@@ -53,15 +53,22 @@ update_oidc_name /var/www/app/js/config.js
 
 export PENPOT_BACKEND_URI=${PENPOT_BACKEND_URI:-http://penpot-backend:6060}
 export PENPOT_EXPORTER_URI=${PENPOT_EXPORTER_URI:-http://penpot-exporter:6061}
-export PENPOT_NITRATE_URI=${PENPOT_NITRATE_URI:-http://penpot-nitrate:3000}
 export PENPOT_HTTP_SERVER_MAX_BODY_SIZE=${PENPOT_HTTP_SERVER_MAX_BODY_SIZE:-367001600} # Default to 350MiB
 export PENPOT_IPV6_LISTEN_DIRECTIVE=${PENPOT_IPV6_LISTEN_DIRECTIVE:-"listen [::]:8080 default_server reuseport backlog=16384;"}
 if is_truthy "${PENPOT_DISABLE_IPV6_LISTEN:-}"; then
   export PENPOT_IPV6_LISTEN_DIRECTIVE=""
 fi
-envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_NITRATE_URI,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE,\$PENPOT_IPV6_LISTEN_DIRECTIVE" \
+envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_HTTP_SERVER_MAX_BODY_SIZE,\$PENPOT_IPV6_LISTEN_DIRECTIVE" \
         < /tmp/nginx.conf.template > /etc/nginx/nginx.conf
 
+if [[ $PENPOT_FLAGS == *"enable-admin-console"* ]]; then
+    export PENPOT_ADMIN_CONSOLE_URI=${PENPOT_ADMIN_CONSOLE_URI:-http://penpot-admin-console:3000}
+    envsubst "\$PENPOT_ADMIN_CONSOLE_URI" \
+             < /tmp/nginx-admin-console-locations.conf.template > /etc/nginx/overrides/server.d/admin-console-locations.conf
+else
+    rm -f /etc/nginx/overrides/server.d/admin-console-locations.conf
+fi
+
 if [[ $PENPOT_FLAGS == *"enable-mcp"* ]]; then
     export PENPOT_MCP_URI=${PENPOT_MCP_URI:-http://penpot-mcp:4401}
     export PENPOT_MCP_URI_WS=${PENPOT_MCP_URI_WS:-http://penpot-mcp:4402}
diff --git a/docker/images/files/nginx.conf.template b/docker/images/files/nginx.conf.template
index a27d770f82..3e91a91714 100644
--- a/docker/images/files/nginx.conf.template
+++ b/docker/images/files/nginx.conf.template
@@ -94,6 +94,7 @@ http {
             proxy_buffering off;
 
             proxy_set_header Host "$redirect_host";
+            proxy_set_header Authorization "";
             proxy_hide_header etag;
             proxy_hide_header x-amz-id-2;
             proxy_hide_header x-amz-request-id;
@@ -150,14 +151,6 @@ http {
             proxy_pass $PENPOT_BACKEND_URI/ws/notifications;
         }
 
-        location /admin-console {
-            proxy_http_version 1.1;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Real-IP $http_cf_connecting_ip;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass $PENPOT_NITRATE_URI$request_uri;
-        }
-
         include /etc/nginx/overrides/server.d/*.conf;
 
         location / {
diff --git a/docs/package.json b/docs/package.json
index 299d497e48..9af9a87dba 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -35,9 +35,9 @@
     "eleventy-plugin-nesting-toc": "^1.3.0",
     "eleventy-plugin-youtube-embed": "^1.13.2",
     "luxon": "^3.7.2",
-    "markdown-it": "^14.2.0",
-    "markdown-it-anchor": "^9.2.0",
+    "markdown-it": "^15.0.0",
+    "markdown-it-anchor": "^9.2.1",
     "markdown-it-plantuml": "^1.4.1"
   },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b"
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
index d32be57396..c557631422 100644
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
@@ -42,11 +42,11 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       markdown-it:
-        specifier: ^14.2.0
-        version: 14.2.0
+        specifier: ^15.0.0
+        version: 15.0.0
       markdown-it-anchor:
-        specifier: ^9.2.0
-        version: 9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.2.0)
+        specifier: ^9.2.1
+        version: 9.2.1(@types/markdown-it@14.1.2)(markdown-it@15.0.0)
       markdown-it-plantuml:
         specifier: ^1.4.1
         version: 1.4.1
@@ -150,6 +150,9 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  argparse@3.0.0:
+    resolution: {integrity: sha512-BOp5NMrHqKxmq/OLr+clzzrRxgOKSLkcjmkWuChp7Irqwn4s74WjOBPIgWfA/HMcBnVkZ5XEuf9uUqzlpfCQ6A==}
+
   asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -172,8 +175,8 @@ packages:
   boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
-  brace-expansion@1.1.15:
-    resolution: {integrity: sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==}
+  brace-expansion@1.1.18:
+    resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -301,6 +304,10 @@ packages:
     resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
     engines: {node: '>=0.12'}
 
+  entities@8.0.0:
+    resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==}
+    engines: {node: '>=20.19.0'}
+
   errno@1.0.0:
     resolution: {integrity: sha512-3zV5mFS1E8/1bPxt/B0xxzI1snsg3uSCIh6Zo1qKg6iMw93hzPANk9oBFzSFBFrwuVoQuE3rLoouAUfwOAj1wQ==}
     hasBin: true
@@ -440,8 +447,8 @@ packages:
     resolution: {integrity: sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog==}
     hasBin: true
 
-  js-yaml@4.2.0:
-    resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
+  js-yaml@4.3.1:
+    resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==}
     hasBin: true
 
   junk@3.1.0:
@@ -456,11 +463,14 @@ packages:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
 
-  linkify-it@5.0.1:
-    resolution: {integrity: sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==}
+  linkify-it@5.0.2:
+    resolution: {integrity: sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==}
 
-  liquidjs@10.27.0:
-    resolution: {integrity: sha512-tw/OA59K7aIBlMKIrKlumr37fiZUheShVHXY8cVctWisgY1p9mc5hreOvlreoS0wTiwlWk14Ya7305c2a/Cg5w==}
+  linkify-it@6.1.0:
+    resolution: {integrity: sha512-wJ/TwpSDTLepCrQoYWYIExIKg5Zchex2Nn5yk2mFnB+6PtdkHtyLx742md9csRjjOnGkKIS/RrbY7l8D6gT9Vw==}
+
+  liquidjs@10.28.0:
+    resolution: {integrity: sha512-b6tmBXYMQTuGPnM5vB0CuZMo5kvmKMtSB/gvUWP6RFn2pIB5s+bJkBfIyJnattkc5bgeAiflrZVptx3iaLLioQ==}
     engines: {node: '>=16'}
     hasBin: true
 
@@ -474,8 +484,8 @@ packages:
     resolution: {integrity: sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==}
     engines: {node: '>=12'}
 
-  markdown-it-anchor@9.2.0:
-    resolution: {integrity: sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==}
+  markdown-it-anchor@9.2.1:
+    resolution: {integrity: sha512-p6APiLJDFAW2GEvaavDvhIBn7jrX2jLv77NkBGgNacFTurbORYc4pyYySg/mI6mpR6cHQuAtzKtmqgQr4K8dsQ==}
     peerDependencies:
       '@types/markdown-it': '*'
       markdown-it: '*'
@@ -483,12 +493,16 @@ packages:
   markdown-it-plantuml@1.4.1:
     resolution: {integrity: sha512-13KgnZaGYTHBp4iUmGofzZSBz+Zj6cyqfR0SXUIc9wgWTto5Xhn7NjaXYxY0z7uBeTUMlc9LMQq5uP4OM5xCHg==}
 
-  markdown-it@14.2.0:
-    resolution: {integrity: sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==}
+  markdown-it@14.3.0:
+    resolution: {integrity: sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==}
     hasBin: true
 
-  mdurl@2.0.0:
-    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
+  markdown-it@15.0.0:
+    resolution: {integrity: sha512-Lf8ajvVNdRpzSNB4VegxNy7gjs8gU35l4b4+ET49LrQC5PKYwLZ72u60LeJ9gv3qiaesuYjJWCyVeQmv/QWKQw==}
+    hasBin: true
+
+  mdurl@2.1.0:
+    resolution: {integrity: sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==}
 
   meta-generator@0.1.5:
     resolution: {integrity: sha512-stImEDLa5k2TfIMfpFomJKM9LuYzwIIsxS/ejBop0CifPqc4nHoLdTQkABnjrzzkZgLhmXdN144R7OT4dnbKqw==}
@@ -692,8 +706,11 @@ packages:
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
-  undici@7.28.0:
-    resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}
+  uc.micro@3.0.0:
+    resolution: {integrity: sha512-U3PppEkleoTnIfi8BozMx3yju3qc/L6SwqWo2Sw+54PX+PX0q9I+r1Um5HCmqD7n9VDX5/v3vQH/AjA6deDdtw==}
+
+  undici@7.29.0:
+    resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==}
     engines: {node: '>=20.18.1'}
 
   unpipe@1.0.0:
@@ -813,11 +830,11 @@ snapshots:
       filesize: 10.1.6
       gray-matter: 4.0.3
       iso-639-1: 3.1.5
-      js-yaml: 4.2.0
+      js-yaml: 4.3.1
       kleur: 4.1.5
-      liquidjs: 10.27.0
+      liquidjs: 10.28.0
       luxon: 3.7.2
-      markdown-it: 14.2.0
+      markdown-it: 14.3.0
       minimist: 1.2.8
       moo: 0.5.2
       node-retrieve-globals: 6.0.1
@@ -893,6 +910,8 @@ snapshots:
 
   argparse@2.0.1: {}
 
+  argparse@3.0.0: {}
+
   asap@2.0.6: {}
 
   balanced-match@1.0.2: {}
@@ -914,7 +933,7 @@ snapshots:
 
   boolbase@1.0.0: {}
 
-  brace-expansion@1.1.15:
+  brace-expansion@1.1.18:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
@@ -943,7 +962,7 @@ snapshots:
       parse5: 7.3.0
       parse5-htmlparser2-tree-adapter: 7.1.0
       parse5-parser-stream: 7.1.2
-      undici: 7.28.0
+      undici: 7.29.0
       whatwg-mimetype: 4.0.0
 
   chokidar@3.6.0:
@@ -1065,6 +1084,8 @@ snapshots:
 
   entities@7.0.1: {}
 
+  entities@8.0.0: {}
+
   errno@1.0.0:
     dependencies:
       prr: 1.0.1
@@ -1193,7 +1214,7 @@ snapshots:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  js-yaml@4.2.0:
+  js-yaml@4.3.1:
     dependencies:
       argparse: 2.0.1
 
@@ -1203,11 +1224,15 @@ snapshots:
 
   kleur@4.1.5: {}
 
-  linkify-it@5.0.1:
+  linkify-it@5.0.2:
     dependencies:
       uc.micro: 2.1.0
 
-  liquidjs@10.27.0:
+  linkify-it@6.1.0:
+    dependencies:
+      uc.micro: 3.0.0
+
+  liquidjs@10.28.0:
     dependencies:
       commander: 10.0.1
 
@@ -1217,23 +1242,32 @@ snapshots:
 
   luxon@3.7.2: {}
 
-  markdown-it-anchor@9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.2.0):
+  markdown-it-anchor@9.2.1(@types/markdown-it@14.1.2)(markdown-it@15.0.0):
     dependencies:
       '@types/markdown-it': 14.1.2
-      markdown-it: 14.2.0
+      markdown-it: 15.0.0
 
   markdown-it-plantuml@1.4.1: {}
 
-  markdown-it@14.2.0:
+  markdown-it@14.3.0:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
-      linkify-it: 5.0.1
-      mdurl: 2.0.0
+      linkify-it: 5.0.2
+      mdurl: 2.1.0
       punycode.js: 2.3.1
       uc.micro: 2.1.0
 
-  mdurl@2.0.0: {}
+  markdown-it@15.0.0:
+    dependencies:
+      argparse: 3.0.0
+      entities: 8.0.0
+      linkify-it: 6.1.0
+      mdurl: 2.1.0
+      punycode.js: 2.3.1
+      uc.micro: 3.0.0
+
+  mdurl@2.1.0: {}
 
   meta-generator@0.1.5:
     dependencies:
@@ -1249,7 +1283,7 @@ snapshots:
 
   minimatch@3.1.5:
     dependencies:
-      brace-expansion: 1.1.15
+      brace-expansion: 1.1.18
 
   minimist@1.2.8: {}
 
@@ -1410,7 +1444,9 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
-  undici@7.28.0: {}
+  uc.micro@3.0.0: {}
+
+  undici@7.29.0: {}
 
   unpipe@1.0.0: {}
 
diff --git a/docs/pnpm-workspace.yaml b/docs/pnpm-workspace.yaml
index 79b7d49256..bd2aa47620 100644
--- a/docs/pnpm-workspace.yaml
+++ b/docs/pnpm-workspace.yaml
@@ -1,3 +1,5 @@
 minimumReleaseAgeExclude:
-  - undici@7.28.0
-  - js-yaml@3.15.0
+  - undici@7.28.0 || 7.29.0
+  - js-yaml@3.15.0 || 4.3.0
+  - brace-expansion@1.1.16 || 1.1.17 || 1.1.18
+  - liquidjs@10.27.1
diff --git a/docs/technical-guide/developer/agentic-devenv.md b/docs/technical-guide/developer/agentic-devenv.md
index 8d943dcd93..55b03c1492 100644
--- a/docs/technical-guide/developer/agentic-devenv.md
+++ b/docs/technical-guide/developer/agentic-devenv.md
@@ -55,7 +55,7 @@ Serena, Playwright) and supports a launcher that wires them into your AI client.
    for Penpot development (see below for details).
 
 6. **Shut down workspaces** with `./manage.sh stop-devenv`, either one by one or all at once.
-   You cannot shut down `ws0` if any other workspace is still running, since it's the worker-bearer.
+   Each workspace is independent and can be stopped in any order.
    Shared infrastructure will be cleaned up when the last workspace is stopped.
 
 Optional: watch Serena's activity in its dashboard
@@ -153,8 +153,8 @@ automatically, so regular users never run this.
 
 Brings one agentic instance up. Errors out if the target is already running.
 
-`--ws N` (N ≥ 1) auto-starts ws0 first if it is not already up - ws0 is the
-worker-bearer and must be running whenever any wsN is. Per-instance ports
+`--ws N` (N ≥ 1) brings that workspace up independently — workspaces can be
+started and stopped in any order. Per-instance ports
 are offset by `10000 × N` (ws1's MCP at `http://localhost:14401/mcp`, Serena
 MCP at `http://localhost:24181`, Serena dashboard at
 `http://localhost:24182`, etc.). `manage.sh` prints the full URL set on
diff --git a/docs/technical-guide/developer/devenv.md b/docs/technical-guide/developer/devenv.md
index 5aaab86e7f..5c3de5254a 100644
--- a/docs/technical-guide/developer/devenv.md
+++ b/docs/technical-guide/developer/devenv.md
@@ -69,13 +69,12 @@ The devenv runs as separate compose projects:
        (default `~/.penpot/penpot_workspaces/`). You can explicitly sync them
        with the `--sync` flag (automatic on first start).
 
-Each call to `run-devenv` brings up one instance, and ws0 is always
-running whenever any ws1+ is — `--ws N` (N≥1) auto-starts ws0 first if it
-isn't already up:
+Each call to `run-devenv` brings up one instance. Workspaces are independent
+and can be started and stopped in any order:
 
 ```bash
 ./manage.sh run-devenv                 # main (ws0)
-./manage.sh run-devenv --ws 1          # ws0 if needed, then ws1
+./manage.sh run-devenv --ws 1          # ws1
 ./manage.sh run-devenv --ws 2 --sync   # ws2, re-seeding from the live repo
 ```
 
@@ -91,12 +90,12 @@ the frontend's MCP flag) is copied into each workspace on its initial sync
 only. After that the developer maintains it in each workspace; subsequent
 `--sync` runs leave the workspace copy alone.
 
-Stopping mirrors the start invariant — ws0 is the last to stop, and shared
-infra stops with it:
+Stopping is equally flexible — each workspace is independent. Shared infra
+stops only when no instances remain running:
 
 ```bash
 ./manage.sh stop-devenv --ws 1           # stops ws1; ws0 + infra stay up
-./manage.sh stop-devenv                  # stops ws0 + infra; errors if ws1+ still running
+./manage.sh stop-devenv                  # stops ws0; infra stays up if ws1+ still running
 ./manage.sh stop-devenv --all            # stops every ws1+ first, then ws0 + infra
 ```
 
@@ -150,12 +149,14 @@ file-summary cache, rate-limit counters) isolated.
 Background workers (`enable-backend-worker`) run only on ws0 — ws1+ overlays
 disable it. ws1+ RPC handlers still enqueue tasks into the shared Postgres
 `task` table; ws0's dispatcher claims them via `FOR UPDATE SKIP LOCKED` and
-runs them against the shared DB and MinIO. The "ws0 always up when ws1+ is
-up" invariant exists for this reason: it keeps a single worker-bearer and
-avoids the multi-instance cron-dedup race (the lock on `scheduled_task` is
-released when the task body finishes, so two cron timers firing the same
-scheduled instant with a gap larger than the body's runtime can both
-execute it).
+runs them against the shared DB and MinIO. Workers are fire-and-forget:
+`wrk/submit!` inserts a row and returns; RPC handlers never wait on
+completion. The "ws0 only" policy avoids multi-instance worker races (cron
+dedup is best-effort across instances, `wrk/submit!` `dedupe` is racy across
+submitters).
+
+Each workspace is independent and can be started and stopped in any order.
+Shared infrastructure shuts down only when no instances remain running.
 
 ### Upgrading from a pre-parallel devenv
 
@@ -418,16 +419,28 @@ After creating or modifying this file, **reload the browser** (no need to restar
 ### Backend flags via PENPOT_FLAGS
 
 Backend feature flags are controlled through the `PENPOT_FLAGS` environment
-variable using the same `enable-<flag>` / `disable-<flag>` format. You can set
-this in the `docker/devenv/docker-compose.yaml` file under the `main` service
-`environment` section:
+variable using the same `enable-<flag>` / `disable-<flag>` format. The devenv
+sets its own list in `backend/scripts/_env`.
 
-```yaml
-environment:
-  - PENPOT_FLAGS=enable-access-tokens enable-mcp
+To change that list for your checkout, create `backend/scripts/_env.local`.
+`backend/scripts/start-dev` sources it immediately after `_env`, and the file
+is gitignored, so your override never appears in `git status`:
+
+```bash
+export PENPOT_FLAGS="$PENPOT_FLAGS enable-access-tokens enable-mcp"
 ```
 
-This requires **restarting the backend** to take effect.
+Flags are applied left to right and the last entry wins, so appending to
+`$PENPOT_FLAGS` both adds flags and switches off ones that `_env` enables:
+`disable-demo-users` at the end turns off the demo users that `_env` enables
+earlier.
+
+Setting `PENPOT_FLAGS` in the container environment does not work for this,
+because `_env` expands the inherited value *before* its own list. Any flag it
+sets afterwards wins over yours.
+
+This requires **restarting the backend** to take effect: stop the process in
+the `backend` tmux window and run `./scripts/start-dev` again.
 
 > **Note**: Some features (e.g., access tokens, webhooks) need both frontend and
 > backend flags enabled to work end-to-end. The frontend flag enables the UI, while
diff --git a/exporter/deps.edn b/exporter/deps.edn
index 08e3a3cdd8..9495142719 100644
--- a/exporter/deps.edn
+++ b/exporter/deps.edn
@@ -1,9 +1,9 @@
 {:paths ["src" "vendor" "resources" "test"]
  :deps
  {penpot/common       {:local/root "../common"}
-  org.clojure/clojure {:mvn/version "1.12.2"}
+  org.clojure/clojure {:mvn/version "1.12.5"}
   binaryage/devtools  {:mvn/version "1.0.7"}
-  metosin/reitit-core {:mvn/version "0.9.1"}
+  metosin/reitit-core {:mvn/version "0.10.1"}
   }
  :aliases
  {:outdated
@@ -14,7 +14,7 @@
 
   :dev
   {:extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.2.1"}}}
+   {thheller/shadow-cljs {:mvn/version "3.4.11"}}}
 
   :shadow-cljs
   {:main-opts ["-m" "shadow.cljs.devtools.cli"]
diff --git a/exporter/package.json b/exporter/package.json
index fce5a1fad9..ae3eefb04c 100644
--- a/exporter/package.json
+++ b/exporter/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
@@ -17,22 +17,23 @@
     "date-fns": "^4.4.0",
     "generic-pool": "^3.9.0",
     "inflation": "^2.1.0",
-    "ioredis": "^5.11.1",
-    "playwright": "^1.61.1",
-    "raw-body": "^3.0.2",
+    "ioredis": "^6.0.0",
+    "playwright": "1.62.1",
+    "raw-body": "^4.0.0",
     "source-map-support": "^0.5.21",
-    "undici": "^8.5.0",
+    "undici": "^8.9.0",
     "xml-js": "^1.6.11",
     "xregexp": "^5.1.2"
   },
   "devDependencies": {
-    "ws": "^8.21.0"
+    "ws": "^8.21.1"
   },
   "scripts": {
     "clear:shadow-cache": "rm -rf .shadow-cljs && rm -rf target",
     "watch:app": "pnpm run clear:shadow-cache && clojure -M:dev:shadow-cljs watch main",
     "watch": "pnpm run watch:app",
     "build:app": "clojure -M:dev:shadow-cljs release main",
+    "build:wasm": "../render-wasm/build export",
     "build": "pnpm run clear:shadow-cache && pnpm run build:app",
     "fmt": "cljfmt fix --parallel=true src/",
     "check-fmt": "cljfmt check --parallel=true src/",
diff --git a/exporter/pnpm-lock.yaml b/exporter/pnpm-lock.yaml
index 6c1947288c..3764b5fb63 100644
--- a/exporter/pnpm-lock.yaml
+++ b/exporter/pnpm-lock.yaml
@@ -8,6 +8,7 @@ overrides:
   lodash@<=4.17.23: ^4.17.24
   lodash@>=4.0.0 <=4.17.22: ^4.17.23
   lodash@>=4.0.0 <=4.17.23: ^4.17.24
+  playwright@>=1.61.1 <2.0.0-0: 1.62.1
 
 importers:
 
@@ -32,20 +33,20 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       ioredis:
-        specifier: ^5.11.1
-        version: 5.11.1
+        specifier: ^6.0.0
+        version: 6.0.0
       playwright:
-        specifier: ^1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
       raw-body:
-        specifier: ^3.0.2
-        version: 3.0.2
+        specifier: ^4.0.0
+        version: 4.0.0
       source-map-support:
         specifier: ^0.5.21
         version: 0.5.21
       undici:
-        specifier: ^8.5.0
-        version: 8.5.0
+        specifier: ^8.9.0
+        version: 8.9.0
       xml-js:
         specifier: ^1.6.11
         version: 1.6.11
@@ -54,8 +55,8 @@ importers:
         version: 5.1.2
     devDependencies:
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.1
+        version: 8.21.1
 
 packages:
 
@@ -63,8 +64,8 @@ packages:
     resolution: {integrity: sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ==}
     engines: {node: '>=6.9.0'}
 
-  '@ioredis/commands@1.10.0':
-    resolution: {integrity: sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==}
+  '@ioredis/commands@2.0.0':
+    resolution: {integrity: sha512-vrx0AE/T0h7cRZwfo1M39Cr+ZhZrkf0V8mQN75wucKCxCLD9l/VX6no3gFvrLqD1IlG/1LtzWovqEw3t0Vr9zg==}
 
   '@penpot/svgo@https://codeload.github.com/penpot/svgo/tar.gz/65b3a645df9edbe3c00acf4267dd06c2ca736021':
     resolution: {gitHosted: true, integrity: sha512-hG/pgVEWhmHEFMU+evGZkB5kHauff5Zo6ZO+Ro7HY0efsQTJft6svM4isH5jDISeSVrZ1CDGnhWBXuqkztsTWw==, tarball: https://codeload.github.com/penpot/svgo/tar.gz/65b3a645df9edbe3c00acf4267dd06c2ca736021}
@@ -141,9 +142,9 @@ packages:
     resolution: {integrity: sha512-DkVaaQHymRhpYEYo9x1oo7Q7B0Y6KJUsjm3c9eTyFDby4MHLBTwZ6ZDWBel5zrYxj1WsZgC5oLpiz+93MluXeA==}
     engines: {node: '>=20.19.0'}
 
-  brace-expansion@5.0.6:
-    resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   buffer-crc32@1.0.0:
     resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
@@ -273,10 +274,6 @@ packages:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
 
-  iconv-lite@0.7.2:
-    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
-    engines: {node: '>=0.10.0'}
-
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -287,9 +284,9 @@ packages:
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  ioredis@5.11.1:
-    resolution: {integrity: sha512-ehuGcf94bQXhfagULNXrJdfnWO38v070jxSx/qE87Kjzmu2fU7ro5EFAb+OPituLqgfyuQaym5DlrNydW2sJ9A==}
-    engines: {node: '>=12.22.0'}
+  ioredis@6.0.0:
+    resolution: {integrity: sha512-f+Dtubxfpf6KYFq7WVXJoOLn0bk4TJrMrN9SzeE+jrWrCWj7XX3fA6vkryafhADX+GMymRxgDJDOI33COkJc0w==}
+    engines: {node: '>=20.0.0'}
 
   is-stream@4.0.1:
     resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
@@ -330,14 +327,14 @@ packages:
     resolution: {integrity: sha512-GX0gsdbGVCgnRgbeGaubfjpBXyYRWOOCVeYh08bSQvDZqxz5ndXs1OTfAt/h36G1xvI94YIspsI0sVFqAV9+RQ==}
     engines: {node: '>=20.19.0'}
 
-  playwright-core@1.61.1:
-    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.1:
+    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.61.1:
-    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
-    engines: {node: '>=18'}
+  playwright@1.62.1:
+    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+    engines: {node: '>=20'}
     hasBin: true
 
   process-nextick-args@2.0.1:
@@ -347,9 +344,9 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
-  raw-body@3.0.2:
-    resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
-    engines: {node: '>= 0.10'}
+  raw-body@4.0.0:
+    resolution: {integrity: sha512-TMHtwexrgOt9VJ2E5JF9RO8mRXGNgC5wXvKkc5AVSJUt1L5gxvjg7eiCQl96EqUEpCWrnNEkCnbAplYtyuq1IA==}
+    engines: {node: '>=22'}
 
   readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
@@ -366,19 +363,12 @@ packages:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
 
-  redis-parser@3.0.0:
-    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
-    engines: {node: '>=4'}
-
   safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
   sax@1.6.0:
     resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
     engines: {node: '>=11.0.0'}
@@ -430,19 +420,15 @@ packages:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
 
-  undici@8.5.0:
-    resolution: {integrity: sha512-xamtWoB1EshgjpmlXd7GGm2VfdDtw1+rD8uhry8pSNW3If6S8E0m2T2+orSKeZXEn/aPJMviCpDBA65WJt8zhg==}
+  undici@8.9.0:
+    resolution: {integrity: sha512-aWZpUj7XoGonMClx4gdDRfgBjqeA+F473aDmROQQbM9n6PRfK/u1q/a0X4wMTgcHfT8H6fpbt98PFuDUwFg2YA==}
     engines: {node: '>=22.19.0'}
 
-  unpipe@1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: '>= 0.8'}
-
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -470,7 +456,7 @@ snapshots:
     dependencies:
       core-js-pure: 3.49.0
 
-  '@ioredis/commands@1.10.0': {}
+  '@ioredis/commands@2.0.0': {}
 
   '@penpot/svgo@https://codeload.github.com/penpot/svgo/tar.gz/65b3a645df9edbe3c00acf4267dd06c2ca736021':
     dependencies:
@@ -542,7 +528,7 @@ snapshots:
 
   boolbase@2.0.0: {}
 
-  brace-expansion@5.0.6:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -662,24 +648,19 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  iconv-lite@0.7.2:
-    dependencies:
-      safer-buffer: 2.1.2
-
   ieee754@1.2.1: {}
 
   inflation@2.1.0: {}
 
   inherits@2.0.4: {}
 
-  ioredis@5.11.1:
+  ioredis@6.0.0:
     dependencies:
-      '@ioredis/commands': 1.10.0
+      '@ioredis/commands': 2.0.0
       cluster-key-slot: 1.1.1
       debug: 4.4.3
       denque: 2.1.0
       redis-errors: 1.2.0
-      redis-parser: 3.0.0
       standard-as-callback: 2.1.0
     transitivePeerDependencies:
       - supports-color
@@ -704,7 +685,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.6
+      brace-expansion: 5.0.9
 
   ms@2.1.3: {}
 
@@ -714,11 +695,11 @@ snapshots:
     dependencies:
       boolbase: 2.0.0
 
-  playwright-core@1.61.1: {}
+  playwright-core@1.62.1: {}
 
-  playwright@1.61.1:
+  playwright@1.62.1:
     dependencies:
-      playwright-core: 1.61.1
+      playwright-core: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -726,12 +707,10 @@ snapshots:
 
   process@0.11.10: {}
 
-  raw-body@3.0.2:
+  raw-body@4.0.0:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.1
-      iconv-lite: 0.7.2
-      unpipe: 1.0.0
 
   readable-stream@2.3.8:
     dependencies:
@@ -757,16 +736,10 @@ snapshots:
 
   redis-errors@1.2.0: {}
 
-  redis-parser@3.0.0:
-    dependencies:
-      redis-errors: 1.2.0
-
   safe-buffer@5.1.2: {}
 
   safe-buffer@5.2.1: {}
 
-  safer-buffer@2.1.2: {}
-
   sax@1.6.0: {}
 
   setprototypeof@1.2.0: {}
@@ -829,13 +802,11 @@ snapshots:
 
   tsscmp@1.0.6: {}
 
-  undici@8.5.0: {}
-
-  unpipe@1.0.0: {}
+  undici@8.9.0: {}
 
   util-deprecate@1.0.2: {}
 
-  ws@8.21.0: {}
+  ws@8.21.1: {}
 
   xml-js@1.6.11:
     dependencies:
diff --git a/exporter/pnpm-workspace.yaml b/exporter/pnpm-workspace.yaml
index d71aa3ebaf..ac94ff8d53 100644
--- a/exporter/pnpm-workspace.yaml
+++ b/exporter/pnpm-workspace.yaml
@@ -1,9 +1,12 @@
 allowBuilds:
   core-js-pure: false
 minimumReleaseAgeExclude:
-  - lodash@4.17.24
-  - lodash@4.17.23
+  - lodash@4.17.23 || 4.17.24
+  - playwright-core@1.62.1
+  - playwright@1.62.1
+  - brace-expansion@5.0.7 || 5.0.8 || 5.0.9
 overrides:
   lodash@<=4.17.23: ^4.17.24
   lodash@>=4.0.0 <=4.17.22: ^4.17.23
   lodash@>=4.0.0 <=4.17.23: ^4.17.24
+  playwright@>=1.61.1 <2.0.0-0: "1.62.1"
diff --git a/exporter/scripts/build b/exporter/scripts/build
index 40eba8f44c..a240c17b75 100755
--- a/exporter/scripts/build
+++ b/exporter/scripts/build
@@ -8,6 +8,17 @@ export NODE_ENV=production;
 corepack enable;
 corepack install || exit 1;
 pnpm install || exit 1;
+pnpm run build:wasm;
+
+WASM_SRC="resources/wasm";
+WASM_SHARED="src/app/wasm/shared.js";
+if [ ! -f "$WASM_SRC/render-wasm.wasm" ] || [ ! -f "$WASM_SHARED" ]; then
+    echo "ERROR: the render-wasm build did not produce:" >&2;
+    echo "  $WASM_SRC/render-wasm.wasm" >&2;
+    echo "  $WASM_SHARED" >&2;
+    exit 1;
+fi
+
 rm -rf target
 
 # Build the application
@@ -18,6 +29,9 @@ cp pnpm-workspace.yaml target/;
 cp package.json target/;
 touch target/pnpm-workspace.yaml;
 
+mkdir -p target/$WASM_SRC;
+cp "$WASM_SRC/render-wasm.js" "$WASM_SRC/render-wasm.wasm" target/$WASM_SRC/;
+
 cat <<EOF | tee target/setup
 #/usr/bin/env bash
 set -e;
diff --git a/exporter/scripts/setup b/exporter/scripts/setup
index 46ab684fef..a99157468d 100755
--- a/exporter/scripts/setup
+++ b/exporter/scripts/setup
@@ -5,4 +5,4 @@ set -e;
 corepack enable;
 corepack install;
 pnpm install;
-pnpx playwright install chromium
+pnpm exec playwright install chromium
diff --git a/exporter/src/app/core.cljs b/exporter/src/app/core.cljs
index 5ce68ebf98..65828acd7a 100644
--- a/exporter/src/app/core.cljs
+++ b/exporter/src/app/core.cljs
@@ -12,6 +12,7 @@
    [app.config :as cf]
    [app.http :as http]
    [app.redis :as redis]
+   [app.wasm :as wasm]
    [promesa.core :as p]))
 
 (enable-console-print!)
@@ -23,6 +24,12 @@
           :public-uri (str (cf/get :public-uri))
           :internal-uri (str (cf/get-internal-uri))
           :version (:full cf/version))
+  (when (contains? cf/flags :wasm-export)
+    (l/warn :msg "headless wasm export enabled (experimental)"
+            :hint (str "renders run in-process on a single shared wasm module, "
+                       "one at a time; not recommended for busy instances")
+            :wasm-dir wasm/artifact-dir
+            :image-cache-mb wasm/image-cache-mb))
   (p/do!
    (bwr/init)
    (redis/init)
diff --git a/exporter/src/app/renderer.cljs b/exporter/src/app/renderer.cljs
index 32555c6b19..135c8e5925 100644
--- a/exporter/src/app/renderer.cljs
+++ b/exporter/src/app/renderer.cljs
@@ -7,10 +7,13 @@
 (ns app.renderer
   "Common renderer interface."
   (:require
+   [app.common.logging :as l]
    [app.common.spec :as us]
+   [app.config :as cf]
    [app.renderer.bitmap :as rb]
    [app.renderer.pdf :as rp]
    [app.renderer.svg :as rs]
+   [app.renderer.wasm :as rw]
    [cljs.spec.alpha :as s]))
 
 (s/def ::name ::us/string)
@@ -36,13 +39,22 @@
           :opt-un [::is-wasm]))
 
 (defn render
-  [{:keys [type] :as params} on-object]
+  [{:keys [type is-wasm] :as params} on-object]
   (us/verify ::render-params params)
   (us/verify fn? on-object)
-  (case type
-    :png  (rb/render params on-object)
-    :jpeg (rb/render params on-object)
-    :webp (rb/render params on-object)
-    :pdf  (rp/render params on-object)
-    :svg  (rs/render params on-object)))
+  (let [wasm-export? (contains? cf/flags :wasm-export)
+        headless?    (and is-wasm wasm-export? (not= :svg type))]
+    (when is-wasm
+      (l/info :hint "render"
+              :type type
+              :wasm-export wasm-export?
+              :backend (if headless? "wasm" "browser")))
+    (if headless?
+      (rw/render params on-object)
+      (case type
+        :png  (rb/render params on-object)
+        :jpeg (rb/render params on-object)
+        :webp (rb/render params on-object)
+        :pdf  (rp/render params on-object)
+        :svg  (rs/render params on-object)))))
 
diff --git a/exporter/src/app/renderer/wasm.cljs b/exporter/src/app/renderer/wasm.cljs
new file mode 100644
index 0000000000..902ba17a9a
--- /dev/null
+++ b/exporter/src/app/renderer/wasm.cljs
@@ -0,0 +1,451 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.renderer.wasm
+  "Headless renderer backend: renders exports with the render-wasm Skia
+  pipeline in this Node process, with no browser and no WebGL.
+
+  Per request: fetch scene (get-page RPC) -> serialize -> provision fonts and
+  images -> relayout text with the real fonts -> render each object.
+
+  One shared WASM design state, so requests are serialized one at a time.
+
+  Handles png/jpeg/webp (Skia encodes all three) and pdf; `:svg` stays on the
+  browser path."
+  (:require
+   ["node:fs" :as fs]
+   ["undici" :as http]
+   [app.common.data :as d]
+   [app.common.fonts :as cfnt]
+   ;; Required for side effects: these register the transit read handlers and
+   ;; deftype impls the `get-page` response is decoded into.
+   [app.common.geom.matrix]
+   [app.common.geom.point]
+   [app.common.geom.rect]
+   [app.common.logging :as l]
+   [app.common.transit :as t]
+   [app.common.types.fills.impl]
+   [app.common.types.objects-map]
+   [app.common.types.path.impl]
+   [app.common.types.shape]
+   [app.common.types.shape.images :as images]
+   [app.common.uri :as u]
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.util.mime :as mime]
+   [app.util.shell :as sh]
+   [app.wasm :as wasm]
+   [app.wasm.serialize :as serialize]
+   [cuerdas.core :as str]
+   [promesa.core :as p]))
+
+;; --- module lifecycle (one shared, lazily-initialized instance)
+
+(defonce ^:private module* (atom nil))
+
+(defn- ensure-module!
+  []
+  (or @module*
+      (reset! module* (wasm/init!))))
+
+;; --- serialized access to the shared module
+;;
+;; `handle-multiple-export` fans out partitions concurrently, but there is one
+;; design state and one global mem buffer, so their serialize/render/alloc must
+;; not interleave.
+
+(defonce ^:private queue (atom (p/resolved nil)))
+
+(defn- enqueue!
+  "Runs `thunk` (0-arg, returns a promise) only after all previously enqueued
+  work has settled. Returns `thunk`'s promise. A task's failure is isolated:
+  it doesn't break the chain for the next task."
+  [thunk]
+  (let [result (p/handle @queue (fn [_ _] (thunk)))]
+    (reset! queue (p/handle result (fn [_ _] nil)))
+    result))
+
+;; --- backend endpoints
+;;
+;; Every fetch targets the internal endpoint (falling back to public-uri),
+;; in a deployment the exporter reaches the backend over the container network
+
+(defn- internal-uri
+  "Absolute URI for `path` on the internal (backend) endpoint."
+  [path]
+  (-> (cf/get-internal-uri)
+      (u/ensure-path-slash)
+      (u/join path)
+      (str)))
+
+(defn- error-detail
+  "Node's fetch reports every transport failure as a bare `TypeError: fetch
+  failed`; the actual reason (TLS rejection, DNS, ECONNREFUSED) is buried in a
+  nested `cause` chain that the logger does not print. Flattens the chain into
+  one readable string."
+  [cause]
+  (->> (iterate (fn [^js e] (unchecked-get e "cause")) cause)
+       (take-while some?)
+       (take 5)
+       (map (fn [^js e]
+              (let [code (unchecked-get e "code")
+                    msg  (or (unchecked-get e "message") (str e))]
+                (if code (str code ": " msg) msg))))
+       (str/join " <- ")))
+
+(defn- fetch!
+  "`undici/fetch` that fails with an ex-info carrying the target uri and the
+  unwrapped cause chain, so a failed request says what actually went wrong and
+  against which endpoint."
+  [uri opts]
+  (->> (p/do (http/fetch uri opts))
+       (p/merr (fn [cause]
+                 (p/rejected (ex-info "http fetch failed"
+                                      {:uri uri :detail (error-detail cause)}
+                                      cause))))))
+
+(defn- explain
+  "Log-friendly reason for `cause`: the detail `fetch!` already attached, or a
+  freshly unwrapped chain for anything else (WASM aborts, decode errors)."
+  [cause]
+  (or (:detail (ex-data cause))
+      (error-detail cause)))
+
+(defn- rpc-headers
+  "Auth headers for backend RPC calls (management key + bearer)."
+  [token]
+  #js {"Content-Type"  "application/transit+json"
+       "X-Shared-Key"  (str "exporter " cf/management-key)
+       "Authorization" (str "Bearer " token)})
+
+(defn- asset-headers
+  "Auth headers for `/assets/*`. Cookie, not Bearer: those endpoints redirect to
+  a presigned S3/minio URL, and a Bearer header makes S3 400 (\"multiple
+  authentication types\")."
+  [token]
+  #js {"X-Shared-Key" (str "exporter " cf/management-key)
+       "Cookie"       (str "auth-token=" token)})
+
+;; --- shape bundle fetch (backend RPC)
+
+(defn- fetch-objects
+  "Fetches the exported roots and their children from the backend via the
+  `get-page` RPC (`:object-id`, as the browser render path does), using the
+  same auth the exporter uses elsewhere (management key + bearer)."
+  [{:keys [file-id page-id share-id token objects]}]
+  (let [headers (rpc-headers token)
+        root-ids (into #{} (map :id) objects)
+        body    (t/encode-str (cond-> {:file-id file-id
+                                       :page-id page-id}
+                                (seq root-ids) (assoc :object-id root-ids)
+                                share-id       (assoc :share-id share-id)))
+        uri     (internal-uri "api/rpc/command/get-page")]
+    (l/dbg :hint "wasm render: get-page"
+           :uri uri
+           :file-id (str file-id)
+           :page-id (str page-id)
+           :roots (count root-ids))
+    (->> (fetch! uri #js {:method "POST" :headers headers :body body})
+         (p/mcat (fn [^js resp]
+                   (if (= 200 (.-status resp))
+                     (.text resp)
+                     (->> (.text resp)
+                          (p/mcat (fn [resp-body]
+                                    (l/error :hint "wasm render: get-page failed"
+                                             :uri uri
+                                             :status (.-status resp)
+                                             :body resp-body)
+                                    (p/rejected (ex-info "get-page failed"
+                                                         {:status (.-status resp)
+                                                          :body resp-body}))))))))
+         (p/fmap t/decode-str)
+         (p/fmap :objects))))
+
+;; --- font resolution
+;;
+;; The text serializer keeps each font's real uuid, so `wasm/fonts-for-shape`
+;; reports it. Custom (team) fonts resolve through the file's font variants,
+;; google fonts through the shared `app.common.fonts` catalog; builtin
+;; fonts through its bundled family + the frontend's static `/fonts/`.
+
+(defn- fetch-font-variants
+  "Team (custom) font variants for the file, or nil — a failure here degrades
+  to fallback fonts, it does not fail the export."
+  [{:keys [file-id share-id token]}]
+  (let [headers (rpc-headers token)
+        body    (t/encode-str (cond-> {:file-id file-id}
+                                share-id (assoc :share-id share-id)))
+        uri     (internal-uri "api/rpc/command/get-font-variants")]
+    (->> (fetch! uri #js {:method "POST" :headers headers :body body})
+         (p/mcat (fn [^js resp]
+                   (if (= 200 (.-status resp))
+                     (.text resp)
+                     (p/resolved nil))))
+         (p/fmap (fn [s] (when s (t/decode-str s))))
+         (p/merr (fn [cause]
+                   (l/warn :hint "wasm render: get-font-variants failed"
+                           :uri uri :detail (explain cause) :cause cause)
+                   (p/resolved nil))))))
+
+(defn- fetch-ttf-bytes
+  "Downloads a TTF, returning a promise of an ArrayBuffer (or nil). A failure
+  here degrades to fallback fonts, it does not fail the export."
+  ([uri] (fetch-ttf-bytes uri #js {:method "GET"}))
+  ([uri opts]
+   (->> (fetch! uri opts)
+        (p/mcat (fn [^js resp]
+                  (if (= 200 (.-status resp))
+                    (.arrayBuffer resp)
+                    (p/resolved nil))))
+        (p/merr (fn [cause]
+                  (l/warn :hint "wasm render: font fetch failed"
+                          :uri uri :detail (explain cause) :cause cause)
+                  (p/resolved nil))))))
+
+;; TTF bytes cached for the process lifetime, keyed by whatever identifies the
+;; variant (a gfont id+weight+style, a builtin file name).
+(defonce ^:private font-bytes* (atom {}))
+
+(defn- cached-ttf-bytes
+  [cache-key fetch-fn]
+  (if-let [bytes (get @font-bytes* cache-key)]
+    (p/resolved bytes)
+    (->> (fetch-fn)
+         (p/fmap (fn [buf]
+                   (when buf (swap! font-bytes* assoc cache-key buf))
+                   buf)))))
+
+(defn- fetch-asset-bytes
+  [asset-id {:keys [token]}]
+  (fetch-ttf-bytes (internal-uri (str "assets/by-id/" asset-id))
+                   #js {:method "GET" :headers (asset-headers token)}))
+
+(defn- fetch-gfont-bytes
+  [ttf-url]
+  (fetch-ttf-bytes (cfnt/gstatic->proxy-url ttf-url (internal-uri "internal/gfonts/font"))))
+
+(defn- fetch-builtin-font-bytes
+  [ttf-file]
+  (cached-ttf-bytes ttf-file #(fetch-ttf-bytes (internal-uri (str "fonts/" ttf-file)))))
+
+(defn- make-resolve-font
+  "Builds a `resolve-font` fn (family map -> promise of TTF bytes). Custom
+  variants first, matching uuid+weight+style then degrading to uuid+weight then
+  uuid; the bundled fonts for `uuid/zero`, which is what `font-id->uuid` maps
+  every builtin family to; google catalog otherwise."
+  [variants params]
+  (fn [{:keys [id weight style]}]
+    (let [font-uuid (uuid/from-unsigned-parts (aget id 0) (aget id 1) (aget id 2) (aget id 3))
+          style-str (if (zero? style) "normal" "italic")
+          variant   (or (d/seek (fn [v] (and (= (:font-id v) font-uuid)
+                                             (= (:font-weight v) weight)
+                                             (= (name (:font-style v)) style-str)))
+                                variants)
+                        (d/seek (fn [v] (and (= (:font-id v) font-uuid)
+                                             (= (:font-weight v) weight)))
+                                variants)
+                        (d/seek (fn [v] (= (:font-id v) font-uuid)) variants))]
+      (cond
+        (:ttf-file-id variant)
+        (fetch-asset-bytes (:ttf-file-id variant) params)
+
+        (= uuid/zero font-uuid)
+        (fetch-builtin-font-bytes (cfnt/resolve-ttf-file weight style))
+
+        :else
+        (if-let [gurl (cfnt/resolve-ttf-url font-uuid weight style)]
+          (fetch-gfont-bytes gurl)
+          (p/resolved nil))))))
+
+;; --- fallback fonts (emoji + per-script noto fonts)
+;;
+;; Emoji and non-latin scripts render through fallback families, not through
+;; any span's font family, so `wasm/fonts-for-shape` never reports them and the
+;; provisioning above never uploads them. Must run per request, since
+;; `clear-fonts!` empties the store; the TTF bytes stay cached per process.
+
+(defn- scene-fallback-fonts
+  "Fallback font descriptors needed by the scene's text. Deduped because
+  several languages map to one noto family and provisioning is concurrent —
+  otherwise they all miss the byte cache at once and refetch the same TTF."
+  [scene]
+  (let [texts  (for [shape (vals scene)
+                     :when (= :text (:type shape))
+                     node  (or (some->> (:content shape) (tree-seq :children :children)) [])
+                     :let  [text (:text node)]
+                     :when (string? text)]
+                 text)
+        emoji? (boolean (some cfnt/contains-emoji? texts))
+        langs  (reduce cfnt/collect-used-languages #{} texts)]
+    (distinct
+     (cond-> (cfnt/add-noto-fonts [] langs)
+       emoji? (cfnt/add-emoji-font)))))
+
+(defn- fetch-fallback-font-bytes
+  "Downloads one fallback font's TTF. Cached by the whole variant, not just
+  `font-id`: `resolve-ttf-url` picks a different TTF per weight/style, so a
+  font-id-only key would serve the first downloaded variant for every other one."
+  [{:keys [font-id weight style]}]
+  (if-let [ttf-url (some-> (cfnt/gfont-id->uuid font-id) (cfnt/resolve-ttf-url weight style))]
+    (cached-ttf-bytes [font-id weight style] #(fetch-gfont-bytes ttf-url))
+    (p/resolved nil)))
+
+(defn- provision-fallback-fonts!
+  [scene]
+  (->> (scene-fallback-fonts scene)
+       (map (fn [{:keys [font-id weight style is-emoji is-fallback] :as font}]
+              (if-let [font-uuid (cfnt/gfont-id->uuid font-id)]
+                (->> (fetch-fallback-font-bytes font)
+                     (p/fmap (fn [buf]
+                               (if buf
+                                 (wasm/store-font! {:id (uuid/get-u32 font-uuid)
+                                                    :weight weight
+                                                    :style style
+                                                    :emoji? (boolean is-emoji)
+                                                    :fallback? (boolean is-fallback)}
+                                                   buf)
+                                 (l/warn :hint "wasm render: fallback font unavailable"
+                                         :font-id font-id)))))
+                (p/resolved nil))))
+       (p/all)))
+
+;; --- image resolution
+;;
+;; Image fills reference file-media ids; the encoded bytes go straight to
+;; `_store_image` (Skia decodes, no WebGL), keyed by media uuid so this happens
+;; once per request rather than per rendered object.
+
+(defn- fetch-file-media-bytes
+  "Downloads an image fill's encoded bytes by file-media id."
+  [media-id {:keys [token]}]
+  (let [headers (asset-headers token)
+        uri     (internal-uri (str "assets/by-file-media-id/" media-id))]
+    (->> (fetch! uri #js {:method "GET" :headers headers})
+         (p/mcat (fn [^js resp]
+                   (if (= 200 (.-status resp))
+                     (.arrayBuffer resp)
+                     (do
+                       (l/warn :hint "wasm render: image fetch non-200"
+                               :media-id (str media-id)
+                               :uri uri
+                               :status (.-status resp))
+                       (p/resolved nil)))))
+         (p/merr (fn [cause]
+                   (l/warn :hint "wasm render: image fetch failed"
+                           :media-id (str media-id) :uri uri
+                           :detail (explain cause) :cause cause)
+                   (p/resolved nil))))))
+
+(defn- provision-images!
+  "Fetches and stores every image the scene references (shape, stroke and
+  text-span fills, enumerated by `app.common.types.shape.images`). Unlike fonts,
+  the image store is not reset per request, so already-held images are skipped
+  and repeated exports of a file reuse them."
+  [scene params]
+  (let [all-ids (images/scene-image-ids scene)
+        new-ids (remove wasm/image-cached? all-ids)]
+    (l/dbg :hint "wasm render: provisioning images"
+           :total (count all-ids)
+           :cached (- (count all-ids) (count new-ids)))
+    (->> new-ids
+         (map (fn [image-id]
+                (->> (fetch-file-media-bytes image-id params)
+                     (p/fmap (fn [buf]
+                               (if buf
+                                 (do
+                                   (l/dbg :hint "wasm render: image stored"
+                                          :media-id (str image-id)
+                                          :bytes (.-byteLength ^js buf))
+                                   (wasm/store-image! image-id buf))
+                                 (l/warn :hint "wasm render: image unavailable"
+                                         :media-id (str image-id))))))))
+         (p/all))))
+
+(defn- relayout-text!
+  "Recomputes layout for every text shape, once the real fonts are provisioned
+  (serialize-time layout used the fallback)."
+  [scene]
+  (doseq [shape (vals scene)
+          :when (= :text (:type shape))]
+    (wasm/update-text-layout! (:id shape))))
+
+;; --- render
+
+(defn- render-object-bytes
+  [type id scale]
+  (if (= :pdf type)
+    (let [bytes (wasm/render-shape-pdf id scale)]
+      (l/dbg :hint "PDF generated via Skia (render-wasm headless)"
+             :object-id (str id)
+             :backend "skia-wasm"
+             :bytes (.-length bytes))
+      bytes)
+    (wasm/render-shape-raster id scale type)))
+
+(defn- render*
+  [{:keys [scale type objects] :as params} on-object]
+  (l/dbg :hint "wasm render: start"
+         :type type
+         :scale scale
+         :objects (count objects)
+         :file-id (str (:file-id params))
+         :page-id (str (:page-id params)))
+  (->> (ensure-module!)
+       (p/mcat (fn [_] (fetch-objects params)))
+       (p/mcat (fn [scene]
+                 (l/dbg :hint "wasm render: scene fetched" :shapes (count scene))
+                 (serialize/serialize-scene! scene)
+                 (l/dbg :hint "wasm render: scene serialized")
+                 ;; So fonts from a previous request don't leak into this one.
+                 (wasm/clear-fonts!)
+                 (->> (p/all [(fetch-font-variants params)
+                              (provision-images! scene params)
+                              (provision-fallback-fonts! scene)])
+                      (p/mcat
+                       (fn [[variants _]]
+                         (let [resolve-font (make-resolve-font (or variants []) params)]
+                           ;; Before rendering, so the relayout below sees real
+                           ;; font metrics. Deduped across objects: a partition
+                           ;; sharing one family downloads its TTF once.
+                           (wasm/provision-fonts! (map :id objects) resolve-font))))
+                      (p/mcat
+                       (fn [_]
+                         (relayout-text! scene)
+                         (p/run
+                          (fn [{:keys [id] :as object}]
+                            (let [bytes (render-object-bytes type id scale)
+                                  path  (sh/tempfile :prefix "penpot.tmp.wasm."
+                                                     :suffix (mime/get-extension type))]
+                              (l/dbg :hint "wasm render: object rendered"
+                                     :object-id (str id) :bytes (.-length bytes))
+                              (fs/writeFileSync path bytes)
+                              ;; `on-object` returns a plain value (zip append) or
+                              ;; a promise (single export's file move); `p/do`
+                              ;; normalizes both to a thenable.
+                              (p/do (on-object (assoc object :path path)))))
+                          objects))))))
+       (p/fmap (fn [result]
+                 ;; After the request, never mid-render, so an image can't
+                 ;; disappear under a running export.
+                 (let [evicted (wasm/evict-images! wasm/image-cache-mb)]
+                   (when (pos? evicted)
+                     (l/info :hint "wasm render: evicted cached images" :count evicted)))
+                 result))
+       (p/merr (fn [cause]
+                 (l/error :hint "wasm render: failed"
+                          :detail (explain cause)
+                          :internal-uri (str (cf/get-internal-uri))
+                          :cause cause)
+                 ;; A panic can leave the mem buffer allocated or the instance
+                 ;; aborted; drop it so the next request rebuilds a fresh one.
+                 (reset! module* nil)
+                 (p/rejected cause)))))
+
+(defn render
+  "Public entry. `enqueue!` keeps concurrent exports off each other's toes on
+  the shared WASM instance."
+  [params on-object]
+  (enqueue! (fn [] (render* params on-object))))
diff --git a/exporter/src/app/wasm.cljs b/exporter/src/app/wasm.cljs
new file mode 100644
index 0000000000..8a06b9b4f2
--- /dev/null
+++ b/exporter/src/app/wasm.cljs
@@ -0,0 +1,255 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.wasm
+  "Headless driver for the render-wasm module under Node: the GPU-free
+  counterpart of `app.render-wasm.api`. Loads the emscripten artifact, boots it
+  via `init_headless`, and exposes font provisioning + shape rendering.
+
+  Serialization is reused from the portable render-wasm leaves, so this
+  namespace owns only the Node runtime and the headless render calls.
+
+  Requires render-wasm built with `-sENVIRONMENT=web,node`."
+  (:require
+   ["node:fs" :as fs]
+   ["node:path" :as path]
+   [app.common.data :as d]
+   [app.common.logging :as l]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.wasm :as wasm]
+   [app.common.uuid :as uuid]
+   ;; Required for side effects: binds the generated enums.
+   [app.wasm.enums]
+   [promesa.core :as p]
+   [shadow.esm :refer [dynamic-import]]))
+
+(def ^:private default-viewport-width 1920)
+(def ^:private default-viewport-height 1080)
+
+;; render_shape_raster / render_shape_pixels result header: [len u32][w u32][h u32].
+(def ^:private RASTER-HEADER-BYTES 12)
+;; render_shape_pdf result header: [len u32] only.
+(def ^:private PDF-HEADER-BYTES 4)
+;; get_fonts_for_shape entry: [uuid 16 bytes][weight u32][style u32].
+(def ^:private FONT-ENTRY-BYTES 24)
+
+(def artifact-dir
+  "Built render-wasm artifact, relative to the process working directory. Same
+  path in devenv and inside the bundle, so it is a constant."
+  "resources/wasm")
+
+(def image-cache-mb
+  "Byte budget (MB) the image store is trimmed to between requests."
+  256)
+
+(defn- read-result-bytes
+  "Reads `len` bytes from the WASM heap starting at `offset`, copying them out
+  (via `.slice`) before the buffer is freed."
+  [offset len]
+  (.slice (mem/get-heap-u8) offset (+ offset len)))
+
+;; --- MODULE LIFECYCLE
+
+(defn init!
+  "Loads the render-wasm artifact under Node and boots it headless. Sets the
+  shared `wasm/internal-module` so the portable serialization leaves work.
+  Idempotent-ish: callers should hold the returned module."
+  ([] (init! default-viewport-width default-viewport-height))
+  ([width height]
+   (let [dir       artifact-dir
+         js-path   (path/resolve dir "render-wasm.js")
+         wasm-path (path/resolve dir "render-wasm.wasm")
+         wasm-bytes (fs/readFileSync wasm-path)]
+     (l/info :hint "loading render-wasm (headless)" :js js-path)
+     ;; shadow-cljs :esm — use its dynamic-import helper (raw `js/import`
+     ;; compiles to an undefined `import$`).
+     (->> (dynamic-import (str "file://" js-path))
+          (p/mcat
+           (fn [mod]
+             (let [factory (unchecked-get mod "default")]
+               (factory
+                #js {;; Bypass the web fetch loader: instantiate from local bytes.
+                     :instantiateWasm
+                     (fn [imports success]
+                       (-> (js/WebAssembly.instantiate wasm-bytes imports)
+                           (.then (fn [result] (success (.-instance result)))))
+                       #js {})
+                     :locateFile (fn [p] (path/resolve dir p))
+                     :printErr   (fn [s] (l/warn :wasm s))}))))
+          (p/fmap
+           (fn [module]
+             (set! wasm/internal-module module)
+             (h/call module "_init_headless" width height)
+             (set! wasm/context-initialized? true)
+             (l/info :hint "render-wasm headless module ready" :width width :height height)
+             module))))))
+
+;; --- FONT PROVISIONING (on demand, mirrors the browser)
+
+(defn fonts-for-shape
+  "Returns the distinct font families needed to render the subtree rooted at
+  `shape-id` as a vector of {:id <uuid-u32x4> :weight :style}. Equivalent to
+  the browser's `get-content-fonts`, but read from the loaded WASM tree."
+  [shape-id]
+  (let [module  wasm/internal-module
+        buf     (uuid/get-u32 shape-id) ;; resolved from app.render-wasm leaves
+        offset  (h/call module "_get_fonts_for_shape"
+                        (aget buf 0) (aget buf 1) (aget buf 2) (aget buf 3))
+        heap32  (mem/get-heap-u32)
+        n       (aget heap32 (mem/->offset-32 offset))
+        ;; `vec` must stay eager: it reads the result buffer, and the
+        ;; `mem/free` below invalidates these offsets.
+        entries (vec
+                 (for [i (range n)]
+                   (let [base (+ offset 4 (* i FONT-ENTRY-BYTES))
+                         u32  (fn [o] (aget heap32 (mem/->offset-32 (+ base o))))]
+                     {:id     #js [(u32 0) (u32 4) (u32 8) (u32 12)]
+                      :weight (u32 16)
+                      :style  (u32 20)})))]
+    (mem/free)
+    entries))
+
+(defn- font-key
+  "Value key for a family map. Its `:id` is a JS array, so the map itself can't
+  be compared by value."
+  [{:keys [id weight style]}]
+  [(aget id 0) (aget id 1) (aget id 2) (aget id 3) weight style])
+
+(defn fonts-for-shapes
+  "Distinct font families needed by every subtree in `shape-ids`. Objects in a
+  partition overwhelmingly share families, so deduping here means one download
+  and one `_store_font` per family rather than one per object."
+  [shape-ids]
+  (into [] (comp (mapcat fonts-for-shape)
+                 (d/distinct-xf font-key))
+        shape-ids))
+
+(defn store-font!
+  "Uploads one font's TTF bytes into the WASM font store, keyed by the family
+  (uuid quartet + weight + style). `font-bytes` is a Uint8Array/Buffer.
+
+  Does NOT call `mem/free` — `store_font` (and likewise `store_image` below)
+  releases the global buffer itself on the Rust side. Freeing again here would
+  drop a buffer a later writer already owns."
+  [{:keys [id weight style emoji? fallback?]} font-bytes]
+  (let [module wasm/internal-module
+        size   (.-byteLength font-bytes)
+        ptr    (h/call module "_alloc_bytes" size)
+        heap   (mem/get-heap-u8)]
+    (.set heap (js/Uint8Array. font-bytes) ptr)
+    (h/call module "_store_font"
+            (aget id 0) (aget id 1) (aget id 2) (aget id 3)
+            weight style (boolean emoji?) (boolean fallback?))))
+
+(defn clear-fonts!
+  "Resets the WASM font store. Must be called once per render request because
+  the shared module would otherwise accumulate fonts across requests."
+  []
+  (h/call wasm/internal-module "_clear_fonts"))
+
+(defn update-text-layout!
+  "Recomputes a text shape's layout with the currently provisioned fonts. Text is
+  laid out at serialize time using the fallback font (real fonts aren't uploaded
+  yet), so this must run again after `provision-fonts!` or glyph metrics/line
+  breaks are wrong."
+  [shape-id]
+  (let [buf (uuid/get-u32 shape-id)]
+    (h/call wasm/internal-module "_update_shape_text_layout_for"
+            (aget buf 0) (aget buf 1) (aget buf 2) (aget buf 3))))
+
+(defn image-cached?
+  "True when the module's image store already holds this image (full size).
+  The store is NOT reset between requests, so previously provisioned images
+  can be reused instead of refetched."
+  [image-id]
+  (let [buf (uuid/get-u32 image-id)]
+    (not (zero? (h/call wasm/internal-module "_is_image_cached"
+                        (aget buf 0) (aget buf 1) (aget buf 2) (aget buf 3)
+                        false)))))
+
+(defn store-image!
+  "Uploads one image's *encoded* bytes (PNG/JPEG — Skia decodes, no WebGL) into
+  the WASM image store via `_store_image`. Buffer layout matches the Rust reader:
+  [shape uuid 16][image uuid 16][is_thumbnail u32][encoded bytes]. Images are
+  keyed by image uuid, so the shape uuid is left zero. `image-bytes` is an
+  ArrayBuffer/Buffer/Uint8Array."
+  [image-id image-bytes]
+  (let [module wasm/internal-module
+        img-u8 (js/Uint8Array. image-bytes)
+        size   (.-byteLength img-u8)
+        total  (+ 36 size)
+        ptr    (h/call module "_alloc_bytes" total)
+        heap   (mem/get-heap-u8)
+        dview  (js/DataView. (.-buffer heap))
+        quart  (uuid/get-u32 image-id)]
+    ;; shape uuid [0..16) = 0 (images are keyed by image uuid only)
+    (.setUint32 dview (+ ptr 0) 0 true)
+    (.setUint32 dview (+ ptr 4) 0 true)
+    (.setUint32 dview (+ ptr 8) 0 true)
+    (.setUint32 dview (+ ptr 12) 0 true)
+    ;; image uuid [16..32) — 4 LE u32 (matches common `buffer/write-uuid`, which
+    ;; the fill path uses, so it hashes to the same key the fill references)
+    (.setUint32 dview (+ ptr 16) (aget quart 0) true)
+    (.setUint32 dview (+ ptr 20) (aget quart 1) true)
+    (.setUint32 dview (+ ptr 24) (aget quart 2) true)
+    (.setUint32 dview (+ ptr 28) (aget quart 3) true)
+    ;; is_thumbnail [32..36) = 0
+    (.setUint32 dview (+ ptr 32) 0 true)
+    ;; encoded bytes [36..)
+    (.set heap img-u8 (+ ptr 36))
+    (h/call module "_store_image")))
+
+(defn evict-images!
+  "Evicts least-recently-used images until the store retains at most `max-mb`
+  megabytes. Returns the number evicted."
+  [max-mb]
+  (h/call wasm/internal-module "_evict_images_to_budget" max-mb))
+
+(defn provision-fonts!
+  "Resolves and uploads every font needed by `shape-ids`, each family fetched
+  once. `resolve-font` is an injected fn of the family map -> promise of TTF
+  bytes (or nil to skip). This keeps the font *source* (gfonts proxy / custom
+  assets / backend) out of the driver."
+  [shape-ids resolve-font]
+  (->> (fonts-for-shapes shape-ids)
+       (map (fn [family]
+              (->> (resolve-font family)
+                   (p/fmap (fn [bytes] (when bytes (store-font! family bytes)))))))
+       (p/all)))
+
+;; --- RENDER
+
+(defn- read-render-result
+  "Copies the encoded payload out of a `_render_shape_*` result buffer and frees
+  it. `header-bytes` is the size of the header preceding the payload."
+  [offset header-bytes]
+  (let [heap32 (mem/get-heap-u32)
+        len    (aget heap32 (mem/->offset-32 offset))
+        bytes  (read-result-bytes (+ offset header-bytes) len)]
+    (mem/free)
+    bytes))
+
+(defn render-shape-raster
+  "Renders the shape subtree to encoded image bytes (Uint8Array) on a CPU
+  surface. `format` is :png, :jpeg or :webp; jpeg is flattened onto white on
+  the Rust side, since it has no alpha channel."
+  [shape-id scale format]
+  (let [buf (uuid/get-u32 shape-id)]
+    (-> (h/call wasm/internal-module "_render_shape_raster"
+                (aget buf 0) (aget buf 1) (aget buf 2) (aget buf 3)
+                scale (sr/translate-raster-format format))
+        (read-render-result RASTER-HEADER-BYTES))))
+
+(defn render-shape-pdf
+  "Renders the shape subtree to PDF bytes (Uint8Array)."
+  [shape-id scale]
+  (let [buf (uuid/get-u32 shape-id)]
+    (-> (h/call wasm/internal-module "_render_shape_pdf"
+                (aget buf 0) (aget buf 1) (aget buf 2) (aget buf 3)
+                scale)
+        (read-render-result PDF-HEADER-BYTES))))
diff --git a/exporter/src/app/wasm/enums.cljs b/exporter/src/app/wasm/enums.cljs
new file mode 100644
index 0000000000..9c1a429522
--- /dev/null
+++ b/exporter/src/app/wasm/enums.cljs
@@ -0,0 +1,19 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.wasm.enums
+  "Binds this build's generated enums into the shared bridge.
+
+  `shared.js` is emitted next to this file by `render-wasm/build export` and is
+  not committed. Requiring this namespace is what makes
+  `app.common.render-wasm.wasm/serializers` usable."
+  (:require
+   ["./shared.js" :as shared]
+   [app.common.render-wasm.wasm :as wasm])
+  (:require-macros
+   [app.common.render-wasm.enums :as enums]))
+
+(wasm/init-serializers! (enums/serializers shared))
diff --git a/exporter/src/app/wasm/serialize.cljs b/exporter/src/app/wasm/serialize.cljs
new file mode 100644
index 0000000000..cbb08c27f3
--- /dev/null
+++ b/exporter/src/app/wasm/serialize.cljs
@@ -0,0 +1,46 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.wasm.serialize
+  "Browser-free shape serialization for the headless exporter: the counterpart
+  of `app.render-wasm.api/set-object`, which cannot be reused directly because
+  its namespace pulls React/DOM/store. Only the call sequencing lives here —
+  every byte layout comes from the shared serializers, so the bytes sent to
+  WASM are the editor's.
+
+  Covers everything except svg-raw. Image bytes and fonts are provisioned
+  separately by `app.renderer.wasm`."
+  (:require
+   [app.common.render-wasm.api.props :as props]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.serialize-shape :as serialize-shape]
+   [app.common.render-wasm.wasm :as wasm]
+   [app.wasm.text :as text]))
+
+(defn set-shape!
+  "Serializes a single shape into the WASM design state. The host-independent
+  properties (base props, children, blur, shadows, svg-attrs, mask, bool-type,
+  path geometry, grow-type) go through the shared `serialize-shape!` — the same
+  code the workspace's `set-object` uses, so the two can't drift. Only the
+  host-specific parts are handled here: fills/strokes (image bytes are provisioned
+  separately) and text content (fonts provisioned separately)."
+  [shape]
+  (let [type (get shape :type)]
+    (serialize-shape/serialize-shape! shape)
+    (props/write-shape-fills! (get shape :fills))
+    (when-not (= type :group)
+      (props/write-shape-strokes! (get shape :strokes)))
+    (when (= type :text)
+      (text/set-shape-text! (get shape :content)))))
+
+(defn serialize-scene!
+  "Loads every shape of an `objects` map into the WASM design state. Resets the
+  shapes pool first so repeated exports don't accumulate into the shared
+  state. Order is irrelevant: shapes reference each other by id and the tree
+  is resolved at render time."
+  [objects]
+  (h/call wasm/internal-module "_init_shapes_pool" (count objects))
+  (run! set-shape! (vals objects)))
diff --git a/exporter/src/app/wasm/text.cljs b/exporter/src/app/wasm/text.cljs
new file mode 100644
index 0000000000..714542d7f1
--- /dev/null
+++ b/exporter/src/app/wasm/text.cljs
@@ -0,0 +1,35 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.wasm.text
+  "Browser-free text-content serialization for the headless exporter. Only the
+  paragraph walk is local: the binary layout and the font-id -> uuid mapping
+  both come from `app.common.render-wasm.text-content`."
+  (:require
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.text-content :as tc]
+   [app.common.render-wasm.wasm :as wasm]))
+
+(defn set-shape-text!
+  "Serializes a text shape's content into the current WASM shape. Mirrors the
+  editor's sequence: clear -> vertical-align -> append each paragraph -> layout.
+  Byte writing and font resolution are the shared
+  `text-content/write-shape-text!` defaults; the exporter has no fonts DB, so
+  it injects no variant normalization."
+  [content]
+  (when content
+    (h/call wasm/internal-module "_clear_shape_text")
+    (h/call wasm/internal-module "_set_shape_vertical_align"
+            (sr/translate-vertical-align (get content :vertical-align)))
+    (let [paragraph-set (first (get content :children))
+          paragraphs    (get paragraph-set :children)]
+      (doseq [paragraph paragraphs]
+        (let [spans (get paragraph :children)]
+          (when (seq spans)
+            (let [text (apply str (map :text spans))]
+              (tc/write-shape-text! spans paragraph text {}))))))
+    (h/call wasm/internal-module "_update_shape_text_layout")))
diff --git a/frontend/deps.edn b/frontend/deps.edn
index 801a990923..f060448343 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -1,11 +1,12 @@
 {:paths ["src" "vendor" "resources" "test"]
  :deps
- {penpot/common
+ {;; Carries `app.common.render-wasm.*`, shared with the headless exporter.
+  penpot/common
   {:local/root "../common"}
 
   org.clojure/clojure {:mvn/version "1.12.2"}
   binaryage/devtools {:mvn/version "RELEASE"}
-  metosin/reitit-core {:mvn/version "0.9.1"}
+  metosin/reitit-core {:mvn/version "0.10.1"}
   funcool/okulary {:mvn/version "2022.04.11-16"}
 
   funcool/tubax
@@ -50,11 +51,10 @@
               "--enable-native-access=ALL-UNNAMED"]
 
    :extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.2.2"}
+   {thheller/shadow-cljs {:mvn/version "3.4.11"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
-    criterium/criterium {:mvn/version "0.4.6"}
-    cider/cider-nrepl {:mvn/version "0.57.0"}}}
+    criterium/criterium {:mvn/version "0.4.6"}}}
 
   :shadow-cljs
   {:main-opts ["-m" "shadow.cljs.devtools.cli"]
diff --git a/frontend/package.json b/frontend/package.json
index f743baa28a..2a257ef13d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "browserslist": [
     "defaults"
   ],
@@ -16,10 +16,10 @@
   "scripts": {
     "build:app:assets": "node ./scripts/build-app-assets.js",
     "build:fonts-preview": "node ./scripts/build-fonts-preview.js",
-    "build:storybook": "pnpm run build:storybook:assets && pnpm run build:storybook:cljs && storybook build",
+    "build:storybook": "(cd packages/ui && pnpm run build) && pnpm run build:storybook:assets && pnpm run build:storybook:cljs && storybook build",
     "build:storybook:assets": "node ./scripts/build-storybook-assets.js",
     "build:storybook:cljs": "clojure -M:dev:shadow-cljs compile storybook",
-    "build:wasm": "../render-wasm/build",
+    "build:wasm": "../render-wasm/build frontend",
     "build:app:libs": "node ./scripts/build-libs.js",
     "build:app:main": "clojure -M:dev:shadow-cljs release main worker",
     "build:app:worker": "clojure -M:dev:shadow-cljs release worker",
@@ -30,7 +30,7 @@
     "fmt:clj": "cljfmt fix --parallel=true src/ test/",
     "fmt:js": "prettier -c src/**/*.stories.jsx -c playwright/**/*.js -c scripts/**/*.js -c text-editor/**/*.js -w",
     "fmt:scss": "prettier -c resources/styles -c src/**/*.scss -w",
-    "lint:clj": "clj-kondo --parallel --lint ../common/src src/",
+    "lint:clj": "clj-kondo --config-dir ../.clj-kondo --lint ../common/src src/",
     "lint:js": "exit 0",
     "lint:scss": "pnpm exec stylelint '{src,resources}/**/*.scss'",
     "build:test": "pnpm run build:wasm && clojure -M:dev:shadow-cljs compile test",
@@ -58,64 +58,63 @@
     "@penpot/text-editor": "link:text-editor",
     "@penpot/tokenscript": "link:packages/tokenscript",
     "@penpot/ua-parser": "penpot/ua-parser#1.0.0",
-    "@penpot/ui": "link:packages/ui",
-    "@playwright/test": "1.61.1",
-    "@storybook/addon-docs": "10.4.6",
-    "@storybook/addon-themes": "10.4.6",
-    "@storybook/addon-vitest": "10.4.6",
-    "@storybook/react-vite": "10.4.6",
+    "@playwright/test": "1.62.1",
+    "@storybook/addon-docs": "10.5.6",
+    "@storybook/addon-themes": "10.5.6",
+    "@storybook/addon-vitest": "10.5.6",
+    "@storybook/react-vite": "10.5.6",
     "@tokens-studio/sd-transforms": "2.0.3",
-    "@types/node": "^26.1.0",
-    "@vitest/browser": "4.1.9",
-    "@vitest/browser-playwright": "^4.1.9",
-    "@vitest/coverage-v8": "4.1.9",
-    "@zip.js/zip.js": "2.8.26",
-    "autoprefixer": "^10.5.2",
+    "@types/node": "^26.1.2",
+    "@vitest/browser": "4.1.10",
+    "@vitest/browser-playwright": "4.1.10",
+    "@vitest/coverage-v8": "4.1.10",
+    "@zip.js/zip.js": "2.8.34",
+    "autoprefixer": "^10.5.4",
     "compression": "^1.8.1",
-    "concurrently": "^10.0.3",
+    "concurrently": "^10.0.4",
     "date-fns": "^4.4.0",
     "esbuild": "^0.28.1",
     "eventsource-parser": "^3.1.0",
     "express": "^5.1.0",
     "fancy-log": "^2.0.0",
     "getopts": "^2.3.0",
-    "gettext-parser": "^9.0.2",
+    "gettext-parser": "^9.1.1",
     "highlight.js": "^11.10.0",
     "js-beautify": "^2.0.3",
-    "jsdom": "^29.0.2",
+    "jsdom": "^30.0.1",
     "lodash": "^4.18.1",
     "lodash.debounce": "^4.0.8",
     "map-stream": "0.0.7",
-    "marked": "^18.0.5",
+    "marked": "^18.0.9",
     "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
     "nodemon": "^3.1.14",
     "npm-run-all": "^4.1.5",
     "opentype.js": "^2.0.0",
-    "p-limit": "^7.3.0",
-    "playwright": "1.61.1",
-    "postcss": "^8.5.16",
+    "p-limit": "^7.3.1",
+    "playwright": "1.62.1",
+    "postcss": "^8.5.25",
     "postcss-clean": "^1.2.2",
-    "postcss-modules": "^9.0.0",
+    "postcss-modules": "^9.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "3.9.4",
+    "prettier": "3.9.6",
     "pretty-time": "^1.1.0",
     "prop-types": "^15.8.1",
     "randomcolor": "^0.6.2",
-    "react": "19.2.7",
-    "react-dom": "19.2.7",
+    "react": "19.2.8",
+    "react-dom": "19.2.8",
     "react-error-boundary": "^6.1.2",
     "react-virtualized": "^9.22.6",
     "rimraf": "^6.1.3",
     "rxjs": "8.0.0-alpha.14",
-    "sass": "^1.101.0",
+    "sass": "^1.102.0",
     "sass-embedded": "^1.100.0",
-    "sax": "^1.6.0",
+    "sax": "^1.6.1",
     "scheduler": "^0.27.0",
     "source-map-support": "^0.5.21",
-    "storybook": "10.4.6",
-    "style-dictionary": "5.4.4",
-    "stylelint": "^17.14.0",
+    "storybook": "10.5.6",
+    "style-dictionary": "5.5.0",
+    "stylelint": "^17.14.1",
     "stylelint-config-standard-scss": "^17.0.0",
     "stylelint-plugin-logical-css": "^2.1.0",
     "stylelint-scss": "^7.2.0",
@@ -123,11 +122,15 @@
     "tdigest": "^0.1.2",
     "tinycolor2": "^1.6.0",
     "typescript": "^6.0.2",
-    "vite": "^8.1.2",
-    "vitest": "^4.1.9",
-    "wait-on": "^9.0.4",
+    "vite": "^8.2.0",
+    "vitest": "^4.1.10",
+    "wait-on": "^9.1.0",
     "watcher": "^2.3.1",
     "workerpool": "^10.0.3",
     "xregexp": "^5.1.2"
+  },
+  "dependencies": {
+    "@penpot/ui": "link:packages/ui",
+    "react-aria-components": "^1.20.0"
   }
 }
diff --git a/frontend/packages/draft-js/index.js b/frontend/packages/draft-js/index.js
index 400636c5dd..eae0a5f3c0 100644
--- a/frontend/packages/draft-js/index.js
+++ b/frontend/packages/draft-js/index.js
@@ -22,13 +22,15 @@ export const {
 } = pkg;
 
 import DraftPasteProcessor from 'draft-js/lib/DraftPasteProcessor.js';
-import {Map, OrderedSet} from "immutable";
+import Immutable from "immutable";
+const {Map, OrderedSet} = Immutable;
 
 function isDefined(v) {
   return v !== undefined && v !== null;
 }
 
 function mergeBlockData(block, newData) {
+  if (!block) return undefined;
   let data = block.getData();
 
   for (let key of Object.keys(newData)) {
@@ -176,10 +178,12 @@ export function splitBlockPreservingData(state) {
 
   content = Modifier.splitBlock(content, selection);
 
-  const blockData = content.blockMap.get(content.selectionBefore.getStartKey()).getData();
+  const startKey = content.selectionBefore.getStartKey();
+  const block = content.blockMap.get(startKey);
+  const blockData = (block && block.getData()) || new Map();
   const blockKey = content.selectionAfter.getStartKey();
-  const blockMap = content.blockMap.update(blockKey, (block) => {
-    return block.set("data", blockData);
+  const blockMap = content.blockMap.update(blockKey, (b) => {
+    return b.set("data", blockData);
   });
 
   content = content.set("blockMap", blockMap);
@@ -325,6 +329,7 @@ export function updateBlockData(state, blockKey, data) {
   const content = state.getCurrentContent();
   const block = content.getBlockForKey(blockKey);
   const newBlock = mergeBlockData(block, data);
+  if (!newBlock) return state;
 
   const blockData = newBlock.getData();
 
diff --git a/frontend/packages/draft-js/package.json b/frontend/packages/draft-js/package.json
index ec153b2eac..e2955437f2 100644
--- a/frontend/packages/draft-js/package.json
+++ b/frontend/packages/draft-js/package.json
@@ -4,12 +4,11 @@
   "description": "Penpot Draft-JS Wrapper",
   "main": "index.js",
   "type": "module",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "author": "Andrey Antukh",
   "license": "MPL-2.0",
   "dependencies": {
-    "draft-js": "penpot/draft-js.git#ba3b26ed63a01227a3560e440531b69d79c03f35",
-    "immutable": "^5.1.9"
+    "draft-js": "penpot/draft-js.git#c58ebd9429a6359d72a88cff87e078aaf6fe285d"
   },
   "peerDependencies": {
     "react": ">=0.17.0",
diff --git a/frontend/packages/mousetrap/package.json b/frontend/packages/mousetrap/package.json
index 4b20059b0f..56b3d9abc2 100644
--- a/frontend/packages/mousetrap/package.json
+++ b/frontend/packages/mousetrap/package.json
@@ -4,7 +4,7 @@
   "description": "Simple library for handling keyboard shortcuts",
   "main": "index.js",
   "type": "module",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "author": "Craig Campbell",
   "license": "Apache-2.0 WITH LLVM-exception"
 }
diff --git a/frontend/packages/tokenscript/package.json b/frontend/packages/tokenscript/package.json
index 9c4ed11113..c00cc0082a 100644
--- a/frontend/packages/tokenscript/package.json
+++ b/frontend/packages/tokenscript/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "type": "module",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "author": "Andrey Antukh",
   "license": "MPL-2.0",
   "dependencies": {
diff --git a/frontend/packages/ui/package.json b/frontend/packages/ui/package.json
index 31e2597bd9..9fe6715c77 100644
--- a/frontend/packages/ui/package.json
+++ b/frontend/packages/ui/package.json
@@ -7,6 +7,10 @@
     ".": {
       "import": "./dist/index.js"
     },
+    "./modal": {
+      "import": "./dist/modal.js",
+      "types": "./dist/modal.d.ts"
+    },
     "./style.css": "./dist/style.css"
   },
   "scripts": {
@@ -16,22 +20,25 @@
   "devDependencies": {
     "@babel/core": "^8.0.1",
     "@babel/preset-react": "^8.0.1",
-    "@storybook/react": "10.4.6",
-    "@storybook/react-vite": "10.4.6",
+    "@storybook/react": "10.5.6",
+    "@storybook/react-vite": "10.5.6",
     "@testing-library/dom": "10.4.1",
     "@testing-library/react": "16.3.2",
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.0.0",
-    "@vitejs/plugin-react": "^6.0.3",
+    "@types/react": "^19.2.18",
+    "@types/react-dom": "^19.2.4",
+    "@vitejs/plugin-react": "^6.0.5",
     "babel-plugin-react-compiler": "^1.0.0",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "7.1.1",
     "react-compiler-runtime": "^1.0.0",
-    "storybook": "10.4.6",
+    "storybook": "10.5.6",
     "vite-plugin-dts": "^5.0.3"
   },
+  "dependencies": {
+    "react-aria-components": "^1.20.0"
+  },
   "peerDependencies": {
     "react": ">=19.2",
     "react-dom": ">=19.2"
diff --git a/frontend/packages/ui/src/index.ts b/frontend/packages/ui/src/index.ts
index 19ed9b5a98..4c5c366053 100644
--- a/frontend/packages/ui/src/index.ts
+++ b/frontend/packages/ui/src/index.ts
@@ -1 +1 @@
-export * from './lib/example/Example';
+export { Modal, useModalClose } from './lib/modal/Modal';
diff --git a/frontend/packages/ui/src/lib/example/Example.module.css b/frontend/packages/ui/src/lib/example/Example.module.css
deleted file mode 100644
index bcb65dd60c..0000000000
--- a/frontend/packages/ui/src/lib/example/Example.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.container {
-  background-color: #f0f0f0;
-  padding: 16px;
-  border: 2px solid #000;
-}
diff --git a/frontend/packages/ui/src/lib/example/Example.spec.tsx b/frontend/packages/ui/src/lib/example/Example.spec.tsx
deleted file mode 100644
index e3022639d9..0000000000
--- a/frontend/packages/ui/src/lib/example/Example.spec.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { render } from '@testing-library/react';
-
-import Example from './Example';
-
-describe('Example', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(<Example />);
-    expect(baseElement).toBeTruthy();
-  });
-});
diff --git a/frontend/packages/ui/src/lib/example/Example.stories.ts b/frontend/packages/ui/src/lib/example/Example.stories.ts
deleted file mode 100644
index 4dfb60c9e7..0000000000
--- a/frontend/packages/ui/src/lib/example/Example.stories.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Example } from './Example';
-import type { Meta, StoryObj } from '@storybook/react-vite';
-
-const meta = {
-  title: 'UI/Example',
-  component: Example,
-} satisfies Meta<typeof Example>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-export const Primary: Story = {};
diff --git a/frontend/packages/ui/src/lib/example/Example.tsx b/frontend/packages/ui/src/lib/example/Example.tsx
deleted file mode 100644
index 908a8e3fd9..0000000000
--- a/frontend/packages/ui/src/lib/example/Example.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useState } from 'react';
-import styles from './Example.module.css';
-
-export function Example() {
-  const [count, setCount] = useState(0);
-
-  return (
-    <div className={styles.container}>
-      <h1>Example!</h1>
-      <div>
-        <h2>Counter: {count}</h2>
-        <button onClick={() => setCount(count + 1)}>Increment</button>
-        <button onClick={() => setCount(count - 1)}>Decrement</button>
-        <button onClick={() => setCount(0)}>Reset</button>
-      </div>
-    </div>
-
-  );
-}
-
-export default Example;
diff --git a/frontend/packages/ui/src/lib/modal/Modal.module.scss b/frontend/packages/ui/src/lib/modal/Modal.module.scss
new file mode 100644
index 0000000000..b5ab9bf29e
--- /dev/null
+++ b/frontend/packages/ui/src/lib/modal/Modal.module.scss
@@ -0,0 +1,113 @@
+@use "ds/_borders" as *;
+@use "ds/_sizes" as *;
+@use "ds/_utils" as *;
+
+.overlay {
+  position: fixed;
+  inset: 0;
+  background: var(--color-overlay-default);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: var(--z-index-set);
+
+  &[data-entering] {
+    animation: overlay-fade-in 0.2s ease-out;
+  }
+
+  &[data-exiting] {
+    animation: overlay-fade-out 0.15s ease-in;
+  }
+}
+
+.modal {
+  position: relative;
+  inline-size: 100%;
+  margin: var(--sp-l);
+  background: var(--color-background-primary);
+  border-radius: $br-8;
+  box-shadow: var(--el-shadow-dark);
+  outline: none;
+  max-block-size: calc(100dvh - var(--sp-xxxl) * 2);
+  display: flex;
+  flex-direction: column;
+
+  &[data-entering] {
+    animation: modal-zoom-in 0.2s ease-out;
+  }
+
+  &[data-exiting] {
+    animation: modal-zoom-out 0.15s ease-in;
+  }
+}
+
+.modalSmall {
+  max-inline-size: $sz-400;
+}
+
+.modalMedium {
+  max-inline-size: $sz-512;
+}
+
+.modalLarge {
+  max-inline-size: px2rem(640);
+}
+
+.modalXlarge {
+  max-inline-size: px2rem(960);
+}
+
+.dialog {
+  position: relative;
+  outline: none;
+  display: flex;
+  flex-direction: column;
+  min-block-size: 0;
+  overflow: hidden;
+  max-block-size: inherit;
+}
+
+
+@keyframes overlay-fade-in {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes overlay-fade-out {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes modal-zoom-in {
+  from {
+    opacity: 0;
+    transform: scale(0.95);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes modal-zoom-out {
+  from {
+    opacity: 1;
+    transform: scale(0.95);
+  }
+  
+  to {
+    opacity: 0;
+    transform: scale(1);
+  }
+}
diff --git a/frontend/packages/ui/src/lib/modal/Modal.tsx b/frontend/packages/ui/src/lib/modal/Modal.tsx
new file mode 100644
index 0000000000..6d236d4d96
--- /dev/null
+++ b/frontend/packages/ui/src/lib/modal/Modal.tsx
@@ -0,0 +1,66 @@
+import {
+  DialogTrigger,
+  ModalOverlay,
+  Modal as RACModal,
+  Dialog,
+} from 'react-aria-components';
+import {
+  createContext,
+  useContext,
+  type ReactNode,
+} from 'react';
+import styles from './Modal.module.scss';
+
+const ModalCloseContext = createContext<(() => void) | null>(null);
+
+export function useModalClose(): (() => void) | null {
+  return useContext(ModalCloseContext);
+}
+
+interface ModalProps {
+  isOpen?: boolean;
+  onOpenChange?: (isOpen: boolean) => void;
+  children: ReactNode;
+  trigger?: ReactNode;
+  isDismissable?: boolean;
+  size?: 'small' | 'medium' | 'large' | 'xlarge';
+  className?: string;
+}
+
+export function Modal({
+  isOpen,
+  onOpenChange,
+  children,
+  trigger,
+  isDismissable = true,
+  size = 'medium',
+  className,
+}: ModalProps) {
+  const sizeClass =
+    size === 'small'
+      ? styles.modalSmall
+      : size === 'large'
+        ? styles.modalLarge
+        : size === 'xlarge'
+          ? styles.modalXlarge
+          : styles.modalMedium;
+
+  return (
+    <DialogTrigger isOpen={isOpen} onOpenChange={onOpenChange}>
+      {trigger}
+      <ModalOverlay className={styles.overlay} isDismissable={isDismissable}>
+        <RACModal
+          className={`${styles.modal} ${sizeClass} ${className ?? ''}`}
+        >
+          <Dialog className={styles.dialog}>
+            {({ close }) => (
+              <ModalCloseContext.Provider value={close}>
+                {children}
+              </ModalCloseContext.Provider>
+            )}
+          </Dialog>
+        </RACModal>
+      </ModalOverlay>
+    </DialogTrigger>
+  );
+}
diff --git a/frontend/packages/ui/src/modal.ts b/frontend/packages/ui/src/modal.ts
new file mode 100644
index 0000000000..4c5c366053
--- /dev/null
+++ b/frontend/packages/ui/src/modal.ts
@@ -0,0 +1 @@
+export { Modal, useModalClose } from './lib/modal/Modal';
diff --git a/frontend/packages/ui/vite.config.mts b/frontend/packages/ui/vite.config.mts
index a1f91b23c1..5ec50406f4 100644
--- a/frontend/packages/ui/vite.config.mts
+++ b/frontend/packages/ui/vite.config.mts
@@ -10,7 +10,7 @@ const copyCssPlugin = () => ({
   closeBundle: () => {
     try {
       copyFileSync(
-        'dist/index.css',
+        'dist/ui.css',
         '../../resources/public/css/ui.css',
       );
     } catch (e) {
@@ -21,6 +21,15 @@ const copyCssPlugin = () => ({
 
 export default defineConfig(() => ({
   root: import.meta.dirname,
+  css: {
+    preprocessorOptions: {
+      scss: {
+        loadPaths: [
+          path.resolve(import.meta.dirname, '../../src/app/main/ui'),
+        ],
+      },
+    },
+  },
   plugins: [
     react({
       babel: {
@@ -42,9 +51,11 @@ export default defineConfig(() => ({
       transformMixedEsModules: true,
     },
     lib: {
-      entry: 'src/index.ts',
+      entry: {
+        index: 'src/index.ts',
+        modal: 'src/modal.ts',
+      },
       name: 'ui',
-      fileName: 'index',
       formats: ['es' as const],
     },
     rollupOptions: {
diff --git a/frontend/playwright/data/design/get-file-fragment-10638.json b/frontend/playwright/data/design/get-file-fragment-10638.json
new file mode 100644
index 0000000000..f54380fed7
--- /dev/null
+++ b/frontend/playwright/data/design/get-file-fragment-10638.json
@@ -0,0 +1 @@
+{"~:id":"~u525a5d8b-028e-80e7-8005-aa705347b678","~:file-id":"~u525a5d8b-028e-80e7-8005-aa6cad42f27d","~:created-at":"~m1738332498199","~:data":{"~:options":{},"~:objects":{"~u00000000-0000-0000-0000-000000000000":{"~#shape":{"~:y":0,"~:hide-fill-on-export":false,"~:transform":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:rotation":0,"~:name":"Root Frame","~:width":0.01,"~:type":"~:frame","~:points":[{"~#point":{"~:x":0.0,"~:y":0.0}},{"~#point":{"~:x":0.01,"~:y":0.0}},{"~#point":{"~:x":0.01,"~:y":0.01}},{"~#point":{"~:x":0.0,"~:y":0.01}}],"~:r2":0,"~:proportion-lock":false,"~:transform-inverse":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:r3":0,"~:r1":0,"~:id":"~u00000000-0000-0000-0000-000000000000","~:parent-id":"~u00000000-0000-0000-0000-000000000000","~:frame-id":"~u00000000-0000-0000-0000-000000000000","~:strokes":[],"~:x":0,"~:proportion":1.0,"~:r4":0,"~:selrect":{"~#rect":{"~:x":0,"~:y":0,"~:width":0.01,"~:height":0.01,"~:x1":0,"~:y1":0,"~:x2":0.01,"~:y2":0.01}},"~:fills":[{"~:fill-color":"#FFFFFF","~:fill-opacity":1}],"~:flip-x":null,"~:height":0.01,"~:flip-y":null,"~:shapes":["~uc42485d8-8a02-80e3-8005-aa6caf76e409","~uc42485d8-8a02-80e3-8005-aa6caf76e40a"]}},"~uc42485d8-8a02-80e3-8005-aa6caf76e409":{"~#shape":{"~:y":0,"~:layout-grid-columns":[{"~:type":"~:flex","~:value":1},{"~:type":"~:flex","~:value":1}],"~:hide-fill-on-export":false,"~:layout-gap-type":"~:multiple","~:layout-padding":{"~:p1":0,"~:p2":0,"~:p3":0,"~:p4":0},"~:transform":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:rotation":0,"~:grow-type":"~:fixed","~:layout":"~:grid","~:hide-in-viewer":false,"~:name":"Board","~:layout-align-items":"~:start","~:width":200,"~:layout-grid-cells":{"~uc42485d8-8a02-80e3-8005-aa6cb3b09187":{"~:justify-self":"~:auto","~:column":1,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09187","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":1,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b09188":{"~:justify-self":"~:auto","~:column":2,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09188","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":1,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b09189":{"~:justify-self":"~:auto","~:column":1,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09189","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":2,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b0918a":{"~:justify-self":"~:auto","~:column":2,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b0918a","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":2,"~:row-span":1,"~:shapes":[]}},"~:layout-padding-type":"~:simple","~:type":"~:frame","~:points":[{"~#point":{"~:x":0,"~:y":0}},{"~#point":{"~:x":200,"~:y":0}},{"~#point":{"~:x":200,"~:y":200}},{"~#point":{"~:x":0,"~:y":200}}],"~:r2":0,"~:proportion-lock":false,"~:layout-gap":{"~:row-gap":0,"~:column-gap":0},"~:transform-inverse":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:r3":0,"~:layout-justify-content":"~:stretch","~:r1":0,"~:id":"~uc42485d8-8a02-80e3-8005-aa6caf76e409","~:layout-justify-items":"~:start","~:parent-id":"~u00000000-0000-0000-0000-000000000000","~:layout-align-content":"~:stretch","~:frame-id":"~u00000000-0000-0000-0000-000000000000","~:strokes":[],"~:x":0,"~:proportion":1,"~:r4":0,"~:layout-grid-rows":[{"~:type":"~:flex","~:value":1},{"~:type":"~:flex","~:value":1}],"~:selrect":{"~#rect":{"~:x":0,"~:y":0,"~:width":200,"~:height":200,"~:x1":0,"~:y1":0,"~:x2":200,"~:y2":200}},"~:fills":[{"~:fill-color":"#FFFFFF","~:fill-opacity":1}],"~:layout-grid-dir":"~:row","~:flip-x":null,"~:height":200,"~:flip-y":null,"~:shapes":[]}},"~uc42485d8-8a02-80e3-8005-aa6caf76e40a":{"~#shape":{"~:y":0,"~:layout-grid-columns":[{"~:type":"~:flex","~:value":1},{"~:type":"~:flex","~:value":1}],"~:hide-fill-on-export":false,"~:layout-gap-type":"~:multiple","~:layout-padding":{"~:p1":33,"~:p2":33,"~:p3":33,"~:p4":33},"~:transform":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:rotation":0,"~:grow-type":"~:fixed","~:layout":"~:grid","~:hide-in-viewer":false,"~:name":"Second","~:layout-align-items":"~:start","~:width":200,"~:layout-grid-cells":{"~uc42485d8-8a02-80e3-8005-aa6cb3b09187":{"~:justify-self":"~:auto","~:column":1,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09187","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":1,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b09188":{"~:justify-self":"~:auto","~:column":2,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09188","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":1,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b09189":{"~:justify-self":"~:auto","~:column":1,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b09189","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":2,"~:row-span":1,"~:shapes":[]},"~uc42485d8-8a02-80e3-8005-aa6cb3b0918a":{"~:justify-self":"~:auto","~:column":2,"~:id":"~uc42485d8-8a02-80e3-8005-aa6cb3b0918a","~:position":"~:auto","~:column-span":1,"~:align-self":"~:auto","~:row":2,"~:row-span":1,"~:shapes":[]}},"~:layout-padding-type":"~:simple","~:type":"~:frame","~:points":[{"~#point":{"~:x":0,"~:y":0}},{"~#point":{"~:x":200,"~:y":0}},{"~#point":{"~:x":200,"~:y":200}},{"~#point":{"~:x":0,"~:y":200}}],"~:r2":0,"~:proportion-lock":false,"~:layout-gap":{"~:row-gap":0,"~:column-gap":0},"~:transform-inverse":{"~#matrix":{"~:a":1.0,"~:b":0.0,"~:c":0.0,"~:d":1.0,"~:e":0.0,"~:f":0.0}},"~:r3":0,"~:layout-justify-content":"~:stretch","~:r1":0,"~:id":"~uc42485d8-8a02-80e3-8005-aa6caf76e40a","~:layout-justify-items":"~:start","~:parent-id":"~u00000000-0000-0000-0000-000000000000","~:layout-align-content":"~:stretch","~:frame-id":"~u00000000-0000-0000-0000-000000000000","~:strokes":[],"~:x":0,"~:proportion":1,"~:r4":0,"~:layout-grid-rows":[{"~:type":"~:flex","~:value":1},{"~:type":"~:flex","~:value":1}],"~:selrect":{"~#rect":{"~:x":0,"~:y":0,"~:width":200,"~:height":200,"~:x1":0,"~:y1":0,"~:x2":200,"~:y2":200}},"~:fills":[{"~:fill-color":"#FFFFFF","~:fill-opacity":1}],"~:layout-grid-dir":"~:row","~:flip-x":null,"~:height":200,"~:flip-y":null,"~:shapes":[]}}},"~:id":"~u525a5d8b-028e-80e7-8005-aa6cad42f27e","~:name":"Page 1"}}
diff --git a/frontend/playwright/data/logged-in-user/get-profile-no-shortcuts.json b/frontend/playwright/data/logged-in-user/get-profile-no-shortcuts.json
new file mode 100644
index 0000000000..af49dca188
--- /dev/null
+++ b/frontend/playwright/data/logged-in-user/get-profile-no-shortcuts.json
@@ -0,0 +1,21 @@
+{
+    "~:v2-info-shown": true,
+    "~:newsletter-updates": false,
+    "~:onboarding-viewed": true,
+    "~:onboarding-questions": {
+        "~:role": "ux",
+        "~:start-with": "wireframing",
+        "~:expected-use": "personal",
+        "~:experience-design-tool": "sketch"
+    },
+    "~:onboarding-questions-answered": true,
+    "~:workspace-visited": true,
+    "~:renderer": "~:wasm",
+    "~:viewed-tutorial?": false,
+    "~:viewed-walkthrough?": false,
+    "~:release-notes-viewed": "0.0",
+    "~:nudge": {
+        "~:big": 10,
+        "~:small": 1
+    }
+}
diff --git a/frontend/playwright/data/logged-in-user/get-profile-with-shortcuts.json b/frontend/playwright/data/logged-in-user/get-profile-with-shortcuts.json
new file mode 100644
index 0000000000..6fedc2bfae
--- /dev/null
+++ b/frontend/playwright/data/logged-in-user/get-profile-with-shortcuts.json
@@ -0,0 +1,27 @@
+{
+    "~:v2-info-shown": true,
+    "~:newsletter-updates": false,
+    "~:onboarding-viewed": true,
+    "~:onboarding-questions": {
+        "~:role": "ux",
+        "~:start-with": "wireframing",
+        "~:expected-use": "personal",
+        "~:experience-design-tool": "sketch"
+    },
+    "~:onboarding-questions-answered": true,
+    "~:workspace-visited": true,
+    "~:custom-shortcuts": {
+        "~:workspace": {
+            "~:align-bottom": "ctrl+y",
+            "~:redo": ""
+        }
+    },
+    "~:renderer": "~:wasm",
+    "~:viewed-tutorial?": false,
+    "~:viewed-walkthrough?": false,
+    "~:release-notes-viewed": "0.0",
+    "~:nudge": {
+        "~:big": 10,
+        "~:small": 1
+    }
+}
diff --git a/frontend/playwright/data/logged-in-user/update-profile-with-shortcuts.json b/frontend/playwright/data/logged-in-user/update-profile-with-shortcuts.json
new file mode 100644
index 0000000000..6fedc2bfae
--- /dev/null
+++ b/frontend/playwright/data/logged-in-user/update-profile-with-shortcuts.json
@@ -0,0 +1,27 @@
+{
+    "~:v2-info-shown": true,
+    "~:newsletter-updates": false,
+    "~:onboarding-viewed": true,
+    "~:onboarding-questions": {
+        "~:role": "ux",
+        "~:start-with": "wireframing",
+        "~:expected-use": "personal",
+        "~:experience-design-tool": "sketch"
+    },
+    "~:onboarding-questions-answered": true,
+    "~:workspace-visited": true,
+    "~:custom-shortcuts": {
+        "~:workspace": {
+            "~:align-bottom": "ctrl+y",
+            "~:redo": ""
+        }
+    },
+    "~:renderer": "~:wasm",
+    "~:viewed-tutorial?": false,
+    "~:viewed-walkthrough?": false,
+    "~:release-notes-viewed": "0.0",
+    "~:nudge": {
+        "~:big": 10,
+        "~:small": 1
+    }
+}
diff --git a/frontend/playwright/data/render-wasm/get-file-background-blur-strokes.json b/frontend/playwright/data/render-wasm/get-file-background-blur-strokes.json
new file mode 100644
index 0000000000..69bb0d9d59
--- /dev/null
+++ b/frontend/playwright/data/render-wasm/get-file-background-blur-strokes.json
@@ -0,0 +1,176 @@
+{
+    "~:features": {
+        "~#set": [
+            "fdata/path-data",
+            "plugins/runtime",
+            "design-tokens/v1",
+            "variants/v1",
+            "layout/grid",
+            "styles/v2",
+            "fdata/pointer-map",
+            "fdata/objects-map",
+            "tokens/numeric-input",
+            "render-wasm/v1",
+            "components/v2",
+            "fdata/shape-data-type"
+        ]
+    },
+    "~:team-id": "~u8b485740-3f39-8080-8008-400e7784f55a",
+    "~:permissions": {
+        "~:type": "~:membership",
+        "~:is-owner": true,
+        "~:is-admin": true,
+        "~:can-edit": true,
+        "~:can-read": true,
+        "~:is-logged": true
+    },
+    "~:has-media-trimmed": false,
+    "~:comment-thread-seqn": 0,
+    "~:name": "New File 3",
+    "~:revn": 65,
+    "~:modified-at": "~m1784199941209",
+    "~:vern": 0,
+    "~:id": "~u814272d9-d3f8-812d-8008-54c11cbba219",
+    "~:is-shared": false,
+    "~:migrations": {
+        "~#ordered-set": [
+            "legacy-2",
+            "legacy-3",
+            "legacy-5",
+            "legacy-6",
+            "legacy-7",
+            "legacy-8",
+            "legacy-9",
+            "legacy-10",
+            "legacy-11",
+            "legacy-12",
+            "legacy-13",
+            "legacy-14",
+            "legacy-16",
+            "legacy-17",
+            "legacy-18",
+            "legacy-19",
+            "legacy-25",
+            "legacy-26",
+            "legacy-27",
+            "legacy-28",
+            "legacy-29",
+            "legacy-31",
+            "legacy-32",
+            "legacy-33",
+            "legacy-34",
+            "legacy-36",
+            "legacy-37",
+            "legacy-38",
+            "legacy-39",
+            "legacy-40",
+            "legacy-41",
+            "legacy-42",
+            "legacy-43",
+            "legacy-44",
+            "legacy-45",
+            "legacy-46",
+            "legacy-47",
+            "legacy-48",
+            "legacy-49",
+            "legacy-50",
+            "legacy-51",
+            "legacy-52",
+            "legacy-53",
+            "legacy-54",
+            "legacy-55",
+            "legacy-56",
+            "legacy-57",
+            "legacy-59",
+            "legacy-62",
+            "legacy-65",
+            "legacy-66",
+            "legacy-67",
+            "0001-remove-tokens-from-groups",
+            "0002-normalize-bool-content-v2",
+            "0002-clean-shape-interactions",
+            "0003-fix-root-shape",
+            "0003-convert-path-content-v2",
+            "0005-deprecate-image-type",
+            "0006-fix-old-texts-fills",
+            "0008-fix-library-colors-v4",
+            "0009-clean-library-colors",
+            "0009-add-partial-text-touched-flags",
+            "0010-fix-swap-slots-pointing-non-existent-shapes",
+            "0011-fix-invalid-text-touched-flags",
+            "0012-fix-position-data",
+            "0013-fix-component-path",
+            "0013-clear-invalid-strokes-and-fills",
+            "0014-fix-tokens-lib-duplicate-ids",
+            "0014-clear-components-nil-objects",
+            "0015-fix-text-attrs-blank-strings",
+            "0015-clean-shadow-color",
+            "0016-copy-fills-from-position-data-to-text-node",
+            "0017-fix-layout-flex-dir",
+            "0018-remove-unneeded-objects-from-components",
+            "0019-fix-missing-swap-slots",
+            "0020-sync-component-id-with-near-main",
+            "0021-fix-shape-svg-attrs",
+            "0022-normalize-component-root-and-resync",
+            "0023-repair-token-themes-with-inexistent-sets",
+            "0024b-fix-stroke-cap-placement"
+        ]
+    },
+    "~:version": 67,
+    "~:project-id": "~u8b485740-3f39-8080-8008-400e7786d1d0",
+    "~:created-at": "~m1784121921262",
+    "~:backend": "legacy-db",
+    "~:data": {
+        "~:pages": [
+            "~u814272d9-d3f8-812d-8008-54c11cbba21a",
+            "~u844a4204-eb8d-80d3-8008-55e83b4f39e0"
+        ],
+        "~:pages-index": {
+            "~u814272d9-d3f8-812d-8008-54c11cbba21a": {
+                "~:objects": {
+                    "~#penpot/objects-map/v2": {
+                        "~u00000000-0000-0000-0000-000000000000": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"Root Frame\",\"~:width\",0.01,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0.0,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.01]],[\"^:\",[\"^ \",\"~:x\",0.0,\"~:y\",0.01]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1.0,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^6\",0.01,\"~:height\",0.01,\"~:x1\",0,\"~:y1\",0,\"~:x2\",0.01,\"~:y2\",0.01]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^H\",0.01,\"~:flip-y\",null,\"~:shapes\",[\"~u9f14b915-410b-8062-8008-55a1fbbd5fa4\",\"~u9f14b915-410b-8062-8008-559878019a9e\",\"~u844a4204-eb8d-80d3-8008-55e83b566c48\"]]]",
+                        "~u9f14b915-410b-8062-8008-559878019a9e": "[\"~#shape\",[\"^ \",\"~:y\",-1863.999482267452,\"~:background-blur\",[\"^ \",\"~:id\",\"~u9f14b915-410b-8062-8008-5598c30393d7\",\"~:type\",\"^1\",\"~:value\",8,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:key\",\"22sle9m74ka\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^=\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^=\",[[\"^ \",\"^?\",\"normal\",\"~:text-transform\",\"none\",\"~:font-id\",\"sourcesanspro\",\"^<\",\"1ixh2em79as\",\"~:font-size\",\"200\",\"~:font-weight\",\"900\",\"~:font-variant-id\",\"black\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.12]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"blur\"]],\"^@\",\"none\",\"~:text-align\",\"left\",\"^A\",\"sourcesanspro\",\"^<\",\"1x2xz4p3kcs\",\"^B\",\"200\",\"^C\",\"900\",\"~:text-direction\",\"ltr\",\"^3\",\"paragraph\",\"^D\",\"black\",\"^E\",\"none\",\"^F\",\"0\",\"^G\",[[\"^ \",\"^H\",\"#ffffff\",\"^I\",0.12]],\"^J\",\"sourcesanspro\"]]]],\"~:vertical-align\",\"top\"],\"~:hide-in-viewer\",false,\"~:name\",\"blur\",\"~:width\",375.0000213699236,\"^3\",\"^K\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",95.49998073772147,\"~:y\",-1863.999482267452]],[\"^S\",[\"^ \",\"~:x\",470.50000210764506,\"~:y\",-1863.999482267452]],[\"^S\",[\"^ \",\"~:x\",470.50000210764506,\"~:y\",-1623.9994721448552]],[\"^S\",[\"^ \",\"~:x\",95.49998073772147,\"~:y\",-1623.9994721448552]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u9f14b915-410b-8062-8008-559878019a9e\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",-1602.939453125,\"^>\",\"1.2\",\"^?\",\"normal\",\"~:typography-ref-id\",null,\"^@\",\"none\",\"^L\",\"left\",\"^A\",\"sourcesanspro\",\"^B\",\"200px\",\"^C\",\"900\",\"~:typography-ref-file\",null,\"^M\",\"ltr\",\"^Q\",374.6099853515625,\"^D\",\"regular\",\"^E\",\"none\",\"^F\",\"0px\",\"~:x\",95.4999771118164,\"^G\",[[\"^ \",\"^H\",\"#ffffff\",\"^I\",0.12]],\"~:direction\",\"ltr\",\"^J\",\"sourcesanspro\",\"~:height\",282.1201171875,\"^K\",\"blur\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",95.49998073772146,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",95.49998073772146,\"~:y\",-1863.999482267452,\"^Q\",375.0000213699236,\"^Z\",240.0000101225969,\"~:x1\",95.49998073772146,\"~:y1\",-1863.999482267452,\"~:x2\",470.50000210764506,\"~:y2\",-1623.9994721448552]],\"~:flip-x\",null,\"^Z\",240.0000101225969,\"~:flip-y\",null]]",
+                        "~u9f14b915-410b-8062-8008-55a1fbbd5fa4": "[\"~#shape\",[\"^ \",\"~:y\",-2155.0001098481293,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"background_1\",\"~:width\",1004.0000579080496,\"~:type\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",-211.00000682869666,\"~:y\",-2155.0001098481293]],[\"^9\",[\"^ \",\"~:x\",793.0000510793529,\"~:y\",-2155.0001098481293]],[\"^9\",[\"^ \",\"~:x\",793.0000510793529,\"~:y\",-1150.9999568014878]],[\"^9\",[\"^ \",\"~:x\",-211.00000682869666,\"~:y\",-1150.9999568014878]]],\"~:r2\",0,\"~:proportion-lock\",true,\"~:transform-inverse\",[\"^2\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u9f14b915-410b-8062-8008-55a1fbbd5fa4\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",-211.00000682869666,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",-211.00000682869666,\"~:y\",-2155.0001098481293,\"^5\",1004.0000579080496,\"~:height\",1004.0001530466416,\"~:x1\",-211.00000682869666,\"~:y1\",-2155.0001098481293,\"~:x2\",793.0000510793529,\"~:y2\",-1150.9999568014878]],\"~:fills\",[[\"^ \",\"~:fill-opacity\",1,\"~:fill-image\",[\"^ \",\"^5\",1181,\"^G\",1181,\"~:mtype\",\"image/png\",\"^?\",\"~u814272d9-d3f8-812d-8008-55a1fb78211b\",\"~:keep-aspect-ratio\",true]]],\"~:flip-x\",null,\"^G\",1004.0001530466416,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e83b566c48": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"background\",\"~:width\",1400,\"~:type\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0,\"~:y\",0]],[\"^9\",[\"^ \",\"~:x\",1400,\"~:y\",0]],[\"^9\",[\"^ \",\"~:x\",1400,\"~:y\",759.9999904632568]],[\"^9\",[\"^ \",\"~:x\",0,\"~:y\",759.9999904632568]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^2\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u844a4204-eb8d-80d3-8008-55e83b566c48\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^5\",1400,\"~:height\",759.9999904632568,\"~:x1\",0,\"~:y1\",0,\"~:x2\",1400,\"~:y2\",759.9999904632568]],\"~:fills\",[[\"^ \",\"~:fill-opacity\",1,\"~:fill-image\",[\"^ \",\"^?\",\"~u814272d9-d3f8-812d-8008-55a1fb78211b\",\"^5\",1181,\"^G\",1181,\"~:mtype\",\"image/png\",\"~:keep-aspect-ratio\",true]]],\"~:flip-x\",null,\"^G\",759.9999904632568,\"~:flip-y\",null]]"
+                    }
+                },
+                "~:id": "~u814272d9-d3f8-812d-8008-54c11cbba21a",
+                "~:name": "Page 1"
+            },
+            "~u844a4204-eb8d-80d3-8008-55e83b4f39e0": {
+                "~:objects": {
+                    "~#penpot/objects-map/v2": {
+                        "~u00000000-0000-0000-0000-000000000000": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:hide-fill-on-export\",false,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"Root Frame\",\"~:width\",0.01,\"~:type\",\"~:frame\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0.0,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.0]],[\"^:\",[\"^ \",\"~:x\",0.01,\"~:y\",0.01]],[\"^:\",[\"^ \",\"~:x\",0.0,\"~:y\",0.01]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^3\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1.0,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^6\",0.01,\"~:height\",0.01,\"~:x1\",0,\"~:y1\",0,\"~:x2\",0.01,\"~:y2\",0.01]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#FFFFFF\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^H\",0.01,\"~:flip-y\",null,\"~:shapes\",[\"~u844a4204-eb8d-80d3-8008-55e84d2ab9b9\",\"~u844a4204-eb8d-80d3-8008-55e860a88934\",\"~u844a4204-eb8d-80d3-8008-55e860b3775c\",\"~u844a4204-eb8d-80d3-8008-55e860bb5bdc\",\"~u844a4204-eb8d-80d3-8008-55e860c302cd\",\"~u844a4204-eb8d-80d3-8008-55e860ca2b3b\",\"~u844a4204-eb8d-80d3-8008-55e860d3347f\",\"~u844a4204-eb8d-80d3-8008-55e86a816bac\",\"~u844a4204-eb8d-80d3-8008-55e86a8be839\",\"~u844a4204-eb8d-80d3-8008-55e86a92f143\",\"~u844a4204-eb8d-80d3-8008-55e86a99dc08\",\"~u844a4204-eb8d-80d3-8008-55e86aa09dec\",\"~u844a4204-eb8d-80d3-8008-55e86aa7e998\",\"~u844a4204-eb8d-80d3-8008-55e86aafcb00\",\"~u844a4204-eb8d-80d3-8008-55e86ac03a3a\",\"~u844a4204-eb8d-80d3-8008-55e86acc7ab8\",\"~u844a4204-eb8d-80d3-8008-55e86ad794cf\",\"~u844a4204-eb8d-80d3-8008-55e86ae33dff\",\"~u844a4204-eb8d-80d3-8008-55e86af1cbcf\"]]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86ae33dff": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351419\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[],\"^K\",\"sourcesanspro\"]]]]],\"~:name\",\"text-center-nofill\",\"~:width\",100.0001106262207,\"^3\",\"^L\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",800,\"~:y\",560]],[\"^P\",[\"^ \",\"~:x\",900.0001106262207,\"~:y\",560]],[\"^P\",[\"^ \",\"~:x\",900.0001106262207,\"~:y\",668]],[\"^P\",[\"^ \",\"~:x\",800,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86ae33dff\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^N\",99.58001708984375,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",800,\"^J\",[],\"~:direction\",\"ltr\",\"^K\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^L\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",800,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",800,\"~:y\",560,\"^N\",100.0001106262207,\"^U\",108,\"~:x1\",800,\"~:y1\",560,\"~:x2\",900.0001106262207,\"~:y2\",668]],\"~:flip-x\",null,\"^U\",108,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860d3347f": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141a\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-outer-opaque\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",990,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",1110.0000047683716,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",1110.0000047683716,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",990,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860d3347f\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",990,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",990,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",990,\"~:y1\",60,\"~:x2\",1110.0000047683716,\"~:y2\",180.00000476837158]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#333333\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^Q\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860b3775c": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141b\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-center\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",230,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",350.0000047683716,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",350.0000047683716,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",230,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860b3775c\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",230,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",230,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",230,\"~:y1\",60,\"~:x2\",350.0000047683716,\"~:y2\",180.00000476837158]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^Q\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860bb5bdc": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141c\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-outer\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",420,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",540.0000047683716,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",540.0000047683716,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",420,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860bb5bdc\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",420,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",420,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",420,\"~:y1\",60,\"~:x2\",540.0000047683716,\"~:y2\",180.00000476837158]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^Q\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860ca2b3b": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141d\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-center-nofill\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",800,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",920.0000047683716,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",920.0000047683716,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",800,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860ca2b3b\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",800,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",800,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",800,\"~:y1\",60,\"~:x2\",920.0000047683716,\"~:y2\",180.00000476837158]],\"~:fills\",[],\"~:flip-x\",null,\"^Q\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86ac03a3a": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141e\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"^M\",\"sourcesanspro\"]]]]],\"~:name\",\"text-center\",\"~:width\",99.99999618530273,\"^3\",\"^N\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",230,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",329.99999618530273,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",329.99999618530273,\"~:y\",668]],[\"^R\",[\"^ \",\"~:x\",230,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86ac03a3a\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^P\",99.58001708984375,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",230,\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"~:direction\",\"ltr\",\"^M\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^N\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",230,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",230,\"~:y\",560,\"^P\",99.99999618530273,\"^W\",108,\"~:x1\",230,\"~:y1\",560,\"~:x2\",329.99999618530273,\"~:y2\",668]],\"~:flip-x\",null,\"^W\",108,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e84d2ab9b9": "[\"~#shape\",[\"^ \",\"~:y\",0,\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"background\",\"~:width\",1179.9999713897705,\"~:type\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",0,\"~:y\",0]],[\"^9\",[\"^ \",\"~:x\",1179.9999713897705,\"~:y\",0]],[\"^9\",[\"^ \",\"~:x\",1179.9999713897705,\"~:y\",759.9999904632568]],[\"^9\",[\"^ \",\"~:x\",0,\"~:y\",759.9999904632568]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^2\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"~:id\",\"~u844a4204-eb8d-80d3-8008-55e84d2ab9b9\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[],\"~:x\",0,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",0,\"~:y\",0,\"^5\",1179.9999713897705,\"~:height\",759.9999904632568,\"~:x1\",0,\"~:y1\",0,\"~:x2\",1179.9999713897705,\"~:y2\",759.9999904632568]],\"~:fills\",[[\"^ \",\"~:fill-opacity\",1,\"~:fill-image\",[\"^ \",\"^?\",\"~u814272d9-d3f8-812d-8008-55a1fb78211b\",\"^5\",1181,\"^G\",1181,\"~:mtype\",\"image/png\",\"~:keep-aspect-ratio\",true]]],\"~:flip-x\",null,\"^G\",759.9999904632568,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86a8be839": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835141f\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAAGZDAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAACvQwAA0kM=\"],\"~:name\",\"path-center\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",230,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",350.0000047683716,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",350.0000047683716,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",230,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86a8be839\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",230,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",230,\"~:y1\",300,\"~:x2\",350.0000047683716,\"~:y2\",420.0000047683716]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^O\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86acc7ab8": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351420\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"^M\",\"sourcesanspro\"]]]]],\"~:name\",\"text-outer\",\"~:width\",99.99999618530273,\"^3\",\"^N\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",420,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",519.9999961853027,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",519.9999961853027,\"~:y\",668]],[\"^R\",[\"^ \",\"~:x\",420,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86acc7ab8\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^P\",99.58001708984375,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",420,\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"~:direction\",\"ltr\",\"^M\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^N\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",420,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",420,\"~:y\",560,\"^P\",99.99999618530273,\"^W\",108,\"~:x1\",420,\"~:y1\",560,\"~:x2\",519.9999961853027,\"~:y2\",668]],\"~:flip-x\",null,\"^W\",108,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86aa7e998": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351421\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAgHdEAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAMCKRAAA0kM=\"],\"~:name\",\"path-outer-opaque\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",990,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",1110.0000047683716,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",1110.0000047683716,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",990,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86aa7e998\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",990,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",990,\"~:y1\",300,\"~:x2\",1110.0000047683716,\"~:y2\",420.0000047683716]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#333333\",\"~:fill-opacity\",1]],\"~:flip-x\",null,\"^O\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860a88934": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351422\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-inner\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",40,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",160.00000476837158,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",160.00000476837158,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",40,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860a88934\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12]],\"~:x\",40,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",40,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",40,\"~:y1\",60,\"~:x2\",160.00000476837158,\"~:y2\",180.00000476837158]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^Q\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86af1cbcf": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351423\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#333333\",\"~:fill-opacity\",1]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[[\"^ \",\"^K\",\"#333333\",\"^L\",1]],\"^M\",\"sourcesanspro\"]]]]],\"~:name\",\"text-outer-opaque\",\"~:width\",99.99999618530273,\"^3\",\"^N\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",990,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",1089.9999961853027,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",1089.9999961853027,\"~:y\",668]],[\"^R\",[\"^ \",\"~:x\",990,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86af1cbcf\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^P\",99.5799560546875,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",990,\"^J\",[[\"^ \",\"^K\",\"#333333\",\"^L\",1]],\"~:direction\",\"ltr\",\"^M\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^N\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",990,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",990,\"~:y\",560,\"^P\",99.99999618530273,\"^W\",108,\"~:x1\",990,\"~:y1\",560,\"~:x2\",1089.9999961853027,\"~:y2\",668]],\"~:flip-x\",null,\"^W\",108,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86ad794cf": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351424\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"^M\",\"sourcesanspro\"]]]]],\"~:name\",\"text-all\",\"~:width\",99.99999618530273,\"^3\",\"^N\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",610,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",709.9999961853027,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",709.9999961853027,\"~:y\",668]],[\"^R\",[\"^ \",\"~:x\",610,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86ad794cf\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^P\",99.58001708984375,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",610,\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"~:direction\",\"ltr\",\"^M\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^N\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12],[\"^ \",\"^Z\",\"^[\",\"^10\",\"#ffdd88\",\"^11\",0.4,\"^12\",\"~:center\",\"^14\",12],[\"^ \",\"^Z\",\"^[\",\"^10\",\"#88ccff\",\"^11\",0.4,\"^12\",\"~:outer\",\"^14\",12]],\"~:x\",610,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",610,\"~:y\",560,\"^P\",99.99999618530273,\"^W\",108,\"~:x1\",610,\"~:y1\",560,\"~:x2\",709.9999961853027,\"~:y2\",668]],\"~:flip-x\",null,\"^W\",108,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e860c302cd": "[\"~#shape\",[\"^ \",\"~:y\",60,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351425\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:name\",\"rect-all\",\"~:width\",120.00000476837158,\"^3\",\"~:rect\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",610,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",730.0000047683716,\"~:y\",60]],[\"^=\",[\"^ \",\"~:x\",730.0000047683716,\"~:y\",180.00000476837158]],[\"^=\",[\"^ \",\"~:x\",610,\"~:y\",180.00000476837158]]],\"~:r2\",0,\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:r3\",0,\"~:r1\",0,\"^2\",\"~u844a4204-eb8d-80d3-8008-55e860c302cd\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12],[\"^ \",\"^F\",\"^G\",\"^H\",\"#ffdd88\",\"^I\",0.4,\"^J\",\"~:center\",\"^L\",12],[\"^ \",\"^F\",\"^G\",\"^H\",\"#88ccff\",\"^I\",0.4,\"^J\",\"~:outer\",\"^L\",12]],\"~:x\",610,\"~:proportion\",1,\"~:r4\",0,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",610,\"~:y\",60,\"^:\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",610,\"~:y1\",60,\"~:x2\",730.0000047683716,\"~:y2\",180.00000476837158]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^S\",120.00000476837158,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86a816bac": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351426\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAACBCAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQwAA0kM=\"],\"~:name\",\"path-inner\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",40,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",160.00000476837158,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",160.00000476837158,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",40,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86a816bac\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",40,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",40,\"~:y1\",300,\"~:x2\",160.00000476837158,\"~:y2\",420.0000047683716]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^O\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86aa09dec": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351427\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAAEhEAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAABmRAAA0kM=\"],\"~:name\",\"path-center-nofill\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",800,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",920.0000047683716,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",920.0000047683716,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",800,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86aa09dec\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:center\",\"~:stroke-width\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",800,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",800,\"~:y1\",300,\"~:x2\",920.0000047683716,\"~:y2\",420.0000047683716]],\"~:fills\",[],\"~:flip-x\",null,\"^O\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86a99dc08": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351428\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAgBhEAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAIA2RAAA0kM=\"],\"~:name\",\"path-all\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",610,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",730.0000047683716,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",730.0000047683716,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",610,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86a99dc08\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12],[\"^ \",\"^E\",\"^F\",\"^G\",\"#ffdd88\",\"^H\",0.4,\"^I\",\"~:center\",\"^K\",12],[\"^ \",\"^E\",\"^F\",\"^G\",\"#88ccff\",\"^H\",0.4,\"^I\",\"~:outer\",\"^K\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",610,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",610,\"~:y1\",300,\"~:x2\",730.0000047683716,\"~:y2\",420.0000047683716]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^Q\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86a92f143": "[\"~#shape\",[\"^ \",\"~:y\",null,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e888351429\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:content\",[\"~#penpot/path-data\",\"~bAQAAAAAAAAAAAAAAAAAAAAAAAAAAANJDAACWQwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAHRAAA0kM=\"],\"~:name\",\"path-outer\",\"~:width\",null,\"^3\",\"~:path\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",420,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",540.0000047683716,\"~:y\",300]],[\"^?\",[\"^ \",\"~:x\",540.0000047683716,\"~:y\",420.0000047683716]],[\"^?\",[\"^ \",\"~:x\",420,\"~:y\",420.0000047683716]]],\"~:proportion-lock\",false,\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86a92f143\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:outer\",\"~:stroke-width\",12]],\"~:x\",null,\"~:proportion\",1,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",420,\"~:y\",300,\"^<\",120.00000476837158,\"~:height\",120.00000476837158,\"~:x1\",420,\"~:y1\",300,\"~:x2\",540.0000047683716,\"~:y2\",420.0000047683716]],\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:flip-x\",null,\"^O\",null,\"~:flip-y\",null]]",
+                        "~u844a4204-eb8d-80d3-8008-55e86aafcb00": "[\"~#shape\",[\"^ \",\"~:y\",560,\"~:background-blur\",[\"^ \",\"~:id\",\"~u814272d9-d3f8-812d-8008-55e88835142a\",\"~:type\",\"^1\",\"~:value\",16,\"~:hidden\",false],\"~:transform\",[\"~#matrix\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"~:rotation\",0,\"~:grow-type\",\"~:auto-width\",\"~:content\",[\"^ \",\"^3\",\"root\",\"~:children\",[[\"^ \",\"^3\",\"paragraph-set\",\"^<\",[[\"^ \",\"~:line-height\",\"1.2\",\"~:font-style\",\"normal\",\"^<\",[[\"^ \",\"^=\",\"1.2\",\"^>\",\"normal\",\"~:typography-ref-id\",null,\"~:text-transform\",\"none\",\"~:text-align\",\"left\",\"~:font-id\",\"sourcesanspro\",\"~:font-size\",\"90\",\"~:font-weight\",\"700\",\"~:typography-ref-file\",null,\"~:text-direction\",\"ltr\",\"~:font-variant-id\",\"bold\",\"~:text-decoration\",\"none\",\"~:letter-spacing\",\"0\",\"~:fills\",[[\"^ \",\"~:fill-color\",\"#ffffff\",\"~:fill-opacity\",0.3]],\"~:font-family\",\"sourcesanspro\",\"~:text\",\"Aa\"]],\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^3\",\"paragraph\",\"^G\",\"bold\",\"^H\",\"none\",\"^I\",\"0\",\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"^M\",\"sourcesanspro\"]]]]],\"~:name\",\"text-inner\",\"~:width\",100.00000762939453,\"^3\",\"^N\",\"~:points\",[[\"~#point\",[\"^ \",\"~:x\",40,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",140.00000762939453,\"~:y\",560]],[\"^R\",[\"^ \",\"~:x\",140.00000762939453,\"~:y\",668]],[\"^R\",[\"^ \",\"~:x\",40,\"~:y\",668]]],\"~:transform-inverse\",[\"^7\",[\"^ \",\"~:a\",1.0,\"~:b\",0.0,\"~:c\",0.0,\"~:d\",1.0,\"~:e\",0.0,\"~:f\",0.0]],\"^2\",\"~u844a4204-eb8d-80d3-8008-55e86aafcb00\",\"~:parent-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:position-data\",[[\"^ \",\"~:y\",675.9400024414062,\"^=\",\"1.2\",\"^>\",\"normal\",\"^?\",null,\"^@\",\"none\",\"^A\",\"left\",\"^B\",\"sourcesanspro\",\"^C\",\"90px\",\"^D\",\"700\",\"^E\",null,\"^F\",\"ltr\",\"^P\",99.58000183105469,\"^G\",\"regular\",\"^H\",\"none\",\"^I\",\"0px\",\"~:x\",40,\"^J\",[[\"^ \",\"^K\",\"#ffffff\",\"^L\",0.3]],\"~:direction\",\"ltr\",\"^M\",\"sourcesanspro\",\"~:height\",123.8800048828125,\"^N\",\"Aa\"]],\"~:frame-id\",\"~u00000000-0000-0000-0000-000000000000\",\"~:strokes\",[[\"^ \",\"~:stroke-style\",\"~:solid\",\"~:stroke-color\",\"#ffffff\",\"~:stroke-opacity\",0.4,\"~:stroke-alignment\",\"~:inner\",\"~:stroke-width\",12]],\"~:x\",40,\"~:selrect\",[\"~#rect\",[\"^ \",\"~:x\",40,\"~:y\",560,\"^P\",100.00000762939453,\"^W\",108,\"~:x1\",40,\"~:y1\",560,\"~:x2\",140.00000762939453,\"~:y2\",668]],\"~:flip-x\",null,\"^W\",108,\"~:flip-y\",null]]"
+                    }
+                },
+                "~:id": "~u844a4204-eb8d-80d3-8008-55e83b4f39e0",
+                "~:name": "bg-blur-strokes"
+            }
+        },
+        "~:id": "~u814272d9-d3f8-812d-8008-54c11cbba219",
+        "~:options": {
+            "~:components-v2": true,
+            "~:base-font-size": "16px"
+        }
+    }
+}
diff --git a/frontend/playwright/data/text-editor/get-file-fixed-size-text.json b/frontend/playwright/data/text-editor/get-file-fixed-size-text.json
new file mode 100644
index 0000000000..5e88e658a2
--- /dev/null
+++ b/frontend/playwright/data/text-editor/get-file-fixed-size-text.json
@@ -0,0 +1,349 @@
+{
+  "~:features": {
+    "~#set": [
+      "fdata/path-data",
+      "plugins/runtime",
+      "design-tokens/v1",
+      "layout/grid",
+      "styles/v2",
+      "fdata/pointer-map",
+      "fdata/objects-map",
+      "components/v2",
+      "fdata/shape-data-type",
+      "text-editor/v2"
+    ]
+  },
+  "~:team-id": "~u9e6e22b2-db76-81d6-8006-75d7cdbb8bad",
+  "~:permissions": {
+    "~:type": "~:membership",
+    "~:is-owner": true,
+    "~:is-admin": true,
+    "~:can-edit": true,
+    "~:can-read": true,
+    "~:is-logged": true
+  },
+  "~:has-media-trimmed": false,
+  "~:comment-thread-seqn": 0,
+  "~:name": "Fixed size text",
+  "~:revn": 3,
+  "~:modified-at": "~m1753957736516",
+  "~:vern": 0,
+  "~:id": "~u238a17e0-75ff-8075-8006-934586ea2230",
+  "~:is-shared": false,
+  "~:migrations": {
+    "~#ordered-set": [
+      "legacy-2",
+      "legacy-3",
+      "legacy-5",
+      "legacy-6",
+      "legacy-7",
+      "legacy-8",
+      "legacy-9",
+      "legacy-10",
+      "legacy-11",
+      "legacy-12",
+      "legacy-13",
+      "legacy-14",
+      "legacy-16",
+      "legacy-17",
+      "legacy-18",
+      "legacy-19",
+      "legacy-25",
+      "legacy-26",
+      "legacy-27",
+      "legacy-28",
+      "legacy-29",
+      "legacy-31",
+      "legacy-32",
+      "legacy-33",
+      "legacy-34",
+      "legacy-36",
+      "legacy-37",
+      "legacy-38",
+      "legacy-39",
+      "legacy-40",
+      "legacy-41",
+      "legacy-42",
+      "legacy-43",
+      "legacy-44",
+      "legacy-45",
+      "legacy-46",
+      "legacy-47",
+      "legacy-48",
+      "legacy-49",
+      "legacy-50",
+      "legacy-51",
+      "legacy-52",
+      "legacy-53",
+      "legacy-54",
+      "legacy-55",
+      "legacy-56",
+      "legacy-57",
+      "legacy-59",
+      "legacy-62",
+      "legacy-65",
+      "legacy-66",
+      "legacy-67",
+      "0001-remove-tokens-from-groups",
+      "0002-normalize-bool-content-v2",
+      "0002-clean-shape-interactions",
+      "0003-fix-root-shape",
+      "0003-convert-path-content-v2",
+      "0004-clean-shadow-color",
+      "0005-deprecate-image-type",
+      "0006-fix-old-texts-fills",
+      "0007-clear-invalid-strokes-and-fills-v2",
+      "0008-fix-library-colors-v4",
+      "0009-clean-library-colors",
+      "0009-add-partial-text-touched-flags"
+    ]
+  },
+  "~:version": 67,
+  "~:project-id": "~u9e6e22b2-db76-81d6-8006-75d7cdc30669",
+  "~:created-at": "~m1753957644225",
+  "~:data": {
+    "~:pages": [
+      "~u238a17e0-75ff-8075-8006-934586ea2231"
+    ],
+    "~:pages-index": {
+      "~u238a17e0-75ff-8075-8006-934586ea2231": {
+        "~:objects": {
+          "~u00000000-0000-0000-0000-000000000000": {
+            "~#shape": {
+              "~:y": 0,
+              "~:hide-fill-on-export": false,
+              "~:transform": {
+                "~#matrix": {
+                  "~:a": 1.0,
+                  "~:b": 0.0,
+                  "~:c": 0.0,
+                  "~:d": 1.0,
+                  "~:e": 0.0,
+                  "~:f": 0.0
+                }
+              },
+              "~:rotation": 0,
+              "~:name": "Root Frame",
+              "~:width": 0.01,
+              "~:type": "~:frame",
+              "~:points": [
+                {
+                  "~#point": {
+                    "~:x": 0.0,
+                    "~:y": 0.0
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 0.01,
+                    "~:y": 0.0
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 0.01,
+                    "~:y": 0.01
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 0.0,
+                    "~:y": 0.01
+                  }
+                }
+              ],
+              "~:r2": 0,
+              "~:proportion-lock": false,
+              "~:transform-inverse": {
+                "~#matrix": {
+                  "~:a": 1.0,
+                  "~:b": 0.0,
+                  "~:c": 0.0,
+                  "~:d": 1.0,
+                  "~:e": 0.0,
+                  "~:f": 0.0
+                }
+              },
+              "~:r3": 0,
+              "~:r1": 0,
+              "~:id": "~u00000000-0000-0000-0000-000000000000",
+              "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+              "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+              "~:strokes": [],
+              "~:x": 0,
+              "~:proportion": 1.0,
+              "~:r4": 0,
+              "~:selrect": {
+                "~#rect": {
+                  "~:x": 0,
+                  "~:y": 0,
+                  "~:width": 0.01,
+                  "~:height": 0.01,
+                  "~:x1": 0,
+                  "~:y1": 0,
+                  "~:x2": 0.01,
+                  "~:y2": 0.01
+                }
+              },
+              "~:fills": [
+                {
+                  "~:fill-color": "#FFFFFF",
+                  "~:fill-opacity": 1
+                }
+              ],
+              "~:flip-x": null,
+              "~:height": 0.01,
+              "~:flip-y": null,
+              "~:shapes": [
+                "~ucc6f0580-449c-8019-8006-9345db077fa0"
+              ]
+            }
+          },
+          "~ucc6f0580-449c-8019-8006-9345db077fa0": {
+            "~#shape": {
+              "~:y": 150,
+              "~:transform": {
+                "~#matrix": {
+                  "~:a": 1.0,
+                  "~:b": 0.0,
+                  "~:c": 0.0,
+                  "~:d": 1.0,
+                  "~:e": 0.0,
+                  "~:f": 0.0
+                }
+              },
+              "~:rotation": 0,
+              "~:grow-type": "~:fixed",
+              "~:content": {
+                "~:type": "root",
+                "~:key": "1s4am1jl24s",
+                "~:children": [
+                  {
+                    "~:type": "paragraph-set",
+                    "~:children": [
+                      {
+                        "~:line-height": "1.2",
+                        "~:font-style": "normal",
+                        "~:children": [
+                          {
+                            "~:line-height": "1.2",
+                            "~:font-style": "normal",
+                            "~:typography-ref-id": null,
+                            "~:text-transform": "none",
+                            "~:font-id": "sourcesanspro",
+                            "~:key": "13p0zwl2yhc",
+                            "~:font-size": "14",
+                            "~:font-weight": "400",
+                            "~:typography-ref-file": null,
+                            "~:font-variant-id": "regular",
+                            "~:text-decoration": "none",
+                            "~:letter-spacing": "0",
+                            "~:fills": [
+                              {
+                                "~:fill-color": "#000000",
+                                "~:fill-opacity": 1
+                              }
+                            ],
+                            "~:font-family": "sourcesanspro",
+                            "~:text": "Lorem ipsum"
+                          }
+                        ],
+                        "~:typography-ref-id": null,
+                        "~:text-transform": "none",
+                        "~:text-align": "left",
+                        "~:font-id": "sourcesanspro",
+                        "~:key": "20hf3kmyoub",
+                        "~:font-size": "14",
+                        "~:font-weight": "400",
+                        "~:typography-ref-file": null,
+                        "~:text-direction": "ltr",
+                        "~:type": "paragraph",
+                        "~:font-variant-id": "regular",
+                        "~:text-decoration": "none",
+                        "~:letter-spacing": "0",
+                        "~:fills": [
+                          {
+                            "~:fill-color": "#000000",
+                            "~:fill-opacity": 1
+                          }
+                        ],
+                        "~:font-family": "sourcesanspro"
+                      }
+                    ]
+                  }
+                ],
+                "~:vertical-align": "top"
+              },
+              "~:hide-in-viewer": false,
+              "~:name": "Fixed text",
+              "~:width": 300,
+              "~:type": "~:text",
+              "~:points": [
+                {
+                  "~#point": {
+                    "~:x": 200,
+                    "~:y": 150
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 500,
+                    "~:y": 150
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 500,
+                    "~:y": 350
+                  }
+                },
+                {
+                  "~#point": {
+                    "~:x": 200,
+                    "~:y": 350
+                  }
+                }
+              ],
+              "~:transform-inverse": {
+                "~#matrix": {
+                  "~:a": 1.0,
+                  "~:b": 0.0,
+                  "~:c": 0.0,
+                  "~:d": 1.0,
+                  "~:e": 0.0,
+                  "~:f": 0.0
+                }
+              },
+              "~:id": "~ucc6f0580-449c-8019-8006-9345db077fa0",
+              "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
+              "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
+              "~:x": 200,
+              "~:selrect": {
+                "~#rect": {
+                  "~:x": 200,
+                  "~:y": 150,
+                  "~:width": 300,
+                  "~:height": 200,
+                  "~:x1": 200,
+                  "~:y1": 150,
+                  "~:x2": 500,
+                  "~:y2": 350
+                }
+              },
+              "~:flip-x": null,
+              "~:height": 200,
+              "~:flip-y": null
+            }
+          }
+        },
+        "~:id": "~u238a17e0-75ff-8075-8006-934586ea2231",
+        "~:name": "Page 1"
+      }
+    },
+    "~:id": "~u238a17e0-75ff-8075-8006-934586ea2230",
+    "~:options": {
+      "~:components-v2": true,
+      "~:base-font-size": "16px"
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/playwright/ui/pages/ShortcutsPage.js b/frontend/playwright/ui/pages/ShortcutsPage.js
new file mode 100644
index 0000000000..578311570e
--- /dev/null
+++ b/frontend/playwright/ui/pages/ShortcutsPage.js
@@ -0,0 +1,335 @@
+import { expect } from "@playwright/test";
+import { readFile } from "node:fs/promises";
+import { BaseWebSocketPage } from "./BaseWebSocketPage";
+
+function decodeKeyword(value) {
+  if (typeof value === "string" && value.startsWith("~:")) {
+    return value.slice(2);
+  }
+  if (typeof value === "string" && value.startsWith("~$")) {
+    return value.slice(2);
+  }
+  return value;
+}
+
+function decodeTransit(data) {
+  if (Array.isArray(data)) {
+    if (data[0] === "^ ") {
+      const result = {};
+      for (let i = 1; i < data.length; i += 2) {
+        const key = decodeTransit(data[i]);
+        const value = decodeTransit(data[i + 1]);
+        result[key] = value;
+      }
+      return result;
+    }
+    return data.map(decodeTransit);
+  }
+
+  if (data !== null && typeof data === "object") {
+    const result = {};
+    for (const [key, value] of Object.entries(data)) {
+      result[decodeKeyword(key)] = decodeTransit(value);
+    }
+    return result;
+  }
+
+  return decodeKeyword(data);
+}
+
+function encodeKeyword(key) {
+  return `~:${key}`;
+}
+
+function encodeTransit(data) {
+  if (data === null || typeof data === "boolean" || typeof data === "number") {
+    return data;
+  }
+
+  if (typeof data === "string") {
+    return data;
+  }
+
+  if (Array.isArray(data)) {
+    return data.map(encodeTransit);
+  }
+
+  const result = {};
+  for (const [key, value] of Object.entries(data)) {
+    result[encodeKeyword(key)] = encodeTransit(value);
+  }
+  return result;
+}
+
+function decodeRequestBody(body) {
+  try {
+    return decodeTransit(JSON.parse(body));
+  } catch {
+    return null;
+  }
+}
+
+export class ShortcutsPage extends BaseWebSocketPage {
+  static async init(page) {
+    await super.init(page);
+
+    const profileText = await readFile(
+      "playwright/data/logged-in-user/get-profile-logged-in.json",
+      "utf-8",
+    );
+    const baseProfile = decodeTransit(JSON.parse(profileText));
+    let customShortcuts = null;
+
+    await page.route("**/api/main/methods/get-profile", (route) => {
+      const profile = JSON.parse(JSON.stringify(baseProfile));
+      if (customShortcuts) {
+        profile.props["custom-shortcuts"] = customShortcuts;
+      }
+      route.fulfill({
+        status: 200,
+        contentType: "application/transit+json",
+        body: JSON.stringify(encodeTransit(profile)),
+      });
+    });
+
+    await page.route(
+      "**/api/main/methods/update-profile-props",
+      async (route, request) => {
+        const decoded = decodeRequestBody(request.postData() ?? "{}");
+        if (decoded?.props && "custom-shortcuts" in decoded.props) {
+          customShortcuts = decoded.props["custom-shortcuts"];
+        }
+        route.fulfill({
+          status: 200,
+          contentType: "application/transit+json",
+          body: "{}",
+        });
+      },
+    );
+
+    await super.mockRPC(
+      page,
+      "get-teams",
+      "logged-in-user/get-teams-default.json",
+    );
+  }
+
+  static async initWithShortcuts(page) {
+    await super.init(page);
+
+    await super.mockRPCs(page, {
+      "get-profile": "logged-in-user/get-profile-logged-in.json",
+      "get-teams": "logged-in-user/get-teams-default.json",
+      "update-profile-props":
+        "logged-in-user/update-profile-with-shortcuts.json",
+    });
+  }
+
+  static async initWithNoShortcuts(page) {
+    await super.init(page);
+
+    await super.mockRPCs(page, {
+      "get-profile": "logged-in-user/get-profile-no-shortcuts.json",
+      "get-teams": "logged-in-user/get-teams-default.json",
+      "update-profile-props":
+        "logged-in-user/update-profile-with-shortcuts.json",
+    });
+  }
+
+  constructor(page) {
+    super(page);
+
+    this.shortcutsSection = page.getByRole("region", { name: /shortcuts/i });
+    this.searchInput = page.getByRole("textbox", { name: /shortcuts/i });
+
+    this.allTab = page.getByRole("tab", { name: "All" });
+    this.personalizedTab = page.getByRole("tab", { name: "Personalized" });
+    this.disabledTab = page.getByRole("tab", { name: "Disabled" });
+
+    this.restoreAllButton = page.getByRole("button", {
+      name: /restore all/i,
+    });
+
+    this.importExportButton = page.getByRole("button", {
+      name: /import\/export/i,
+    });
+
+    this.fileInput = page.locator('input[type="file"]');
+  }
+
+  async goToShortcuts() {
+    await this.page.goto("#/settings/shortcuts");
+    await expect(this.shortcutsSection).toBeVisible();
+  }
+
+  async searchForShortcut(term) {
+    await this.searchInput.fill(term);
+  }
+
+  async clearSearch() {
+    await this.searchInput.clear();
+  }
+
+  async clickTab(tabName) {
+    const tab = this.page.getByRole("tab", { name: tabName });
+    await tab.click();
+  }
+
+  async getShortcutRow(shortcutName) {
+    return this.page.getByRole("listitem", {
+      name: new RegExp(`^${shortcutName}$`, "i"),
+      includeHidden: true,
+    });
+  }
+
+  async expandSubsection(subsectionName) {
+    const subsectionButton = this.page.getByRole("button", {
+      name: subsectionName,
+    });
+    await subsectionButton.click();
+  }
+
+  async clickEditShortcut(shortcutName) {
+    const button = this.page.getByRole("button", {
+      name: new RegExp(`Edit ${shortcutName}`, "i"),
+    });
+    await button.click();
+    const recordingArea = this.page.getByText("Press the key combination");
+    await expect(recordingArea).toBeVisible();
+    await recordingArea.focus();
+  }
+
+  async pressKey(key) {
+    await this.page.keyboard.press(key);
+  }
+
+  async pressKeyCombo(keys) {
+    for (const key of keys) {
+      await this.page.keyboard.down(key);
+    }
+    for (const key of [...keys].reverse()) {
+      await this.page.keyboard.up(key);
+    }
+  }
+
+  async saveShortcut() {
+    const saveButton = this.page.getByRole("button", { name: /save/i });
+    await saveButton.click();
+  }
+
+  async cancelEdit() {
+    const cancelButton = this.page.getByRole("button", { name: /cancel/i });
+    await cancelButton.click();
+  }
+
+  async resetShortcut(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    const resetButton = row.getByRole("button", { name: /reset/i });
+    await resetButton.click();
+  }
+
+  async disableShortcut(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await row
+      .getByRole("button", { name: new RegExp(`Edit ${shortcutName}`, "i") })
+      .click();
+    const disableButton = this.page.getByRole("button", { name: /disable/i });
+    await disableButton.click();
+  }
+
+  async expectShortcutCustomized(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).toHaveAttribute("data-customized", "true");
+  }
+
+  async expectShortcutNotCustomized(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).not.toHaveAttribute("data-customized", "true");
+  }
+
+  async expectShortcutHasConflict(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).toHaveAttribute("data-conflict", "true");
+  }
+
+  async expectShortcutVisible(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).toBeVisible();
+  }
+
+  async expectShortcutHidden(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).not.toBeVisible();
+  }
+
+  async restoreAllShortcuts() {
+    await this.restoreAllButton.click();
+    const confirmButton = this.page.getByRole("button", {
+      name: "Restore",
+      exact: true,
+    });
+    await confirmButton.click();
+  }
+
+  async exportShortcuts() {
+    await this.importExportButton.click();
+    const exportButton = this.page.getByRole("menuitem", { name: /export/i });
+    await exportButton.click();
+  }
+
+  async importShortcuts(jsonData) {
+    await this.importExportButton.click();
+    const importButton = this.page.getByRole("menuitem", { name: /import$/i });
+    await importButton.click();
+
+    const buffer = Buffer.from(JSON.stringify(jsonData), "utf-8");
+    await this.fileInput.setInputFiles({
+      name: "shortcuts.json",
+      mimeType: "application/json",
+      buffer,
+    });
+  }
+
+  async importShortcutsRaw(content) {
+    await this.importExportButton.click();
+    const importButton = this.page.getByRole("menuitem", { name: /import$/i });
+    await importButton.click();
+
+    const data =
+      typeof content === "string" ? content : JSON.stringify(content);
+    const buffer = Buffer.from(data, "utf-8");
+    await this.fileInput.setInputFiles({
+      name: "shortcuts.json",
+      mimeType: "application/json",
+      buffer,
+    });
+  }
+
+  async confirmImportApply() {
+    const applyButton = this.page.getByRole("button", {
+      name: /apply/i,
+    });
+    await applyButton.click();
+  }
+
+  async getExportedJson() {
+    const [download] = await Promise.all([
+      this.page.waitForEvent("download"),
+      this.exportShortcuts(),
+    ]);
+
+    expect(download.suggestedFilename()).toBe("penpot-shortcuts.json");
+
+    const path = await download.path();
+    const content = await readFile(path, "utf-8");
+    return JSON.parse(content);
+  }
+
+  async expectShortcutDisabled(shortcutName) {
+    const row = await this.getShortcutRow(shortcutName);
+    await expect(row).toHaveAttribute("data-customized", "true");
+    await expect(row.locator("use[href*='broken-link']")).toBeVisible();
+  }
+}
+
+export default ShortcutsPage;
diff --git a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js
index 33304fe5f0..74b83d1940 100644
--- a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js
+++ b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js
@@ -578,5 +578,28 @@ test("Renders background blur on shapes overlapping other shapes", async ({
   });
   await workspace.waitForFirstRenderWithoutUI();
 
+  await expect(workspace.canvas).toHaveScreenshot();
+});
+
+test("Renders background blur under strokes on rects, paths and texts", async ({
+  page,
+}) => {
+  const workspace = new WasmWorkspacePage(page);
+  await workspace.setupEmptyFile();
+  await workspace.mockFileMediaAsset(
+    "814272d9-d3f8-812d-8008-55a1fb78211b",
+    "render-wasm/assets/squares-background.png",
+  );
+  await workspace.mockGetFile(
+    "render-wasm/get-file-background-blur-strokes.json",
+  );
+
+  await workspace.goToWorkspace({
+    id: "814272d9-d3f8-812d-8008-54c11cbba219",
+    pageId: "844a4204-eb8d-80d3-8008-55e83b4f39e0",
+    pageName: "bg-blur-strokes",
+  });
+  await workspace.waitForFirstRenderWithoutUI();
+
   await expect(workspace.canvas).toHaveScreenshot();
 });
\ No newline at end of file
diff --git a/frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-background-blur-under-strokes-on-rects-paths-and-texts-1.png b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-background-blur-under-strokes-on-rects-paths-and-texts-1.png
new file mode 100644
index 0000000000..0d2bb88bef
Binary files /dev/null and b/frontend/playwright/ui/render-wasm-specs/shapes.spec.js-snapshots/Renders-background-blur-under-strokes-on-rects-paths-and-texts-1.png differ
diff --git a/frontend/playwright/ui/specs/colorpicker.spec.js b/frontend/playwright/ui/specs/colorpicker.spec.js
index cc772aa3a3..ee9dbcd770 100644
--- a/frontend/playwright/ui/specs/colorpicker.spec.js
+++ b/frontend/playwright/ui/specs/colorpicker.spec.js
@@ -24,6 +24,35 @@ test("Bug 7549 - User clicks on color swatch to display the color picker next to
   expect(distance).toBeLessThan(60);
 });
 
+test("Bug 10756 - Image fill picker accepts SVG files", async ({ page }) => {
+  const workspacePage = new WasmWorkspacePage(page);
+  await workspacePage.setupEmptyFile();
+  await workspacePage.mockRPC(
+    /get\-file\?/,
+    "workspace/get-file-not-empty.json",
+  );
+  await workspacePage.mockRPC(
+    "update-file?id=*",
+    "workspace/update-file-create-rect.json",
+  );
+
+  await workspacePage.goToWorkspace({
+    fileId: "6191cd35-bb1f-81f7-8004-7cc63d087374",
+    pageId: "6191cd35-bb1f-81f7-8004-7cc63d087375",
+  });
+  await workspacePage.clickLeafLayer("Rectangle");
+  await workspacePage.page
+    .getByRole("button", { name: "#B1B2B5" })
+    .click();
+  await workspacePage.page.getByText("Solid").click();
+  await workspacePage.page.getByText("Image").click();
+
+  await expect(workspacePage.page.locator("#fill-image-upload")).toHaveAttribute(
+    "accept",
+    /(?:^|,)image\/svg\+xml(?:,|$)/,
+  );
+});
+
 test("Create a LINEAR gradient", async ({ page }) => {
   const workspacePage = new WasmWorkspacePage(page);
   await workspacePage.setupEmptyFile();
diff --git a/frontend/playwright/ui/specs/numeric-input.spec.js b/frontend/playwright/ui/specs/numeric-input.spec.js
index 52a4726f91..49d3d1ca6b 100644
--- a/frontend/playwright/ui/specs/numeric-input.spec.js
+++ b/frontend/playwright/ui/specs/numeric-input.spec.js
@@ -120,7 +120,7 @@ test("BUG 10001: Negative margins are allowed on the numeric input", async ({
   await expect(layoutSection).toBeVisible();
 
   await workspacePage.layers.getByTestId("layer-row").nth(6).click();
-    await page.waitForTimeout(500);
+  await page.waitForTimeout(500);
 
   const layoutItemSection = workspacePage.rightSidebar.getByRole("region", {
     name: "Layout item section",
@@ -138,3 +138,95 @@ test("BUG 10001: Negative margins are allowed on the numeric input", async ({
   await verticalMarginInput.press("Enter");
   await expect(verticalMarginInput).toHaveValue("-10");
 });
+
+test("BUG 10638 - Invalid padding input on multi-selection must not persist strings", async ({
+  page,
+}) => {
+  const workspacePage = new WasmWorkspacePage(page);
+
+  await workspacePage.setupEmptyFile();
+  await workspacePage.mockRPC(/get\-file\?/, "design/get-file-9543.json");
+  await workspacePage.mockRPC(
+    "get-file-fragment?file-id=*&fragment-id=*",
+    "design/get-file-fragment-10638.json",
+  );
+  await workspacePage.mockRPC(
+    "update-file?id=*",
+    "design/update-file-9543.json",
+  );
+
+  // Inspect every persisted change: layout padding and gap values must be
+  // numbers (the backend rejects strings with a Malli validation error).
+  // In the transit payload, :set operations carry the attr name and its
+  // value as siblings: {"~:attr": "~:layout-padding", "~:val": {...}}.
+  const layoutAttrs = ["~:layout-padding", "~:layout-gap"];
+  const seenLayoutValues = [];
+  const badLayoutValues = [];
+  const collectLayoutValues = (node) => {
+    if (!node || typeof node !== "object") {
+      return;
+    }
+    const attr = node["~:attr"];
+    const val = node["~:val"];
+    if (layoutAttrs.includes(attr) && val && typeof val === "object") {
+      for (const [prop, leaf] of Object.entries(val)) {
+        seenLayoutValues.push(`${attr} ${prop}`);
+        if (typeof leaf !== "number") {
+          badLayoutValues.push(`${attr} ${prop} = ${JSON.stringify(leaf)}`);
+        }
+      }
+    }
+    for (const value of Object.values(node)) {
+      collectLayoutValues(value);
+    }
+  };
+  page.on("request", (request) => {
+    if (request.url().includes("/api/main/methods/update-file")) {
+      const body = request.postData();
+      if (body) {
+        collectLayoutValues(JSON.parse(body));
+      }
+    }
+  });
+
+  await workspacePage.goToWorkspace({
+    fileId: "525a5d8b-028e-80e7-8005-aa6cad42f27d",
+    pageId: "525a5d8b-028e-80e7-8005-aa6cad42f27e",
+  });
+
+  await workspacePage.clickLeafLayer("Board");
+  await workspacePage.clickLeafLayer("Second", { modifiers: ["Shift"] });
+
+  const toggle = workspacePage.page.getByRole("button", {
+    name: "Show 4 sided padding options",
+  });
+  await toggle.click();
+
+  // Paddings differ between the boards (0 vs 33), so the expanded inputs
+  // have no committed value. Committing invalid text must persist nothing.
+  const topPaddingInput = workspacePage.page.getByRole("textbox", {
+    name: "Top padding",
+  });
+  await topPaddingInput.click();
+  await topPaddingInput.fill("abc");
+  await topPaddingInput.press("Enter");
+
+  // A valid change afterwards guarantees at least one persisted update.
+  const leftPaddingInput = workspacePage.page.getByRole("textbox", {
+    name: "Left padding",
+  });
+  const updateRequest = page.waitForRequest(
+    "**/api/main/methods/update-file?*",
+    {
+      timeout: 15000,
+    },
+  );
+  await leftPaddingInput.fill("5");
+  await leftPaddingInput.press("Enter");
+  await updateRequest;
+
+  // Guard against a vacuous pass: the valid change above must have
+  // persisted at least one layout-padding value.
+  expect(seenLayoutValues).not.toEqual([]);
+  expect(badLayoutValues).toEqual([]);
+});
diff --git a/frontend/playwright/ui/specs/shortcuts.spec.js b/frontend/playwright/ui/specs/shortcuts.spec.js
new file mode 100644
index 0000000000..c0b487b883
--- /dev/null
+++ b/frontend/playwright/ui/specs/shortcuts.spec.js
@@ -0,0 +1,357 @@
+import { test, expect } from "@playwright/test";
+import ShortcutsPage from "../pages/ShortcutsPage";
+
+const customShortcutsFlag = "enable-custom-shortcuts";
+
+test.beforeEach(async ({ page }) => {
+  await ShortcutsPage.init(page);
+  await ShortcutsPage.mockConfigFlags(page, [customShortcutsFlag]);
+});
+
+test.describe("Shortcuts Settings Page", () => {
+  test("Shortcuts page loads correctly", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await expect(shortcutsPage.shortcutsSection).toBeVisible();
+    await expect(shortcutsPage.searchInput).toBeVisible();
+  });
+
+  test("Tabs are visible and clickable", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await expect(shortcutsPage.allTab).toBeVisible();
+    await expect(shortcutsPage.personalizedTab).toBeVisible();
+    await expect(shortcutsPage.disabledTab).toBeVisible();
+
+    await shortcutsPage.clickTab("Personalized");
+    await expect(shortcutsPage.personalizedTab).toHaveAttribute(
+      "aria-selected",
+      "true",
+    );
+    const personalizedPlacehonder = page.getByText(/Head to All to start/i);
+    await expect(personalizedPlacehonder).toBeVisible();
+
+    await shortcutsPage.clickTab("Disabled");
+    await expect(shortcutsPage.disabledTab).toHaveAttribute(
+      "aria-selected",
+      "true",
+    );
+    const disabledPlaceholder = page.getByText(/There are not disabled/i);
+    await expect(disabledPlaceholder).toBeVisible();
+
+    await shortcutsPage.clickTab("All");
+    await expect(shortcutsPage.allTab).toHaveAttribute("aria-selected", "true");
+  });
+});
+
+test.describe("Shortcut Customization", () => {
+  test("User can edit a shortcut", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    // Expand subsection
+    await shortcutsPage.expandSubsection("Alignment");
+
+    // Start edition of the shortcut
+    await shortcutsPage.clickEditShortcut("Align bottom");
+
+    // Press a new key combination
+    await shortcutsPage.pressKey("Control+y");
+
+    // Save the shortcut
+    await shortcutsPage.saveShortcut();
+
+    // Verify the shortcut is now customized
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+  });
+});
+
+test.describe("Shortcut Import", () => {
+  test("Import valid custom shortcuts", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: { "align-bottom": "ctrl+y" },
+    });
+
+    await shortcutsPage.confirmImportApply();
+
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await shortcutsPage.clickTab("Personalized");
+    await shortcutsPage.searchForShortcut("Align bottom");
+    await shortcutsPage.expectShortcutVisible("Align bottom");
+  });
+
+  test("Import invalid JSON syntax", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcutsRaw("{invalid");
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Invalid data/i }),
+    ).toBeVisible();
+  });
+
+  test("Import valid JSON with invalid schema", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: { "unknown-shortcut": "ctrl+y" },
+    });
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Invalid data/i }),
+    ).toBeVisible();
+  });
+
+  test("Import JSON without workspace context accepted", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      dashboard: { "toggle-theme": "alt+m" },
+    });
+
+    await shortcutsPage.confirmImportApply();
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Invalid data/i }),
+    ).not.toBeVisible();
+  });
+
+  test("Import JSON with unsupported shortcut format", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: { escape: 123 },
+    });
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Invalid data/i }),
+    ).toBeVisible();
+  });
+
+  test("Import conflicting shortcuts", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: {
+        "align-bottom": "alt+a",
+      },
+    });
+
+    await shortcutsPage.confirmImportApply();
+
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.expectShortcutDisabled("Align left");
+
+    const exported = await shortcutsPage.getExportedJson();
+    expect(exported.workspace).toMatchObject({
+      "align-bottom": "alt+a",
+      "align-left": "",
+    });
+  });
+});
+
+test.describe("Shortcut Export", () => {
+  test("Export customized shortcuts", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    const exported = await shortcutsPage.getExportedJson();
+    expect(exported).toHaveProperty("workspace");
+    expect(exported.workspace).toMatchObject({
+      "align-bottom": "ctrl+y",
+    });
+  });
+
+  test("Export includes disabled shortcuts", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: { "align-bottom": "" },
+    });
+
+    await shortcutsPage.confirmImportApply();
+
+    await shortcutsPage.searchForShortcut("Align bottom");
+    await shortcutsPage.expectShortcutDisabled("Align bottom");
+
+    const exported = await shortcutsPage.getExportedJson();
+    expect(exported.workspace).toMatchObject({
+      "align-bottom": "",
+    });
+  });
+});
+
+test.describe("Shortcut Conflict Detection", () => {
+  test("Detects conflict and disables old shortcut on save", async ({
+    page,
+  }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Alt+a");
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Combination assigned to/i }),
+    ).toBeVisible();
+
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+    await shortcutsPage.expectShortcutDisabled("Align left");
+
+    const exported = await shortcutsPage.getExportedJson();
+    expect(exported.workspace).toMatchObject({
+      "align-bottom": "alt+a",
+      "align-left": "",
+    });
+  });
+});
+
+test.describe("Shortcut Reset", () => {
+  test("Reset after import restores defaults", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.importShortcuts({
+      workspace: { "align-bottom": "ctrl+y" },
+    });
+    await shortcutsPage.confirmImportApply();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await shortcutsPage.restoreAllShortcuts();
+    await shortcutsPage.expectShortcutNotCustomized("Align bottom");
+  });
+
+  test("Reset button shows pending message and requires save to apply", async ({
+    page,
+  }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.resetShortcut("Align bottom");
+
+    await expect(
+      page.getByText(/If you save, this shortcut will return/i),
+    ).toBeVisible();
+
+    await shortcutsPage.saveShortcut();
+
+    await shortcutsPage.expectShortcutNotCustomized("Align bottom");
+  });
+});
+
+test.describe("Shortcut Persistence", () => {
+  test("Custom shortcuts persist after reload", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await page.reload();
+    await shortcutsPage.goToShortcuts();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+  });
+});
+
+test.describe("Cancel Shortcut Editing", () => {
+  test("Cancel editing does not save changes", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.cancelEdit();
+
+    await shortcutsPage.expectShortcutNotCustomized("Align bottom");
+  });
+});
+
+test.describe("Duplicate Shortcut Prevention", () => {
+  test("Assigning same shortcut to two actions shows conflict and disables first", async ({
+    page,
+  }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    await shortcutsPage.clickEditShortcut("Align left");
+    await shortcutsPage.pressKey("Control+y");
+
+    await expect(
+      page.getByRole("alert").filter({ hasText: /Combination assigned to/i }),
+    ).toBeVisible();
+
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align left");
+
+    const exported = await shortcutsPage.getExportedJson();
+    expect(exported.workspace).toMatchObject({
+      "align-left": "ctrl+y",
+      "align-bottom": "",
+    });
+  });
+});
+
+test.describe("Shortcut Round-Trip", () => {
+  test("Export, reset, import restores configuration", async ({ page }) => {
+    const shortcutsPage = new ShortcutsPage(page);
+    await shortcutsPage.goToShortcuts();
+
+    await shortcutsPage.expandSubsection("Alignment");
+    await shortcutsPage.clickEditShortcut("Align bottom");
+    await shortcutsPage.pressKey("Control+y");
+    await shortcutsPage.saveShortcut();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    const exported = await shortcutsPage.getExportedJson();
+
+    await shortcutsPage.restoreAllShortcuts();
+    await shortcutsPage.expectShortcutNotCustomized("Align bottom");
+
+    await shortcutsPage.importShortcuts(exported);
+    await shortcutsPage.confirmImportApply();
+    await shortcutsPage.expectShortcutCustomized("Align bottom");
+
+    const reExported = await shortcutsPage.getExportedJson();
+    expect(reExported).toEqual(exported);
+  });
+});
diff --git a/frontend/playwright/ui/specs/text-editor-v3.spec.js b/frontend/playwright/ui/specs/text-editor-v3.spec.js
index 53b439ab19..45f0103d19 100644
--- a/frontend/playwright/ui/specs/text-editor-v3.spec.js
+++ b/frontend/playwright/ui/specs/text-editor-v3.spec.js
@@ -9,7 +9,9 @@ const FILE = {
 test.beforeEach(async ({ page }) => {
   await WasmWorkspacePage.init(page);
   // WASM_FLAGS already enables render-wasm; add the WASM text editor on top.
-  await WasmWorkspacePage.mockConfigFlags(page, ["enable-feature-text-editor-wasm"]);
+  await WasmWorkspacePage.mockConfigFlags(page, [
+    "enable-feature-text-editor-wasm",
+  ]);
 });
 
 async function openEditorAndSelectAll(workspace) {
@@ -22,12 +24,12 @@ async function openEditorAndSelectAll(workspace) {
 }
 
 test.describe("BUG 10502 - Mixed families and variants", () => {
-  test("Multiple variants of the same font family", async ({
-    page,
-  }) => {
+  test("Multiple variants of the same font family", async ({ page }) => {
     const workspace = new WasmWorkspacePage(page, { textEditor: true });
     await workspace.setupEmptyFile();
-    await workspace.mockGetFile("text-editor/get-file-10502-mixed-variants.json");
+    await workspace.mockGetFile(
+      "text-editor/get-file-10502-mixed-variants.json",
+    );
 
     await workspace.goToWorkspace(FILE);
     await workspace.waitForFirstRender();
@@ -47,10 +49,14 @@ test.describe("BUG 10502 - Mixed families and variants", () => {
     await expect(fontVariant).toHaveText("--");
   });
 
-  test("Mixed font families appear as such in the dropdown", async ({ page }) => {
+  test("Mixed font families appear as such in the dropdown", async ({
+    page,
+  }) => {
     const workspace = new WasmWorkspacePage(page, { textEditor: true });
     await workspace.setupEmptyFile();
-    await workspace.mockGetFile("text-editor/get-file-10502-mixed-families.json");
+    await workspace.mockGetFile(
+      "text-editor/get-file-10502-mixed-families.json",
+    );
     // Serve a stand-in TTF for Sora so the render doesn't wait on a real fetch.
     // Glyphs are irrelevant here: the assertion only inspects the sidebar.
     await workspace.mockGoogleFont("sora", "render-wasm/assets/ebgaramond.ttf");
@@ -129,6 +135,63 @@ test("BUG 10467 - Auto-width text captures every typed character", async ({
   await workspace.waitForSelectedShapeName("hello world");
 });
 
+test.describe("BUG 10910 - Text is not replaced when there is a selection", () => {
+  // Non-ascii on purpose: selection offsets are counted in characters.
+  test("Typing over a selection replaces it", async ({ page }) => {
+    const workspace = new WasmWorkspacePage(page, { textEditor: true });
+    await workspace.setupEmptyFile();
+    await workspace.goToWorkspace();
+    await workspace.waitForFirstRender();
+
+    await workspace.createAutoWidthTextShape(200, 150, "Añadir");
+
+    await page.keyboard.press("ControlOrMeta+a");
+    await page.keyboard.type("nuevo");
+
+    await workspace.textEditor.stopEditing();
+
+    await workspace.layers.getByTestId("layer-row").first().click();
+    await workspace.waitForSelectedShapeName("nuevo");
+  });
+
+  test("Typing over a selection that contains emoji replaces it", async ({
+    page,
+  }) => {
+    const workspace = new WasmWorkspacePage(page, { textEditor: true });
+    await workspace.setupEmptyFile();
+    await workspace.goToWorkspace();
+    await workspace.waitForFirstRender();
+
+    await workspace.createAutoWidthTextShape(200, 150, "Hola 😀");
+
+    await page.keyboard.press("ControlOrMeta+a");
+    await page.keyboard.type("ok");
+
+    await workspace.textEditor.stopEditing();
+
+    await workspace.layers.getByTestId("layer-row").first().click();
+    await workspace.waitForSelectedShapeName("ok");
+  });
+
+  test("Backspace deletes the selection", async ({ page }) => {
+    const workspace = new WasmWorkspacePage(page, { textEditor: true });
+    await workspace.setupEmptyFile();
+    await workspace.goToWorkspace();
+    await workspace.waitForFirstRender();
+
+    await workspace.createAutoWidthTextShape(200, 150, "Añadir texto");
+
+    await page.keyboard.press("ControlOrMeta+a");
+    await page.keyboard.press("Backspace");
+    await page.keyboard.type("ok");
+
+    await workspace.textEditor.stopEditing();
+
+    await workspace.layers.getByTestId("layer-row").first().click();
+    await workspace.waitForSelectedShapeName("ok");
+  });
+});
+
 test("BUG 10531 - Entering the editor auto-selects the whole text", async ({
   page,
 }) => {
@@ -147,9 +210,94 @@ test("BUG 10531 - Entering the editor auto-selects the whole text", async ({
   await workspace.copy("keyboard");
 
   // Assert the text was copied correctly
-  const copiedText = await page.evaluate(() =>
-    navigator.clipboard.readText(),
-  );
+  const copiedText = await page.evaluate(() => navigator.clipboard.readText());
   expect(copiedText).toBe("Lorem ipsum");
 });
 
+test.describe("BUG 10934 - Double-clicking a text side handle sets auto-size", () => {
+  // Sets up the workspace and loads a text shape whose size is larger than its text
+  async function setupFixedSizeText(page) {
+    const workspace = new WasmWorkspacePage(page, { textEditor: true });
+    // Enable token inputs so they use the new component with accessible DOM
+    await workspace.mockConfigFlags(["enable-feature-token-input"]);
+    await workspace.setupEmptyFile();
+    await workspace.mockGetFile("text-editor/get-file-fixed-size-text.json");
+    await workspace.goToWorkspace();
+    await workspace.waitForFirstRender();
+
+    // Select the text and zoom to fit, so it is fully visible in the viewport
+    await workspace.clickLeafLayer("Fixed text");
+    await page.keyboard.press("Shift+1");
+    await workspace.waitForIdle();
+
+    return workspace;
+  }
+
+  async function doubleClickSideHandle(workspace, position) {
+    const handle = workspace.viewport.getByTestId(
+      `resize-side-handler-${position}`,
+    );
+    await handle.waitFor();
+    const box = await handle.boundingBox();
+    await workspace.page.mouse.dblclick(
+      box.x + box.width / 2,
+      box.y + box.height / 2,
+    );
+  }
+
+  function measureInput(workspace, name) {
+    return workspace.rightSidebar
+      .getByRole("region", { name: "shape-measures-section" })
+      .getByRole("textbox", { name, exact: true });
+  }
+
+  test("Double-clicking the right handle switches to auto-width", async ({
+    page,
+  }) => {
+    const workspace = await setupFixedSizeText(page);
+
+    const widthInput = workspace.rightSidebar
+      .getByRole("region", { name: "shape-measures-section" })
+      .getByRole("textbox", { name: "Width", exact: true });
+    const initialWidth = Number(await widthInput.inputValue());
+
+    await doubleClickSideHandle(workspace, "right");
+
+    // Assert auto-width is selected and that the width has shrunk. The resize
+    // is debounced, so poll the value (auto-retrying) rather than reading once.
+    await expect(
+      workspace.rightSidebar.getByRole("button", {
+        name: "Auto width",
+        pressed: true,
+      }),
+    ).toBeVisible();
+    await expect
+      .poll(async () => Number(await widthInput.inputValue()))
+      .toBeLessThan(initialWidth);
+  });
+
+  test("Double-clicking the bottom handle switches to auto-height", async ({
+    page,
+  }) => {
+    const workspace = await setupFixedSizeText(page);
+
+    const heightInput = workspace.rightSidebar
+      .getByRole("region", { name: "shape-measures-section" })
+      .getByRole("textbox", { name: "Height", exact: true });
+    const initialHeight = Number(await heightInput.inputValue());
+
+    await doubleClickSideHandle(workspace, "bottom");
+
+    // Assert auto-height is selected and that the height has shrunk. The resize
+    // is debounced, so poll the value (auto-retrying) rather than reading once.
+    await expect(
+      workspace.rightSidebar.getByRole("button", {
+        name: "Auto height",
+        pressed: true,
+      }),
+    ).toBeVisible();
+    await expect
+      .poll(async () => Number(await heightInput.inputValue()))
+      .toBeLessThan(initialHeight);
+  });
+});
diff --git a/frontend/playwright/ui/specs/tokens/text.spec.js b/frontend/playwright/ui/specs/tokens/text.spec.js
index 3c34376934..d7b633fd34 100644
--- a/frontend/playwright/ui/specs/tokens/text.spec.js
+++ b/frontend/playwright/ui/specs/tokens/text.spec.js
@@ -1,4 +1,7 @@
 import { test, expect } from "@playwright/test";
+import {
+  unfoldTokenType,
+} from "./helpers";
 import { WasmWorkspacePage } from "../../pages/WasmWorkspacePage";
 
 test.beforeEach(async ({ page }) => {
@@ -27,3 +30,47 @@ test("BUG 13958 - Fill token gets detached when editing text shape", async ({ pa
   // Assert token is still attached to the shape
   await expect(workspacePage.rightSidebar.getByLabel("xx.alias.color.text.default", { exact: true })).toBeVisible();
 });
+
+test("Selection change clears text-edition mode so tokens can be applied", async ({ page }) => {
+  const workspacePage = new WasmWorkspacePage(page);
+  await workspacePage.setupEmptyFile();
+  await workspacePage.mockGetFile("workspace/get-file-13958.json");
+  await workspacePage.goToWorkspace();
+  await workspacePage.rectShapeButton.click();
+  await workspacePage.clickWithDragViewportAt(128, 128, 200, 100);
+  await workspacePage.clickLeafLayer("Rectangle");
+
+  // Enter text editing on the text layer
+  await workspacePage.clickLeafLayer("Design tokens are a set");
+  await workspacePage.page.keyboard.press("Enter");
+  await expect(workspacePage.page.getByTestId("text-editor")).toBeVisible();
+
+  // Shift-click another layer to change selection while editing
+  await workspacePage.layers
+    .getByTestId("layer-row")
+    .filter({ hasText: "Rectangle" })
+    .click({ modifiers: ["Shift"] });
+
+  // Text editor should close because selection change emits :interrupt
+  await expect(workspacePage.page.getByTestId("text-editor")).not.toBeAttached();
+
+  // Open tokens tab and try to apply a fill token — should succeed without warning
+  await page.getByRole("tab", { name: "Tokens" }).click();
+
+  const tokensSidebar = page.getByTestId("tokens-sidebar");
+
+  await unfoldTokenType(tokensSidebar, "color");
+
+  // Right-click a color token and apply as fill
+  await tokensSidebar
+    .getByRole('button', { name: '#934846 xx.global.color.red.' })
+    .click({ button: "right" });
+  await workspacePage.tokenContextMenuForToken.getByText("Fill").click();
+
+  // Verify no warning toast appeared about text editing
+  await expect(
+    page.getByRole("alert").filter({
+      hasText: /Tokens can't be applied while editing text/i,
+    }),
+  ).not.toBeVisible();
+});
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index e7ee6eda1f..bf162c0db6 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -17,13 +17,21 @@ overrides:
   postcss@<8.4.31: ^8.4.31
   postcss@<8.5.10: ^8.5.10
   yaml@>=2.0.0 <2.8.3: ^2.8.3
+  playwright@>=1.61.1 <2.0.0-0: 1.62.1
 
 patchedDependencies:
-  '@zip.js/zip.js@2.8.26': 7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95
+  '@zip.js/zip.js@2.8.34': 7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95
 
 importers:
 
   .:
+    dependencies:
+      '@penpot/ui':
+        specifier: link:packages/ui
+        version: link:packages/ui
+      react-aria-components:
+        specifier: ^1.20.0
+        version: 1.20.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
     devDependencies:
       '@penpot/draft-js':
         specifier: link:packages/draft-js
@@ -46,51 +54,48 @@ importers:
       '@penpot/ua-parser':
         specifier: penpot/ua-parser#1.0.0
         version: https://codeload.github.com/penpot/ua-parser/tar.gz/90b970f39f2dc08378b975a0f01045b4ec8e89a4
-      '@penpot/ui':
-        specifier: link:packages/ui
-        version: link:packages/ui
       '@playwright/test':
-        specifier: 1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
       '@storybook/addon-docs':
-        specifier: 10.4.6
-        version: 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: 10.5.6
+        version: 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       '@storybook/addon-themes':
-        specifier: 10.4.6
-        version: 10.4.6(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))
+        specifier: 10.5.6
+        version: 10.5.6(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))
       '@storybook/addon-vitest':
-        specifier: 10.4.6
-        version: 10.4.6(@vitest/browser-playwright@4.1.9)(@vitest/browser@4.1.9)(@vitest/runner@4.1.9)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vitest@4.1.9)
+        specifier: 10.5.6
+        version: 10.5.6(@vitest/browser-playwright@4.1.10)(@vitest/browser@4.1.10)(@vitest/runner@4.1.10)(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vitest@4.1.10)
       '@storybook/react-vite':
-        specifier: 10.4.6
-        version: 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(esbuild@0.28.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: 10.5.6
+        version: 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@5.5.0)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       '@tokens-studio/sd-transforms':
         specifier: 2.0.3
-        version: 2.0.3(style-dictionary@5.4.4(tslib@2.8.1))
+        version: 2.0.3(style-dictionary@5.5.0(tslib@2.8.1))
       '@types/node':
-        specifier: ^26.1.0
-        version: 26.1.0
+        specifier: ^26.1.2
+        version: 26.1.2
       '@vitest/browser':
-        specifier: 4.1.9
-        version: 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
+        specifier: 4.1.10
+        version: 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
       '@vitest/browser-playwright':
-        specifier: ^4.1.9
-        version: 4.1.9(playwright@1.61.1)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
+        specifier: 4.1.10
+        version: 4.1.10(playwright@1.62.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
       '@vitest/coverage-v8':
-        specifier: 4.1.9
-        version: 4.1.9(@vitest/browser@4.1.9)(vitest@4.1.9)
+        specifier: 4.1.10
+        version: 4.1.10(@vitest/browser@4.1.10)(vitest@4.1.10)
       '@zip.js/zip.js':
-        specifier: 2.8.26
-        version: 2.8.26(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
+        specifier: 2.8.34
+        version: 2.8.34(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
       autoprefixer:
-        specifier: ^10.5.2
-        version: 10.5.2(postcss@8.5.16)
+        specifier: ^10.5.4
+        version: 10.5.4(postcss@8.5.25)
       compression:
         specifier: ^1.8.1
-        version: 1.8.1
+        version: 1.8.1(supports-color@5.5.0)
       concurrently:
-        specifier: ^10.0.3
-        version: 10.0.3
+        specifier: ^10.0.4
+        version: 10.0.4
       date-fns:
         specifier: ^4.4.0
         version: 4.4.0
@@ -110,8 +115,8 @@ importers:
         specifier: ^2.3.0
         version: 2.3.0
       gettext-parser:
-        specifier: ^9.0.2
-        version: 9.0.2
+        specifier: ^9.1.1
+        version: 9.1.1
       highlight.js:
         specifier: ^11.10.0
         version: 11.11.1
@@ -119,8 +124,8 @@ importers:
         specifier: ^2.0.3
         version: 2.0.3
       jsdom:
-        specifier: ^29.0.2
-        version: 29.1.1(canvas@3.2.3)
+        specifier: ^30.0.1
+        version: 30.0.1(canvas@3.2.3)
       lodash:
         specifier: ^4.18.1
         version: 4.18.1
@@ -131,8 +136,8 @@ importers:
         specifier: 0.0.7
         version: 0.0.7
       marked:
-        specifier: ^18.0.5
-        version: 18.0.5
+        specifier: ^18.0.9
+        version: 18.0.9
       mkdirp:
         specifier: ^3.0.1
         version: 3.0.1
@@ -149,26 +154,26 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       p-limit:
-        specifier: ^7.3.0
-        version: 7.3.0
+        specifier: ^7.3.1
+        version: 7.3.1
       playwright:
-        specifier: 1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
       postcss:
-        specifier: ^8.5.16
-        version: 8.5.16
+        specifier: ^8.5.25
+        version: 8.5.25
       postcss-clean:
         specifier: ^1.2.2
         version: 1.2.2
       postcss-modules:
-        specifier: ^9.0.0
-        version: 9.0.0(postcss@8.5.16)
+        specifier: ^9.0.1
+        version: 9.0.1(postcss@8.5.25)
       postcss-scss:
         specifier: ^4.0.9
-        version: 4.0.9(postcss@8.5.16)
+        version: 4.0.9(postcss@8.5.25)
       prettier:
-        specifier: 3.9.4
-        version: 3.9.4
+        specifier: 3.9.6
+        version: 3.9.6
       pretty-time:
         specifier: ^1.1.0
         version: 1.1.0
@@ -179,17 +184,17 @@ importers:
         specifier: ^0.6.2
         version: 0.6.2
       react:
-        specifier: 19.2.7
-        version: 19.2.7
+        specifier: 19.2.8
+        version: 19.2.8
       react-dom:
-        specifier: 19.2.7
-        version: 19.2.7(react@19.2.7)
+        specifier: 19.2.8
+        version: 19.2.8(react@19.2.8)
       react-error-boundary:
         specifier: ^6.1.2
-        version: 6.1.2(react@19.2.7)
+        version: 6.1.2(react@19.2.8)
       react-virtualized:
         specifier: ^9.22.6
-        version: 9.22.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 9.22.6(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       rimraf:
         specifier: ^6.1.3
         version: 6.1.3
@@ -197,14 +202,14 @@ importers:
         specifier: 8.0.0-alpha.14
         version: 8.0.0-alpha.14
       sass:
-        specifier: ^1.101.0
-        version: 1.101.0
+        specifier: ^1.102.0
+        version: 1.102.0
       sass-embedded:
         specifier: ^1.100.0
         version: 1.100.0
       sax:
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: ^1.6.1
+        version: 1.6.1
       scheduler:
         specifier: ^0.27.0
         version: 0.27.0
@@ -212,23 +217,23 @@ importers:
         specifier: ^0.5.21
         version: 0.5.21
       storybook:
-        specifier: 10.4.6
-        version: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        specifier: 10.5.6
+        version: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       style-dictionary:
-        specifier: 5.4.4
-        version: 5.4.4(tslib@2.8.1)
+        specifier: 5.5.0
+        version: 5.5.0(tslib@2.8.1)
       stylelint:
-        specifier: ^17.14.0
-        version: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
+        specifier: ^17.14.1
+        version: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
       stylelint-config-standard-scss:
         specifier: ^17.0.0
-        version: 17.0.0(postcss@8.5.16)(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+        version: 17.0.0(postcss@8.5.25)(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
       stylelint-plugin-logical-css:
         specifier: ^2.1.0
-        version: 2.1.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+        version: 2.1.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
       stylelint-scss:
         specifier: ^7.2.0
-        version: 7.2.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+        version: 7.2.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
       svg-sprite:
         specifier: ^2.0.4
         version: 2.0.4
@@ -242,14 +247,14 @@ importers:
         specifier: ^6.0.2
         version: 6.0.3
       vite:
-        specifier: ^8.1.2
-        version: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+        specifier: ^8.2.0
+        version: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
       vitest:
-        specifier: ^4.1.9
-        version: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: ^4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       wait-on:
-        specifier: ^9.0.4
-        version: 9.0.10(supports-color@5.5.0)
+        specifier: ^9.1.0
+        version: 9.1.0(debug@4.4.3(supports-color@5.5.0))(supports-color@5.5.0)
       watcher:
         specifier: ^2.3.1
         version: 2.3.1
@@ -263,17 +268,14 @@ importers:
   packages/draft-js:
     dependencies:
       draft-js:
-        specifier: penpot/draft-js.git#ba3b26ed63a01227a3560e440531b69d79c03f35
-        version: https://codeload.github.com/penpot/draft-js/tar.gz/ba3b26ed63a01227a3560e440531b69d79c03f35(encoding@0.1.13)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      immutable:
-        specifier: ^5.1.9
-        version: 5.1.9
+        specifier: penpot/draft-js.git#c58ebd9429a6359d72a88cff87e078aaf6fe285d
+        version: https://codeload.github.com/penpot/draft-js/tar.gz/c58ebd9429a6359d72a88cff87e078aaf6fe285d(encoding@0.1.13)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react:
         specifier: '>=0.17.0'
-        version: 19.2.7
+        version: 19.2.8
       react-dom:
         specifier: '>=0.17.0'
-        version: 19.2.7(react@19.2.7)
+        version: 19.2.8(react@19.2.8)
     devDependencies:
       esbuild:
         specifier: ^0.28.1
@@ -291,10 +293,13 @@ importers:
     dependencies:
       react:
         specifier: '>=19.2'
-        version: 19.2.7
+        version: 19.2.8
+      react-aria-components:
+        specifier: ^1.20.0
+        version: 1.20.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react-dom:
         specifier: '>=19.2'
-        version: 19.2.7(react@19.2.7)
+        version: 19.2.8(react@19.2.8)
     devDependencies:
       '@babel/core':
         specifier: ^8.0.1
@@ -303,68 +308,68 @@ importers:
         specifier: ^8.0.1
         version: 8.0.1(@babel/core@8.0.1)
       '@storybook/react':
-        specifier: 10.4.6
-        version: 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)
+        specifier: 10.5.6
+        version: 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@10.2.2)(typescript@6.0.3)
       '@storybook/react-vite':
-        specifier: 10.4.6
-        version: 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(esbuild@0.28.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: 10.5.6
+        version: 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       '@testing-library/dom':
         specifier: 10.4.1
         version: 10.4.1
       '@testing-library/react':
         specifier: 16.3.2
-        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@types/react':
-        specifier: ^19.2.17
-        version: 19.2.17
+        specifier: ^19.2.18
+        version: 19.2.18
       '@types/react-dom':
-        specifier: ^19.0.0
-        version: 19.2.3(@types/react@19.2.17)
+        specifier: ^19.2.4
+        version: 19.2.4(@types/react@19.2.18)
       '@vitejs/plugin-react':
-        specifier: ^6.0.3
-        version: 6.0.3(babel-plugin-react-compiler@1.0.0)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: ^6.0.5
+        version: 6.0.5(babel-plugin-react-compiler@1.0.0)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       babel-plugin-react-compiler:
         specifier: ^1.0.0
         version: 1.0.0
       eslint-plugin-import:
         specifier: 2.32.0
-        version: 2.32.0(eslint@9.39.2)
+        version: 2.32.0(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2)
       eslint-plugin-jsx-a11y:
         specifier: 6.10.2
-        version: 6.10.2(eslint@9.39.2)
+        version: 6.10.2(eslint@9.39.2(supports-color@10.2.2))
       eslint-plugin-react:
         specifier: 7.37.5
-        version: 7.37.5(eslint@9.39.2)
+        version: 7.37.5(eslint@9.39.2(supports-color@10.2.2))
       eslint-plugin-react-hooks:
         specifier: 7.1.1
-        version: 7.1.1(eslint@9.39.2)
+        version: 7.1.1(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2)
       react-compiler-runtime:
         specifier: ^1.0.0
-        version: 1.0.0(react@19.2.7)
+        version: 1.0.0(react@19.2.8)
       storybook:
-        specifier: 10.4.6
-        version: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        specifier: 10.5.6
+        version: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       vite-plugin-dts:
         specifier: ^5.0.3
-        version: 5.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.0))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.61.1)(supports-color@5.5.0)(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        version: 5.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.2))(esbuild@0.28.1)(rolldown@1.2.1)(rollup@4.61.1)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
 
   text-editor:
     devDependencies:
       '@playwright/test':
-        specifier: 1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
       '@types/node':
-        specifier: ^26.1.0
-        version: 26.1.0
+        specifier: ^26.1.2
+        version: 26.1.2
       '@vitest/browser':
-        specifier: ^4.1.9
-        version: 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
+        specifier: ^4.1.10
+        version: 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
       '@vitest/coverage-v8':
-        specifier: ^4.1.9
-        version: 4.1.9(@vitest/browser@4.1.9)(vitest@4.1.9)
+        specifier: ^4.1.10
+        version: 4.1.10(@vitest/browser@4.1.10)(vitest@4.1.10)
       '@vitest/ui':
-        specifier: ^4.1.9
-        version: 4.1.9(vitest@4.1.9)
+        specifier: ^4.1.10
+        version: 4.1.10(vitest@4.1.10)
       canvas:
         specifier: ^3.2.3
         version: 3.2.3
@@ -372,20 +377,20 @@ importers:
         specifier: ^0.28.0
         version: 0.28.1
       jsdom:
-        specifier: ^29.1.1
-        version: 29.1.1(canvas@3.2.3)
+        specifier: ^30.0.1
+        version: 30.0.1(canvas@3.2.3)
       playwright:
-        specifier: 1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
       prettier:
-        specifier: ^3.9.4
-        version: 3.9.4
+        specifier: ^3.9.6
+        version: 3.9.6
       vite:
-        specifier: ^8.1.2
-        version: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+        specifier: ^8.2.0
+        version: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
       vitest:
-        specifier: ^4.1.9
-        version: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+        specifier: ^4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
 
 packages:
 
@@ -398,20 +403,13 @@ packages:
   '@ark/util@0.56.0':
     resolution: {integrity: sha512-BghfRC8b9pNs3vBoDJhcta0/c1J1rsoS1+HgVUreMFPdhz/CRAKReAu57YEllNaSy98rWAdY1gE+gFup7OXpgA==}
 
-  '@asamuzakjp/css-color@5.1.11':
-    resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+  '@asamuzakjp/css-color@6.0.5':
+    resolution: {integrity: sha512-mbhpPMmnw/kwW19aRNmSUl1QzLbdGo1SCuE49BT98MNwqF6zaHb3o2owssFc/PEO/4t2UjqtCNwocuDtJornzA==}
+    engines: {node: ^22.13.0 || >=24.0.0}
 
-  '@asamuzakjp/dom-selector@7.1.1':
-    resolution: {integrity: sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-
-  '@asamuzakjp/generational-cache@1.0.1':
-    resolution: {integrity: sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-
-  '@asamuzakjp/nwsapi@2.3.9':
-    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+  '@asamuzakjp/dom-selector@8.3.0':
+    resolution: {integrity: sha512-UJLfKXBhrc8i1vH2eJXuYQMwlsLKWFw3O+CPqXSuVEiikeAim3UgrfWX0k4tA/X8cRFM8iZ7OaqBokFGbYusdg==}
+    engines: {node: ^22.13.0 || >=24.0.0}
 
   '@babel/code-frame@7.29.7':
     resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
@@ -441,6 +439,10 @@ packages:
     resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.29.8':
+    resolution: {integrity: sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@8.0.0':
     resolution: {integrity: sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==}
     engines: {node: ^22.18.0 || >=24.11.0}
@@ -522,6 +524,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.29.8':
+    resolution: {integrity: sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/parser@8.0.0':
     resolution: {integrity: sha512-aLxAE+imI9bCcyaPrUDjBv3uSkWieifjLe0kuFOZF0zli0L6GCsTmsePnTr55adbIAgYz2zhN1vnFimCBUYcRQ==}
     engines: {node: ^22.18.0 || >=24.11.0}
@@ -583,6 +590,10 @@ packages:
     resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.29.8':
+    resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@8.0.0':
     resolution: {integrity: sha512-bxTj/W2VclGE6CctlfQOpxg8MPDzXArRqkOBePw8EHfebcjF7fETWSS3BriEECo+UiU/Yblq+xUtSImFu7cTbw==}
     engines: {node: ^22.18.0 || >=24.11.0}
@@ -591,6 +602,10 @@ packages:
     resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.29.8':
+    resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@8.0.0':
     resolution: {integrity: sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==}
     engines: {node: ^22.18.0 || >=24.11.0}
@@ -621,29 +636,29 @@ packages:
   '@bundled-es-modules/postcss-calc-ast-parser@0.1.6':
     resolution: {integrity: sha512-y65TM5zF+uaxo9OeekJ3rxwTINlQvrkbZLogYvQYVoLtxm4xEiHfZ7e/MyiWbStYyWZVZkVqsaVU6F4SUK5XUA==}
 
-  '@cacheable/memory@2.0.8':
-    resolution: {integrity: sha512-FvEb29x5wVwu/Kf93IWwsOOEuhHh6dYCJF3vcKLzXc0KXIW181AOzv6ceT4ZpBHDvAfG60eqb+ekmrnLHIy+jw==}
+  '@cacheable/memory@2.2.0':
+    resolution: {integrity: sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==}
 
-  '@cacheable/utils@2.4.1':
-    resolution: {integrity: sha512-eiFgzCbIneyMlLOmNG4g9xzF7Hv3Mga4LjxjcSC/ues6VYq2+gUbQI8JqNuw/ZM8tJIeIaBGpswAsqV2V7ApgA==}
+  '@cacheable/utils@2.5.0':
+    resolution: {integrity: sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==}
 
   '@colors/colors@1.6.0':
     resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==}
     engines: {node: '>=0.1.90'}
 
-  '@csstools/color-helpers@6.0.2':
-    resolution: {integrity: sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==}
+  '@csstools/color-helpers@6.1.0':
+    resolution: {integrity: sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==}
     engines: {node: '>=20.19.0'}
 
-  '@csstools/css-calc@3.2.1':
-    resolution: {integrity: sha512-DtdHlgXh5ZkA43cwBcAm+huzgJiwx3ZTWVjBs94kwz2xKqSimDA3lBgCjphYgwgVUMWatSM0pDd8TILB1yrVVg==}
+  '@csstools/css-calc@3.3.0':
+    resolution: {integrity: sha512-c5ihYsPkdG6JCkU2zTMm4+k6r7RXuGxtWYhu5DHMIiF1FHzrfmHL5so11AoFpUv/tu61xfcmT4AmKoFfMPoqdQ==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-color-parser@4.1.1':
-    resolution: {integrity: sha512-eZ5XOtyhK+mggRafYUWzA0tvaYOFgdY8AkgQiCJF9qNAePnUo/zmsqqYubBBb3sQ8uNUaSKTY9s9klfRaAXL0g==}
+  '@csstools/css-color-parser@4.1.10':
+    resolution: {integrity: sha512-UZhQLIUyJaaMepqehrCODwCg2KW25vFvLWBmqYFaPclYvvxzj/sG8LBOhBFCp11i9uE7t1EyS+RAoV9tztPFyw==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
@@ -655,16 +670,8 @@ packages:
     peerDependencies:
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.4':
-    resolution: {integrity: sha512-wgsqt92b7C7tQhIdPNxj0n9zuUbQlvAuI1exyzeNrOKOi62SD7ren8zqszmpVREjAOqg8cD2FqYhQfAuKjk4sw==}
-    peerDependencies:
-      css-tree: ^3.2.1
-    peerDependenciesMeta:
-      css-tree:
-        optional: true
-
-  '@csstools/css-syntax-patches-for-csstree@1.1.6':
-    resolution: {integrity: sha512-TcJCWFbXLPpJYq6z7bfOyjWYJDiDg2/I4gyUC9pqPNqHFRIey0EB0q0L5cSnQDfWJg8Jd6VadakxdIez/3zkqQ==}
+  '@csstools/css-syntax-patches-for-csstree@1.1.7':
+    resolution: {integrity: sha512-fQ+05118eQS1cofO3aJpB5efgpBZMvIzwr/sbC8kDLVA5XLG8q1kJV5yzrUAI1f7lvhPnm8fgIjzFB8/O/5Dig==}
     peerDependencies:
       css-tree: ^3.2.1
     peerDependenciesMeta:
@@ -682,8 +689,8 @@ packages:
       '@csstools/css-parser-algorithms': ^4.0.0
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/selector-resolve-nested@4.0.0':
-    resolution: {integrity: sha512-9vAPxmp+Dx3wQBIUwc1v7Mdisw1kbbaGqXUM8QLTgWg7SoPGYtXBsMXvsFs/0Bn5yoFhcktzxNZGNaUt0VjgjA==}
+  '@csstools/selector-resolve-nested@4.0.1':
+    resolution: {integrity: sha512-j3vdQu0XwLME5qOTWxm8cnmvsf423R2YL6DbKklCHZwkDm7UdKNu6RPlw4REIJhSlKBICY3B70/7QZdicLqZgg==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       postcss-selector-parser: ^7.1.1
@@ -697,30 +704,33 @@ packages:
   '@dabh/diagnostics@2.0.8':
     resolution: {integrity: sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==}
 
-  '@emnapi/core@1.10.0':
-    resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
-
-  '@emnapi/core@1.11.1':
-    resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==}
+  '@emnapi/core@1.11.2':
+    resolution: {integrity: sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==}
 
   '@emnapi/core@1.9.2':
     resolution: {integrity: sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==}
 
-  '@emnapi/runtime@1.10.0':
-    resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
+  '@emnapi/core@2.0.0-alpha.3':
+    resolution: {integrity: sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==}
 
-  '@emnapi/runtime@1.11.1':
-    resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==}
+  '@emnapi/runtime@1.11.2':
+    resolution: {integrity: sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==}
 
   '@emnapi/runtime@1.9.2':
     resolution: {integrity: sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==}
 
+  '@emnapi/runtime@2.0.0-alpha.3':
+    resolution: {integrity: sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==}
+
   '@emnapi/wasi-threads@1.2.1':
     resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
 
   '@emnapi/wasi-threads@1.2.2':
     resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==}
 
+  '@emnapi/wasi-threads@2.0.1':
+    resolution: {integrity: sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==}
+
   '@esbuild/aix-ppc64@0.28.1':
     resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
     engines: {node: '>=18'}
@@ -915,8 +925,8 @@ packages:
     resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@exodus/bytes@1.15.0':
-    resolution: {integrity: sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==}
+  '@exodus/bytes@1.15.1':
+    resolution: {integrity: sha512-S6mL0yNB/Abt9Ei4tq8gDhcczc4S3+vQ4ra7vxnAf+YHC02srtqxKKZghx2Dq6p0e66THKwR6r8N6P95wEty7Q==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     peerDependencies:
       '@noble/hashes': ^1.8.0 || ^2.0.0
@@ -937,8 +947,8 @@ packages:
   '@hapi/pinpoint@2.0.1':
     resolution: {integrity: sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q==}
 
-  '@hapi/tlds@1.1.4':
-    resolution: {integrity: sha512-Fq+20dxsxLaUn5jSSWrdtSRcIUba2JquuorF9UW1wIJS5cSUwxIsO2GIhaWynPRflvxSzFN+gxKte2HEW1OuoA==}
+  '@hapi/tlds@1.1.7':
+    resolution: {integrity: sha512-MgNjRwy9Ti92yVAixLmDc8dd1bJIKwO9qlWCfFQRwRmUEDPQHYn4G6hwPFvFGUTzAa0FsS+inMjLin7GnyBRhA==}
     engines: {node: '>=14.0.0'}
 
   '@hapi/topo@6.0.2':
@@ -964,6 +974,15 @@ packages:
     resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
     engines: {node: '>=18.18'}
 
+  '@internationalized/date@3.12.3':
+    resolution: {integrity: sha512-fuLX+3ZKLsxI73y8b01EG/WjHb6gE6weCqlfawPO27kBWGMh9G1yH6Csv1uU7/cac9H2GHmOMt6CjmuQ1aia4Q==}
+
+  '@internationalized/number@3.6.7':
+    resolution: {integrity: sha512-3ji1fcrT+FPAK86UqEhB/psHixYo6niWPJtt7+qRaYFynt/BaJG8GhAPimtWUpEiVSTq8ZM8L5psMxGquiB/Vg==}
+
+  '@internationalized/string@3.2.10':
+    resolution: {integrity: sha512-PDx6//vHSpRnHfxqMqto11zQvhsaU74O3mKv2F/0eicGZcl9NLjQmGlbHz/LsJh5tLKp4A4L7ZVTzN1/MmMTvA==}
+
   '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0':
     resolution: {integrity: sha512-qvsTEwEFefhdirGOPnu9Wp6ChfIwy2dBCRuETU3uE+4cC+PFoxMSiiEhxk4lOluA34eARHA0OxqsEUYDqRMgeQ==}
     peerDependencies:
@@ -1025,50 +1044,50 @@ packages:
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-core@4.57.6':
-    resolution: {integrity: sha512-uI++Wx6VkBJqVmkb4ZeExwAVpZiA2Do5NrEtXoDk0Pdvce3ytFXJoviT1sLOj16+qDIMnD5nWPfOhVpnDmRJKg==}
+  '@jsonjoy.com/fs-core@4.64.0':
+    resolution: {integrity: sha512-zs2TAq7Six5jgMuoMNjpspAvOP3mhtgq/k1UyQodEzCtQi/N83y2/y+zcvnZSGp/Rxq96DBN+bValOBQAyn/ew==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-fsa@4.57.6':
-    resolution: {integrity: sha512-pKkw/yC5CzSZKhIIUIsH1przOa+K5jGmZIg1sWaSF24JojyrUFbjcQv7QrcGAudriei6HQ6R0BFj+V8NbQinJw==}
+  '@jsonjoy.com/fs-fsa@4.64.0':
+    resolution: {integrity: sha512-nMWOVbkLFyEgmXZih3wyvxA9XpgyyqyfrINMHvEFqhi7uqfRl7c9ERJt6yX7vgMPrB9Uo+OJO+Spa0cFzPD01w==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-node-builtins@4.57.6':
-    resolution: {integrity: sha512-V4DgEFT3Cg5S9fCMOZSCVdTxdJWWLBO0WnAazV7hnCM96u5zXHyW/ubDAfcSVwqjkMJ50W1Y44IXtxRoIwaCVg==}
+  '@jsonjoy.com/fs-node-builtins@4.64.0':
+    resolution: {integrity: sha512-/o7WRFhUWaM/fOrslwLZGnzn4RmRILykn+lAL+mNObqqRNw+CQSiij6hpCeZ+C7buhdoVo7go/OYqzaSUfDYmA==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-node-to-fsa@4.57.6':
-    resolution: {integrity: sha512-+JptNw3iifihxH2rEXrninDzX4FFVW8JD/wPR8GbJPAeL9CQUSblrlumOPB5gZuS7tYRX+PJPLtT7XzKoRhv/Q==}
+  '@jsonjoy.com/fs-node-to-fsa@4.64.0':
+    resolution: {integrity: sha512-WDD9WVs0hb7UAEKTgZW2f66WDrbj7gIIWwpP3spbLyXa0rghtUaFTB8L4gdR3ZCWwiKIsj38/CNijpVmpnuPUw==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-node-utils@4.57.6':
-    resolution: {integrity: sha512-foyUrfS7WmYEUzqYXSNxmJBcSj04TABrkpFabwO9SCDCpVCfJ+qG+2sk5FjfiflG2n0SDFZDCJ6vYlJAEpxJFg==}
+  '@jsonjoy.com/fs-node-utils@4.64.0':
+    resolution: {integrity: sha512-k5Indsx9hWW9xSF7Y6oSKKwtCUNhzZxadub3owhIlitc+iMRVlPPdX2duTKQWBL3qNWpXya8jykgaaWpheeS4w==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-node@4.57.6':
-    resolution: {integrity: sha512-Kbn1jdkvDN4F2+BhoB6mMu7NCbhP0bgA5NcI1aJj/Q5UcU+I1JLLW+dEQean33iV4tXv35AzBVKPICnDltBpxw==}
+  '@jsonjoy.com/fs-node@4.64.0':
+    resolution: {integrity: sha512-dO+NNkODbUli4uV42bcNrrLvq5rE7SNpdZ5TNd0dtbLsAaNK3MDiIC9lUi+brboGoIjW6vd2fB1qao60nrk5xA==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-print@4.57.6':
-    resolution: {integrity: sha512-96eAn4Dudtt67LTeuU47yUD+pg9/G/oKpI10zei9ljk3X3WK4lYKc+n3cpaPCAbKPzoyfxl0mXm8f8Y7BOSFXw==}
+  '@jsonjoy.com/fs-print@4.64.0':
+    resolution: {integrity: sha512-PHZFccchvkhWrwPWHjmVAhbC3vSHCtyZvlZfJJ3ho2bnzl450hXri6/8e6pbkWdH+SkmLXNml0sV8e5HDAfxKw==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
 
-  '@jsonjoy.com/fs-snapshot@4.57.6':
-    resolution: {integrity: sha512-V57CMzbOgTzUWGOWQ8GzHQdpJP6JnrYVNCtTBNxVYEnlVRvo4uEJqHhtAT8vhDFrIuJOXLrTL1Fki4h5oI7xxg==}
+  '@jsonjoy.com/fs-snapshot@4.64.0':
+    resolution: {integrity: sha512-oM7UDeL83q6NBzzsfKAsYKXKVXlykKFqqOLh4xZZKAzzROTlInkPbc6LTDGThEOnPiFiUzA7tYziHG9xavd76Q==}
     engines: {node: '>=10.0'}
     peerDependencies:
       tslib: '2'
@@ -1137,17 +1156,12 @@ packages:
   '@microsoft/tsdoc@0.16.0':
     resolution: {integrity: sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==}
 
-  '@napi-rs/wasm-runtime@1.1.5':
-    resolution: {integrity: sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==}
+  '@napi-rs/wasm-runtime@1.2.2':
+    resolution: {integrity: sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
     peerDependencies:
-      '@emnapi/core': ^1.7.1
-      '@emnapi/runtime': ^1.7.1
-
-  '@napi-rs/wasm-runtime@1.1.6':
-    resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
-    peerDependencies:
-      '@emnapi/core': ^1.7.1
-      '@emnapi/runtime': ^1.7.1
+      '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.3
+      '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.3
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -1294,198 +1308,192 @@ packages:
   '@oxc-project/types@0.127.0':
     resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==}
 
-  '@oxc-project/types@0.137.0':
-    resolution: {integrity: sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==}
+  '@oxc-project/types@0.142.0':
+    resolution: {integrity: sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==}
 
-  '@oxc-resolver/binding-android-arm-eabi@11.20.0':
-    resolution: {integrity: sha512-IjfWOXRgJFNdORDl+Uf1aibNgZY2guOD3zmOhx1BGVb/MIiqlFTdmjpQNplSN58lhWehnX4UNqC3QwpUo8pjJg==}
+  '@oxc-resolver/binding-android-arm-eabi@11.24.2':
+    resolution: {integrity: sha512-y09e0L0SRI2OA2tUIrjBgoV3eH5hvUKXNkJqXmNo5V2WxIjyC7I7aJfRLMEVpA8yi95f90gFDvO0VMgrDw+vwA==}
     cpu: [arm]
     os: [android]
 
-  '@oxc-resolver/binding-android-arm64@11.20.0':
-    resolution: {integrity: sha512-QqslZAuFQG8Q9xm7JuIn8JUbvywhSBMVhuQHtYW+auirZJloS41oxUUaBXk7uUhZJgp44c5zQLeVvmFaDQB+2Q==}
+  '@oxc-resolver/binding-android-arm64@11.24.2':
+    resolution: {integrity: sha512-cl4icWaZFnLdg8m6qtnh5rBMuGbxc/ptStFHLeCNwr+2cZjkjNwQu/jYRS0CHlnPecOJMpuS5M6/BH+0J/YkEg==}
     cpu: [arm64]
     os: [android]
 
-  '@oxc-resolver/binding-darwin-arm64@11.20.0':
-    resolution: {integrity: sha512-MUcavykj2ewlR+kc5arpg4tC2RvzJkUxWtNv74pf7lcNk00GpIpN43vXMj+j6r4eMmfZhlb8hueKoIb8e9kAGQ==}
+  '@oxc-resolver/binding-darwin-arm64@11.24.2':
+    resolution: {integrity: sha512-At29QEMF6HajbQvgY8K6OXnHD1x9rad74xBEfmCB6ZqCGsdq75aK7tOYcTbOanMy8qdIBrfL3SMr3p/lfSlb9w==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxc-resolver/binding-darwin-x64@11.20.0':
-    resolution: {integrity: sha512-BGB16nRUK5Etiv//ihPyzj8Lj1px0mhh4YIfe0FDf045ywknfSm0GEbiRESpr6Q4K82AvnyaRIhhluHByvS4bg==}
+  '@oxc-resolver/binding-darwin-x64@11.24.2':
+    resolution: {integrity: sha512-A5Kqr1EUj4oIL5CF4WRssq/o5P0Y11cwoFouMRmQ7YnC/A8V93nv1nb7aSU8HwcgmXropjLNkVTl4MN87cu28Q==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxc-resolver/binding-freebsd-x64@11.20.0':
-    resolution: {integrity: sha512-JZgtePaqj3qmD5XFHJaSLWzHRxQu0LaPkdoM1KJXYADvAaa83ijXHclV3ej3CueeW0wxfIAbGCZVP45J0CA7uQ==}
+  '@oxc-resolver/binding-freebsd-x64@11.24.2':
+    resolution: {integrity: sha512-R5xkRBRRz7ceH/P5Jrc6G7FmdUdgpLYyESFAUDVTNQ9K0sGPxcp4ljiwEwEqsvNcQ4sYbMRrWcHHBCu7ksAJVw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxc-resolver/binding-linux-arm-gnueabihf@11.20.0':
-    resolution: {integrity: sha512-hOQ/p3ry3v3SchUBXicrrnszaI/UmYzM4wtS4RGfwgVUX7a+HbyQSzJ5aOzu+o6XZkFkS3ZXN4PZAzhOb77OSg==}
+  '@oxc-resolver/binding-linux-arm-gnueabihf@11.24.2':
+    resolution: {integrity: sha512-k/RuYL4L/R58IBn3wT5ma3Wh4k62bp1eYCFRWCmMsasUOqL+H6sW0VGFadEzKWXFFlz+2uIMoeMk9ySSZJHgbg==}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-resolver/binding-linux-arm-musleabihf@11.20.0':
-    resolution: {integrity: sha512-2ArPksaw0AqeuGBfoS715VF+JvJQAhD2niWgjE5hVO+L+nAfikVQopvngCMX9x4BD8itWoQ3dnikrQyl5Ho5Jg==}
+  '@oxc-resolver/binding-linux-arm-musleabihf@11.24.2':
+    resolution: {integrity: sha512-bnHAak3ujYfH5pKk4NieFNbvYvernfoQDgwLddbZ3OtMYrem87/qjlA+u+aKG0oZcqSLGCful/6/CEA+aeAgaA==}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-resolver/binding-linux-arm64-gnu@11.20.0':
-    resolution: {integrity: sha512-0bJnmYFp62JdZ4nVMDUZ/C58BCZOCcqgKtnUlp7L9Ojf/czIN+3j72YlLPeWLkzlr6SlYvIQA4SGV/HyO0d+qg==}
+  '@oxc-resolver/binding-linux-arm64-gnu@11.24.2':
+    resolution: {integrity: sha512-vDT3KHgzYp47gmtNOqL2VNhCyl5Zv643eyxm//A68J8DeUGXrvD1pZFiaT4jSfe+RInfnn1R2yVHye4enx6RnA==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-resolver/binding-linux-arm64-musl@11.20.0':
-    resolution: {integrity: sha512-wKHHzPKZo7Ufhv/Bt6yxT7FOgnIgW4gwXcJUipkShGp68W3wGVqvr1Sr0fY65lN0Oy6y41+g2kIDvkgZaMMUkw==}
+  '@oxc-resolver/binding-linux-arm64-musl@11.24.2':
+    resolution: {integrity: sha512-+kMlQvbzfyEYtu5FcjE4p+ttBLpKW4d/AsAsuE69BxV6V4twZJeIQZFfD8gh/wqglY0MkPSezWXQH0jBV13MUw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-resolver/binding-linux-ppc64-gnu@11.20.0':
-    resolution: {integrity: sha512-RN8goF7Ie0B79L4i4G6OeBocTgSC56vJbQ65VJje+oXnldVpLnOU7j/AQ/dP94TcCS+Yh6WG8u3Qt4ETteXFNQ==}
+  '@oxc-resolver/binding-linux-ppc64-gnu@11.24.2':
+    resolution: {integrity: sha512-shjfMhmZ3gq9fv/w7bi3PnZlgOPG+2QAOFf0BJF0EgBSIGZ6PMLN2zbGEblTUYB/NKVDRyYhE2ff3dJ1QqNPkA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-resolver/binding-linux-riscv64-gnu@11.20.0':
-    resolution: {integrity: sha512-5l1yU6/xQEqLZRzxqmMxJfWPslpwCmBsdDGaBvABPehxquCXDC7dd7oraNdKSJUMDXSM7VvVj8H2D2FTjU7oWw==}
+  '@oxc-resolver/binding-linux-riscv64-gnu@11.24.2':
+    resolution: {integrity: sha512-zGelwFR5oRo+b69k8Lrzun86DyUHzfKN6cnjbR9l7Z7NIRznOE/2ZvPa1IUKqAL2PzAXOdwkfVqNvO1H2RlpAw==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-resolver/binding-linux-riscv64-musl@11.20.0':
-    resolution: {integrity: sha512-xHEvkbgz6UC+A3JOyDQy76LkUaxsNSfIr3/GV8slwZsnuooJiIB34gzJfsyvR4JdCYNUUPsRJc/w/oWkODu+hg==}
+  '@oxc-resolver/binding-linux-riscv64-musl@11.24.2':
+    resolution: {integrity: sha512-qxZ1SWCXJY0eyhAlP6Lmo9F2Nrtx7EkYj9oCgL8apDPCwXwCEDA2U697bbT81JIc2IrVjxO4KX6WU2N+oN9Z4w==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-resolver/binding-linux-s390x-gnu@11.20.0':
-    resolution: {integrity: sha512-aWPDUUmSeyHvlW+SoEUd+JIJsQhVhu6a5tBpDRMu058naPAchTgAVGCFy35zjbnFlt0i8hLWziff6HX0D3LU4g==}
+  '@oxc-resolver/binding-linux-s390x-gnu@11.24.2':
+    resolution: {integrity: sha512-sGCecF3cx2DFlH4t/z7ApnOnXqN48p5p5mlHDEnHTAukQa2P+qMVE4CwyWE9W+q/m3QJ7kKfGrIjax31f44oFQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-resolver/binding-linux-x64-gnu@11.20.0':
-    resolution: {integrity: sha512-x2YeSimvhJjKLVD8KSu8f/rqU1potcdEMkApIPJqjZWN7c2Fpt4g2X32WDg1p+XDAmyT7nuQGe0vnhvXeLbH+g==}
+  '@oxc-resolver/binding-linux-x64-gnu@11.24.2':
+    resolution: {integrity: sha512-k/VlMMcSzMlahb3/fENM4rTlsJ0s3fFROA0KXPBmKggqmTSaE383sl8F3KCOXPLmVsYfW6hCitMhXCEtNeZxxg==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-resolver/binding-linux-x64-musl@11.20.0':
-    resolution: {integrity: sha512-kcRLEIxpZefeYfLChjpgFf3ilBzRDZ+yobMrpRsQlSrxuFGtm3U6PMU7AaEpMqo3NfDGVyJJseAjnRLzMFHjwQ==}
+  '@oxc-resolver/binding-linux-x64-musl@11.24.2':
+    resolution: {integrity: sha512-8hbnZyNi97b/8wapYaIF9+t9GmZKBW2vunaOc3h9HGJptH7b7XpvZqOTBSm/MpTjr7H497BlgOaSfLUdhmy2bw==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-resolver/binding-openharmony-arm64@11.20.0':
-    resolution: {integrity: sha512-HHcfnApSZGtKhTiHqe8OZruOZe5XuFQH5/E0Yhj3u8fnFvzkM4/k6WjacUf4SvA0SPEAbfbgYmVPuo0VX/fIBQ==}
+  '@oxc-resolver/binding-openharmony-arm64@11.24.2':
+    resolution: {integrity: sha512-MvyGik3a6pVgZ0t/kWlbmFxFLmXQJwgLsY2eYFHLpy0wGwRbfzeIGgDwQ3kXqE30z+kSXennRkCrT7TUvkptNg==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxc-resolver/binding-wasm32-wasi@11.20.0':
-    resolution: {integrity: sha512-Tn0y1XOFYHNfK1wp1Z5QK8Rcld/bsOwRISQXfqAZ5IBpv8Gz1IvV39fUWNprqNdRizgcvFhOzWwFun2zkJsyBg==}
+  '@oxc-resolver/binding-wasm32-wasi@11.24.2':
+    resolution: {integrity: sha512-vHcssMPwO08RTvj/c0iOBz90attxyG3wQJ0dTcyEQK43LRpcdLWZlV5feBhv6Isn6ahbQIzHbCgfa81+RiML0Q==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
-  '@oxc-resolver/binding-win32-arm64-msvc@11.20.0':
-    resolution: {integrity: sha512-qPi25YNPe4YenS8MgsQU2+bIFHxxpLx1LVna2444cEHqNPhNjvWf9zqj4aWE43H9LpAsTmkkAlA3eL5ElBU3mA==}
+  '@oxc-resolver/binding-win32-arm64-msvc@11.24.2':
+    resolution: {integrity: sha512-uokJqro2iBqkFvJdKQLP7d8/BUmFwESQFVmIJUQKj1Xn1a/LysJoe1vmeECLF5b3jsV8CAL5sEMJXX6SdK9Nhg==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxc-resolver/binding-win32-x64-msvc@11.20.0':
-    resolution: {integrity: sha512-Wb14jWEW8huH6It9F6sXd9vrYmIS7pMrgkU6sxpLxkP+9z+wRgs71hUEhRpcn8FOXAFa27FVWfY2tRpbfTzfLw==}
+  '@oxc-resolver/binding-win32-x64-msvc@11.24.2':
+    resolution: {integrity: sha512-UqGPmo56KDfLlfXFAFIrNflHT8tFxWGEivWg3Zeyp4Uy2NlKN1FGPr6/BxcLGG3+kZ6Wp14g5Uj+n71boqZfiw==}
     cpu: [x64]
     os: [win32]
 
-  '@parcel/watcher-android-arm64@2.5.6':
-    resolution: {integrity: sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==}
+  '@parcel/watcher-android-arm64@2.6.0':
+    resolution: {integrity: sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
 
-  '@parcel/watcher-darwin-arm64@2.5.6':
-    resolution: {integrity: sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==}
+  '@parcel/watcher-darwin-arm64@2.6.0':
+    resolution: {integrity: sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@parcel/watcher-darwin-x64@2.5.6':
-    resolution: {integrity: sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==}
+  '@parcel/watcher-darwin-x64@2.6.0':
+    resolution: {integrity: sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  '@parcel/watcher-freebsd-x64@2.5.6':
-    resolution: {integrity: sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==}
+  '@parcel/watcher-freebsd-x64@2.6.0':
+    resolution: {integrity: sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  '@parcel/watcher-linux-arm-glibc@2.5.6':
-    resolution: {integrity: sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==}
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
+    resolution: {integrity: sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@parcel/watcher-linux-arm-musl@2.5.6':
-    resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
+  '@parcel/watcher-linux-arm-musl@2.6.0':
+    resolution: {integrity: sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@parcel/watcher-linux-arm64-glibc@2.5.6':
-    resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
+  '@parcel/watcher-linux-arm64-glibc@2.6.0':
+    resolution: {integrity: sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@parcel/watcher-linux-arm64-musl@2.5.6':
-    resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
+  '@parcel/watcher-linux-arm64-musl@2.6.0':
+    resolution: {integrity: sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@parcel/watcher-linux-x64-glibc@2.5.6':
-    resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
+  '@parcel/watcher-linux-x64-glibc@2.6.0':
+    resolution: {integrity: sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@parcel/watcher-linux-x64-musl@2.5.6':
-    resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
+  '@parcel/watcher-linux-x64-musl@2.6.0':
+    resolution: {integrity: sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@parcel/watcher-win32-arm64@2.5.6':
-    resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
+  '@parcel/watcher-win32-arm64@2.6.0':
+    resolution: {integrity: sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@parcel/watcher-win32-ia32@2.5.6':
-    resolution: {integrity: sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@parcel/watcher-win32-x64@2.5.6':
-    resolution: {integrity: sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==}
+  '@parcel/watcher-win32-x64@2.6.0':
+    resolution: {integrity: sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
 
-  '@parcel/watcher@2.5.6':
-    resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
+  '@parcel/watcher@2.6.0':
+    resolution: {integrity: sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==}
     engines: {node: '>= 10.0.0'}
 
   '@penpot/svgo@https://codeload.github.com/penpot/svgo/tar.gz/65b3a645df9edbe3c00acf4267dd06c2ca736021':
@@ -1496,14 +1504,19 @@ packages:
     resolution: {gitHosted: true, integrity: sha512-BxcjiWGtCbGBT+dsOnEODk1jASZLNYp27BuGQaJR7fxU4gLws3251r90Sp9seubcpRhGrfRdsA5WU0ExRdPOgg==, tarball: https://codeload.github.com/penpot/ua-parser/tar.gz/90b970f39f2dc08378b975a0f01045b4ec8e89a4}
     version: 1.0.0
 
-  '@playwright/test@1.61.1':
-    resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==}
-    engines: {node: '>=18'}
+  '@playwright/test@1.62.1':
+    resolution: {integrity: sha512-DTcUc8qii+cpHvtOwggMtBRMjKZHXYWdw8syRYu2vtzuq4Wxphqq4NfCs5Zt44L6mA8rfDfj+PHnxFc/FeK6mQ==}
+    engines: {node: '>=20'}
     hasBin: true
 
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
 
+  '@react-types/shared@3.36.1':
+    resolution: {integrity: sha512-AzsuD9OfxTOZMMvTRhlN3oHBwOmFN7tDh27LzqmHt4+uOgPhJT7ZM7/kVs/8/o0WxayMUIk3hBmCFRHv1FUoag==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+
   '@resvg/resvg-js-android-arm-eabi@2.6.2':
     resolution: {integrity: sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA==}
     engines: {node: '>= 10'}
@@ -1584,97 +1597,96 @@ packages:
     resolution: {integrity: sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q==}
     engines: {node: '>= 10'}
 
-  '@rolldown/binding-android-arm64@1.1.3':
-    resolution: {integrity: sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==}
+  '@rolldown/binding-android-arm64@1.2.1':
+    resolution: {integrity: sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
-    resolution: {integrity: sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==}
+  '@rolldown/binding-darwin-arm64@1.2.1':
+    resolution: {integrity: sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.1.3':
-    resolution: {integrity: sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==}
+  '@rolldown/binding-darwin-x64@1.2.1':
+    resolution: {integrity: sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
-    resolution: {integrity: sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==}
+  '@rolldown/binding-freebsd-x64@1.2.1':
+    resolution: {integrity: sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
-    resolution: {integrity: sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.1':
+    resolution: {integrity: sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
-    resolution: {integrity: sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==}
+  '@rolldown/binding-linux-arm64-gnu@1.2.1':
+    resolution: {integrity: sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
-    resolution: {integrity: sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==}
+  '@rolldown/binding-linux-arm64-musl@1.2.1':
+    resolution: {integrity: sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
-    resolution: {integrity: sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==}
+  '@rolldown/binding-linux-ppc64-gnu@1.2.1':
+    resolution: {integrity: sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
-    resolution: {integrity: sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==}
+  '@rolldown/binding-linux-s390x-gnu@1.2.1':
+    resolution: {integrity: sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
-    resolution: {integrity: sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==}
+  '@rolldown/binding-linux-x64-gnu@1.2.1':
+    resolution: {integrity: sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
-    resolution: {integrity: sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==}
+  '@rolldown/binding-linux-x64-musl@1.2.1':
+    resolution: {integrity: sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
-    resolution: {integrity: sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==}
+  '@rolldown/binding-openharmony-arm64@1.2.1':
+    resolution: {integrity: sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
-    resolution: {integrity: sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [wasm32]
+  '@rolldown/binding-wasm32-wasi@1.2.1':
+    resolution: {integrity: sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
 
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
-    resolution: {integrity: sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==}
+  '@rolldown/binding-win32-arm64-msvc@1.2.1':
+    resolution: {integrity: sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
-    resolution: {integrity: sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==}
+  '@rolldown/binding-win32-x64-msvc@1.2.1':
+    resolution: {integrity: sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -1872,27 +1884,27 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@storybook/addon-docs@10.4.6':
-    resolution: {integrity: sha512-aWAfP5JMiT5a3zBJizwroCRzOCqZwDTJmvsYvwMD3ilIEa/kT1vhf6Xrbk4XIPhDwbh8Hpb/Gfnka1xBYEISWg==}
+  '@storybook/addon-docs@10.5.6':
+    resolution: {integrity: sha512-zyUJBrrpC9NTrmsREaVFNr+9WW6pikJtmRvo7GgZGqthEyhjQKSarHrW0aNWkwae2ep3jp1CZi8vIUVG1Dnp0w==}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.4.6
+      storybook: ^10.5.6
     peerDependenciesMeta:
       '@types/react':
         optional: true
 
-  '@storybook/addon-themes@10.4.6':
-    resolution: {integrity: sha512-80d622oB9xWZs3VH4uywkLOA5L2DAx04lVouvCM4XH+pLnJElidoylOLm3i3ByvlGkRjCbB27OUVsW94IgyDrw==}
+  '@storybook/addon-themes@10.5.6':
+    resolution: {integrity: sha512-fIzu2f6xPh/mtOBUU9TnjSoO3qUIF57AVES9HX4dfhjtbz9lWd+EhNd65nZfmTXxKsS32x/7/aXDTHtuP/ObwQ==}
     peerDependencies:
-      storybook: ^10.4.6
+      storybook: ^10.5.6
 
-  '@storybook/addon-vitest@10.4.6':
-    resolution: {integrity: sha512-VvskHge0GZy86LG6kcY5Ww34z8rDV8JBxqSdUpcJVsWfIvyX6MfAbqI76LlereSyBIJGZJZsqaLwRXsQoVY+0Q==}
+  '@storybook/addon-vitest@10.5.6':
+    resolution: {integrity: sha512-oxq7Qi4Vujc8Etoi1TZBurMs4RiKoGnvAOCXePOLglXSJMpy95gEb7iu/hvj8E21lV+vVtQYmFvj9Z7gJeMtdg==}
     peerDependencies:
       '@vitest/browser': ^3.0.0 || ^4.0.0
       '@vitest/browser-playwright': ^4.0.0
       '@vitest/runner': ^3.0.0 || ^4.0.0
-      storybook: ^10.4.6
+      storybook: ^10.5.6
       vitest: ^3.0.0 || ^4.0.0
     peerDependenciesMeta:
       '@vitest/browser':
@@ -1904,18 +1916,18 @@ packages:
       vitest:
         optional: true
 
-  '@storybook/builder-vite@10.4.6':
-    resolution: {integrity: sha512-BHBtD81HiXUiDQz/CaFynLtWmm7AFUQn8VnXuHipZ8KlnUANopa4yqdVuy/Gwz8ub254uFI5NMZsW/KlgWNgNg==}
+  '@storybook/builder-vite@10.5.6':
+    resolution: {integrity: sha512-Ts8EohKPj8okDPCkueeKVN+IRGNpI3LuddsFGupqraRvK6aRWawDKA28uc0PlsLCLWbMkMsGVw+IpFXfmoLJgQ==}
     peerDependencies:
-      storybook: ^10.4.6
+      storybook: ^10.5.6
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  '@storybook/csf-plugin@10.4.6':
-    resolution: {integrity: sha512-NILLxDqpA/JR/AazGWpsz+4fadJwRU4uhHephGtYpVOWnQA/DkJfKT6zpcJVq8+QA8A2zKMLX3GVKsXIrxjuDA==}
+  '@storybook/csf-plugin@10.5.6':
+    resolution: {integrity: sha512-PJLyOmcKe1OZDBw7RaGX/gjuiJuVfS5pVgc4W2RnHYOFpU6F5Bv9+9MqQwp0i7tWZBWc4fsCJudgVqwgjuTROA==}
     peerDependencies:
       esbuild: '*'
       rollup: '*'
-      storybook: ^10.4.6
+      storybook: ^10.5.6
       vite: '*'
       webpack: '*'
     peerDependenciesMeta:
@@ -1931,42 +1943,45 @@ packages:
   '@storybook/global@5.0.0':
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
 
-  '@storybook/icons@2.0.2':
-    resolution: {integrity: sha512-KZBCpXsshAIjczYNXR/rlxEtCUX/eAbpFNwKi8bcOomrLA4t/SyPz5RF+lVPO2oZBUE4sAkt43mfJUevQDSEEw==}
+  '@storybook/icons@2.1.0':
+    resolution: {integrity: sha512-Fxh9vYpX9bQqFeHRiY8h2ApeRGDzRSMLwJwNZ/AIRqnyOKHxRKL+yFe+ctEkVJmuptRE9u1Hrn8ZZNHyfDKKNg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@storybook/react-dom-shim@10.4.6':
-    resolution: {integrity: sha512-iGNmKzrq9vgl2PDrYAnZKI+yvac3Ym+lJXXuQaqlFRS23zA5MNm4EBX+rAG7WulqchoK6NaZ0KQOs2mAgEpTMg==}
+  '@storybook/react-dom-shim@10.5.6':
+    resolution: {integrity: sha512-dV3oOHc5ImggxEqeIiUj4vvnQO5SKScFtqAkxgIWLju1wiSZSIqQ5Q4Mp12Rhs9hQrjF039DueH7f2xJJZfvSw==}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       '@types/react-dom': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.4.6
+      storybook: ^10.5.6
     peerDependenciesMeta:
       '@types/react':
         optional: true
       '@types/react-dom':
         optional: true
 
-  '@storybook/react-vite@10.4.6':
-    resolution: {integrity: sha512-0arEQtybqGYXHbXpTot+Wv9YtG+V5Vp43QayXavPKQ20M8mpEzhyCPKd0EhqMGSC1Z1UEt0hm365WUBhI9LfKA==}
+  '@storybook/react-vite@10.5.6':
+    resolution: {integrity: sha512-DCTfNZWhQUH4Zf8LDE4zdLn6+C26QNW0KETdnFUkdrqRADlwS6oExtGWC5f/uP/GDbKb9jrGbC+/ap8nWEH/vQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.4.6
+      storybook: ^10.5.6
+      typescript: '>= 4.9.x'
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
-  '@storybook/react@10.4.6':
-    resolution: {integrity: sha512-9Y7YecrVFe1/01KYjfOLxVqTg2Aq+IO6TEv6sC2U0PfD0AWCSCmQ91QqgBpN/XW4aFFWoiZNinyXMUlU8zxy2w==}
+  '@storybook/react@10.5.6':
+    resolution: {integrity: sha512-dXSdNoc9yAvpa4hiegQhmZPXOKunAxkPX94DxvRw/kM6+wujVFAGlZjYygKrWw357KOjPRK7SO1LRTc70mgrhQ==}
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       '@types/react-dom': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.4.6
+      storybook: ^10.5.6
       typescript: '>= 4.9.x'
     peerDependenciesMeta:
       '@types/react':
@@ -1976,6 +1991,9 @@ packages:
       typescript:
         optional: true
 
+  '@swc/helpers@0.5.23':
+    resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==}
+
   '@testing-library/dom@10.4.1':
     resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
     engines: {node: '>=18'}
@@ -1999,8 +2017,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@testing-library/user-event@14.6.1':
-    resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==}
+  '@testing-library/user-event@14.6.3':
+    resolution: {integrity: sha512-6dBq67jT8lE+JTE8Exm02Kt6ze43hz1jdiSpSJwtTZiT1xQQ6b7nZYTTQ9njdArdU8XklOwaDp/AbT/eYSKF4g==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
@@ -2019,9 +2037,6 @@ packages:
   '@tokens-studio/types@0.5.2':
     resolution: {integrity: sha512-rzMcZP0bj2E5jaa7Fj0LGgYHysoCrbrxILVbT0ohsCUH5uCHY/u6J7Qw/TE0n6gR9Js/c9ZO9T8mOoz0HdLMbA==}
 
-  '@tybys/wasm-util@0.10.2':
-    resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}
-
   '@tybys/wasm-util@0.10.3':
     resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
 
@@ -2070,16 +2085,16 @@ packages:
   '@types/mdx@2.0.14':
     resolution: {integrity: sha512-T48PeuJtvLosNTPVhfnIp3i/n3a4g4Bad7YCq5k64D4u7NwDrAotikQ+5+sjtUvBmxCMlbo3dVL+C2dP0rWHzg==}
 
-  '@types/node@26.1.0':
-    resolution: {integrity: sha512-O0A1G3xPGy4w7AgQdAQYUlQ+BKk2Oovw8eRpofyp5KdBZULnbe+WqaOVNrm705SHphCiG4XHsACrSmPu1f+Kgw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
-  '@types/react-dom@19.2.3':
-    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
+  '@types/react-dom@19.2.4':
+    resolution: {integrity: sha512-Bsc+QHgp+P/F02XDzNCY9jnZNCUuLki36KT7VKrTXXLdHf+vHMNZnW1rVu5DNW/rCK+fya3DATySbLM4yhtKUw==}
     peerDependencies:
       '@types/react': ^19.2.0
 
-  '@types/react@19.2.17':
-    resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
+  '@types/react@19.2.18':
+    resolution: {integrity: sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==}
 
   '@types/resolve@1.20.6':
     resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}
@@ -2087,8 +2102,8 @@ packages:
   '@types/triple-beam@1.3.5':
     resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==}
 
-  '@vitejs/plugin-react@6.0.3':
-    resolution: {integrity: sha512-vmFvco5/QuC2f9Oj+wTk0+9XeDFkHxSamwZKYc7MxYwKICfvUvlMhqKI0VuICPltGqh1neqBKDvO4kes1ya8vg==}
+  '@vitejs/plugin-react@6.0.5':
+    resolution: {integrity: sha512-BOVzne/NL162sMdResB25mUv+vWMF5NoAjNf09TeGlE7ZpszZWSD3winycicLJw72yeVsoCn/2kOhEuCvEShMA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
       '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0
@@ -2100,22 +2115,22 @@ packages:
       babel-plugin-react-compiler:
         optional: true
 
-  '@vitest/browser-playwright@4.1.9':
-    resolution: {integrity: sha512-Bq1rOGf9waevzG3EOkO/dene6bvKTUsZMVg8S1i+WH3JcMjuXEjiahP9rAqZRELUqjBySOJsvvSWqK/B3wjKQw==}
+  '@vitest/browser-playwright@4.1.10':
+    resolution: {integrity: sha512-nMoXGEiRpT7m3W7NsbvrM2aKNwiNHZf+zEpUCvMteGjZFvfT96Q9fh7QyB98dvDWXiKvrLxA7bJ1mCOOv+JQPw==}
     peerDependencies:
-      playwright: '*'
-      vitest: 4.1.9
+      playwright: 1.62.1
+      vitest: 4.1.10
 
-  '@vitest/browser@4.1.9':
-    resolution: {integrity: sha512-j1BKtWmPcqpMhmx/L9EPLgAJpCb0zKfwoWLmqBbxaogCXHjOwHFSEoHCBfnGtx93xKQwilZ26m+UOsHqHMkRNg==}
+  '@vitest/browser@4.1.10':
+    resolution: {integrity: sha512-UDwuWGwXj646CBx/bQHOaJSX7np0I8JL/UKQYa1e4QrVHH8VdWtx8eaOuf8sy0ShwDgR6NjJAsp5eF6vjF6qng==}
     peerDependencies:
-      vitest: 4.1.9
+      vitest: 4.1.10
 
-  '@vitest/coverage-v8@4.1.9':
-    resolution: {integrity: sha512-G9/lgqibheLVBDRuya45EbsEXTYcWoSG+TLg7i2axuzx0Eq62eXn+aWXyaVdV5vKvFSWd6ywcX8hA7la9Pvu8g==}
+  '@vitest/coverage-v8@4.1.10':
+    resolution: {integrity: sha512-IM49HmthevbgAO4anp1hwtoT9wYe59w0LR00gr+eagHE+ZJ5lK4sLPeO0ubgoJcwLk6dehU3R24N+FbEEKDc8g==}
     peerDependencies:
-      '@vitest/browser': 4.1.9
-      vitest: 4.1.9
+      '@vitest/browser': 4.1.10
+      vitest: 4.1.10
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
@@ -2123,11 +2138,11 @@ packages:
   '@vitest/expect@3.2.4':
     resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
 
-  '@vitest/expect@4.1.9':
-    resolution: {integrity: sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==}
+  '@vitest/expect@4.1.10':
+    resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==}
 
-  '@vitest/mocker@4.1.9':
-    resolution: {integrity: sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==}
+  '@vitest/mocker@4.1.10':
+    resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2140,31 +2155,31 @@ packages:
   '@vitest/pretty-format@3.2.4':
     resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
 
-  '@vitest/pretty-format@4.1.9':
-    resolution: {integrity: sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==}
+  '@vitest/pretty-format@4.1.10':
+    resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==}
 
-  '@vitest/runner@4.1.9':
-    resolution: {integrity: sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==}
+  '@vitest/runner@4.1.10':
+    resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==}
 
-  '@vitest/snapshot@4.1.9':
-    resolution: {integrity: sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==}
+  '@vitest/snapshot@4.1.10':
+    resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==}
 
   '@vitest/spy@3.2.4':
     resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
 
-  '@vitest/spy@4.1.9':
-    resolution: {integrity: sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==}
+  '@vitest/spy@4.1.10':
+    resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==}
 
-  '@vitest/ui@4.1.9':
-    resolution: {integrity: sha512-U/cRvtqfEPj27FI1n9cyUvi4vXXdcLhjJiI+InYKdk8hP4VrS6RXOjGL7rfFaeBc37iRKANsR6eEzIoC7lmgBQ==}
+  '@vitest/ui@4.1.10':
+    resolution: {integrity: sha512-EOUqfXHTXtpSHsyLHH40ts3Ue+hRhSGwzwzMlK0dTEOLSDYyOXLyr5JDGmHQWhN2DYI30gw6dVx3cdgM9FZl+Q==}
     peerDependencies:
-      vitest: 4.1.9
+      vitest: 4.1.10
 
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
-  '@vitest/utils@4.1.9':
-    resolution: {integrity: sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==}
+  '@vitest/utils@4.1.10':
+    resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==}
 
   '@volar/language-core@2.4.28':
     resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
@@ -2174,6 +2189,11 @@ packages:
 
   '@volar/typescript@2.4.28':
     resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
   '@webcontainer/env@1.1.1':
     resolution: {integrity: sha512-6aN99yL695Hi9SuIk1oC88l9o0gmxL1nGWWQ/kNy81HigJ0FoaoTXpytCj6ItzgyCEwA9kF1wixsTuv5cjsgng==}
@@ -2182,8 +2202,8 @@ packages:
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
 
-  '@zip.js/zip.js@2.8.26':
-    resolution: {integrity: sha512-RQ4h9F6DOiHxpdocUDrOl6xBM+yOtz+LkUol47AVWcfebGBDpZ7w7Xvz9PS24JgXvLGiXXzSAfdCdVy1tPlaFA==}
+  '@zip.js/zip.js@2.8.34':
+    resolution: {integrity: sha512-+6a3lyqq69rpseLbvDPiVIWsZ/HdTGAAD6afFtug6ECPDGttb2dHnPC6cJgdPofYkzL9OvXizegq+DQVfL2rnA==}
     engines: {bun: '>=0.7.0', deno: '>=1.0.0', node: '>=18.0.0'}
 
   abbrev@5.0.0:
@@ -2199,8 +2219,8 @@ packages:
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  acorn@8.17.0:
-    resolution: {integrity: sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==}
+  acorn@8.18.0:
+    resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -2267,6 +2287,10 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  aria-hidden@1.2.6:
+    resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
+    engines: {node: '>=10'}
+
   aria-query@5.3.0:
     resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
 
@@ -2329,8 +2353,8 @@ packages:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
     engines: {node: '>=4'}
 
-  ast-v8-to-istanbul@1.0.3:
-    resolution: {integrity: sha512-jCMQ6ZylLPudp0CDfBmQBZUsrh1/8psbmu9ibeVWKuHWD0YrH9YABwlKu5kVEFoT0GCQQW9Z/SxfuEbbkGQCRg==}
+  ast-v8-to-istanbul@1.0.5:
+    resolution: {integrity: sha512-UPAgKJFSEGMWSDr3LX4tqnAb4f7KGT8O40Tyx8wbYmmZ/yn58lNCm8h3svs3eXgiGd5AXxz8NDOvXWvicq+rJA==}
 
   astral-regex@2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
@@ -2346,8 +2370,8 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  autoprefixer@10.5.2:
-    resolution: {integrity: sha512-rD5t5DwOjJdmSORcTq64j8MawTC+tbQ+HHqjR4NDumamy/ambn1UJrlKL+KdwujWxMkFjPM3pPHOEA9tl4767Q==}
+  autoprefixer@10.5.4:
+    resolution: {integrity: sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
@@ -2361,8 +2385,8 @@ packages:
     resolution: {integrity: sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==}
     engines: {node: '>=4'}
 
-  axios@1.16.1:
-    resolution: {integrity: sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==}
+  axios@1.19.0:
+    resolution: {integrity: sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==}
 
   axobject-query@4.1.0:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
@@ -2381,8 +2405,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.40:
-    resolution: {integrity: sha512-BSSLZ9/Cjjv7Gtj5B68ZzXcXUg8iOf3fme+FCuh8rC/Go+Kmh8cox7M3A8dolou16s64QjLPOSdngh7GxXvkSw==}
+  baseline-browser-mapping@2.11.8:
+    resolution: {integrity: sha512-zAgkquC2WYF0PIc6XbNYkA2uuxxFavzgmX61R+dHDUa558V8Ejf8ozTZFR6QzM24RWu4kBcRkhJ5kpz77j9fnQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -2399,8 +2423,8 @@ packages:
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
-  body-parser@2.2.2:
-    resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
+  body-parser@2.3.0:
+    resolution: {integrity: sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==}
     engines: {node: '>=18'}
 
   boolbase@1.0.0:
@@ -2410,19 +2434,19 @@ packages:
     resolution: {integrity: sha512-DkVaaQHymRhpYEYo9x1oo7Q7B0Y6KJUsjm3c9eTyFDby4MHLBTwZ6ZDWBel5zrYxj1WsZgC5oLpiz+93MluXeA==}
     engines: {node: '>=20.19.0'}
 
-  brace-expansion@1.1.15:
-    resolution: {integrity: sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==}
+  brace-expansion@1.1.18:
+    resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==}
 
-  brace-expansion@5.0.7:
-    resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.28.4:
-    resolution: {integrity: sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==}
+  browserslist@4.28.7:
+    resolution: {integrity: sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -2443,8 +2467,8 @@ packages:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
 
-  cacheable@2.3.5:
-    resolution: {integrity: sha512-EQfaKe09tl615iNvq/TBRWTFf1AKJNXYQSsMx0Z3EI0nA+pVsVPS8wJhnRlkbdacKPh1d0qVIhwTc2zsQNFEEg==}
+  cacheable@2.5.0:
+    resolution: {integrity: sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==}
 
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
@@ -2462,11 +2486,8 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  caniuse-lite@1.0.30001799:
-    resolution: {integrity: sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==}
-
-  caniuse-lite@1.0.30001800:
-    resolution: {integrity: sha512-MMHtuAz9Ys840zAY5F4k6fV5GaivZ9sPk+nz0mY+GYVzRBnYkN0mpqkSR92oWRQ19yQWo4HvBV/FnC16AJX8MA==}
+  caniuse-lite@1.0.30001806:
+    resolution: {integrity: sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==}
 
   canvas@3.2.3:
     resolution: {integrity: sha512-PzE5nJZPz72YUAfo8oTp0u3fqqY7IzlTubneAihqDYAUcBk7ryeCmBbdJBEdaH0bptSOe2VT2Zwcb3UaFyaSWw==}
@@ -2514,6 +2535,9 @@ packages:
     resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==}
     engines: {node: '>= 4.0'}
 
+  client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -2540,6 +2564,10 @@ packages:
     resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
     engines: {node: '>=6'}
 
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
   color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
 
@@ -2613,8 +2641,8 @@ packages:
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  concurrently@10.0.3:
-    resolution: {integrity: sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==}
+  concurrently@10.0.4:
+    resolution: {integrity: sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==}
     engines: {node: '>=22'}
     hasBin: true
 
@@ -2635,6 +2663,10 @@ packages:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
 
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
+
   convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
@@ -2886,8 +2918,8 @@ packages:
     resolution: {integrity: sha512-qI4JLRKnSzqFqr7hAlS5xQDusBCjKSEG4t4+7aNrIQMHBcsC2TGEhuyABJdYkgSewL57PNLYEiibY2iPKhKpaA==}
     engines: {node: '>=20.19.0'}
 
-  draft-js@https://codeload.github.com/penpot/draft-js/tar.gz/ba3b26ed63a01227a3560e440531b69d79c03f35:
-    resolution: {gitHosted: true, integrity: sha512-IN2r8sw36jcH32WPP9eBFXNglirhkFIsqgoKzwwSDxiCbeipumeKXjYB3vw82CxYRwKc+oRTMcZ5jNnCWnmnBw==, tarball: https://codeload.github.com/penpot/draft-js/tar.gz/ba3b26ed63a01227a3560e440531b69d79c03f35}
+  draft-js@https://codeload.github.com/penpot/draft-js/tar.gz/c58ebd9429a6359d72a88cff87e078aaf6fe285d:
+    resolution: {gitHosted: true, integrity: sha512-Ji/UoFEm11scM7Zbp1O+7f498Ly5zkGRCJNvxR8BRL0xhqEs1ubgckZdmopjNxi+xjepHopa5hIv9pJTRaQOgg==, tarball: https://codeload.github.com/penpot/draft-js/tar.gz/c58ebd9429a6359d72a88cff87e078aaf6fe285d}
     version: 0.11.7
     peerDependencies:
       react: '>=0.14.0'
@@ -2905,8 +2937,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.382:
-    resolution: {integrity: sha512-8ETaWbV6SZOrno+G93Ffd9ENsMtetqdnqj4nlfxFW90Sm5GgnuV28Kf62hqQVD6VUgzm7qFQKsTsAPmeUiU3Ug==}
+  electron-to-chromium@1.5.399:
+    resolution: {integrity: sha512-lEcqhErbHjXRvd41rnWLpzbyU/IXfIYo7QwaFWmxGeLiLyY2TBCdHnWY88vB+p3ubnihRypDm66panXl7TylLA==}
 
   emoji-regex@10.6.0:
     resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
@@ -2964,8 +2996,8 @@ packages:
     resolution: {integrity: sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==}
     engines: {node: '>= 0.4'}
 
-  es-module-lexer@2.1.0:
-    resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==}
+  es-module-lexer@2.3.1:
+    resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==}
 
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
@@ -3124,8 +3156,8 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
-  expect-type@1.3.0:
-    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
+  expect-type@1.4.0:
+    resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==}
     engines: {node: '>=12.0.0'}
 
   expr-eval-fork@3.0.3:
@@ -3156,8 +3188,8 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-uri@3.1.3:
-    resolution: {integrity: sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==}
+  fast-uri@3.1.5:
+    resolution: {integrity: sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==}
 
   fastest-levenshtein@1.0.16:
     resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
@@ -3187,8 +3219,8 @@ packages:
   fflate@0.8.3:
     resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==}
 
-  file-entry-cache@11.1.3:
-    resolution: {integrity: sha512-oMbq0PD6VIiIwMF6LIa7MEwd/l9huKwmqRKXqmrkqIZv8CvRbfowL+L0ryAl8h//HfAS0zS+4SbYoRyAoA6BJA==}
+  file-entry-cache@11.1.5:
+    resolution: {integrity: sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==}
 
   file-entry-cache@8.0.0:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
@@ -3210,11 +3242,11 @@ packages:
     resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
     engines: {node: '>=16'}
 
-  flat-cache@6.1.22:
-    resolution: {integrity: sha512-N2dnzVJIphnNsjHcrxGW7DePckJ6haPrSFqpsBUhHYgwtKGVq4JrBGielEGD2fCVnsGm1zlBVZ8wGhkyuetgug==}
+  flat-cache@6.1.23:
+    resolution: {integrity: sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==}
 
-  flatted@3.4.2:
-    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+  flatted@3.4.4:
+    resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==}
 
   fn.name@1.1.0:
     resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}
@@ -3311,8 +3343,8 @@ packages:
   getopts@2.3.0:
     resolution: {integrity: sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA==}
 
-  gettext-parser@9.0.2:
-    resolution: {integrity: sha512-dGvq3S1gpS6e9KzNkwgPED5xxfWk7mNYzzdi/fPdJF5qS7B+yo8El2ZQyyhJ79PyzTtHbwiqYOFsqBdzbQ0GPg==}
+  gettext-parser@9.1.1:
+    resolution: {integrity: sha512-ZLeqWPz9OMNrTgMuww0C22kkcNqis+e4059R94t7L7ERlZ2rUNpiDbaAUus+esBC6uBAQWbS9N+R5vJIJg//lw==}
     engines: {node: '>=20'}
 
   github-from-package@0.0.0:
@@ -3356,8 +3388,8 @@ packages:
     resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
     engines: {node: '>= 0.4'}
 
-  globby@16.2.0:
-    resolution: {integrity: sha512-QrJia2qDf5BB/V6HYlDTs0I0lBahyjLzpGQg3KT7FnCdTonAyPy2RtY802m2k4ALx6Dp752f82WsOczEVr3l6Q==}
+  globby@16.2.2:
+    resolution: {integrity: sha512-NLvV9ubZ6NDsJaOpKPy3cQeJpKi9DcWiyCiFUpJPA0YihRqiE6RWaLUmgNNPr8MgPpLZjnBjSmou7uZBRJv9wA==}
     engines: {node: '>=20'}
 
   globjoin@0.1.4:
@@ -3475,8 +3507,8 @@ packages:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
 
-  ignore@7.0.5:
-    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+  ignore@7.0.6:
+    resolution: {integrity: sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==}
     engines: {node: '>= 4'}
 
   immutable@3.8.3:
@@ -3712,8 +3744,8 @@ packages:
   jju@1.4.0:
     resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
 
-  joi@18.2.1:
-    resolution: {integrity: sha512-2/OKlogiESf2Nh3TFCrRjrr9z1DRHeW0I+KReF67+4J0Ns+8hBtHRmoWAZ2OFU6I5+TWLEe6sVlSdXPjHm5UbQ==}
+  joi@18.2.3:
+    resolution: {integrity: sha512-N5A3KTWQpPWT4ExxxPlUx7WmykGXRzhNidWhV41d6Abu9YfI2NyWCJuxdPnslJCPWtbRpSVOWSnSS6GakLM/Rg==}
     engines: {node: '>= 20'}
 
   js-beautify@2.0.3:
@@ -3730,19 +3762,15 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  js-yaml@4.2.0:
-    resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
-    hasBin: true
-
   js-yaml@4.3.0:
     resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
     hasBin: true
 
-  jsdom@29.1.1:
-    resolution: {integrity: sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
+  jsdom@30.0.1:
+    resolution: {integrity: sha512-52v7mUVUfNQVYYqE1lcdaymWL0njO7lTLUog6ZvW2U5KsbiLk/GnZlVJ+qx0xfNJZ6Gn+KSpPNE52vurbxZwrA==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      canvas: ^3.0.0
+      canvas: ^3.2.3
     peerDependenciesMeta:
       canvas:
         optional: true
@@ -3779,6 +3807,9 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  jsonc-parser@3.3.1:
+    resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
+
   jsonfile@6.2.1:
     resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==}
 
@@ -3816,78 +3847,78 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
-  lightningcss-android-arm64@1.32.0:
-    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+  lightningcss-android-arm64@1.33.0:
+    resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [android]
 
-  lightningcss-darwin-arm64@1.32.0:
-    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
+  lightningcss-darwin-arm64@1.33.0:
+    resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.32.0:
-    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
+  lightningcss-darwin-x64@1.33.0:
+    resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-freebsd-x64@1.32.0:
-    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+  lightningcss-freebsd-x64@1.33.0:
+    resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
-    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+  lightningcss-linux-arm-gnueabihf@1.33.0:
+    resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.32.0:
-    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+  lightningcss-linux-arm64-gnu@1.33.0:
+    resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-arm64-musl@1.32.0:
-    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
+  lightningcss-linux-arm64-musl@1.33.0:
+    resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-linux-x64-gnu@1.32.0:
-    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+  lightningcss-linux-x64-gnu@1.33.0:
+    resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-x64-musl@1.32.0:
-    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
+  lightningcss-linux-x64-musl@1.33.0:
+    resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-win32-arm64-msvc@1.32.0:
-    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+  lightningcss-win32-arm64-msvc@1.33.0:
+    resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.32.0:
-    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+  lightningcss-win32-x64-msvc@1.33.0:
+    resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.32.0:
-    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+  lightningcss@1.33.0:
+    resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
     engines: {node: '>= 12.0.0'}
 
   lines-and-columns@1.2.4:
@@ -3938,8 +3969,8 @@ packages:
   loupe@3.2.1:
     resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
 
-  lru-cache@11.5.1:
-    resolution: {integrity: sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==}
+  lru-cache@11.5.2:
+    resolution: {integrity: sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==}
     engines: {node: 20 || >=22}
 
   lru-cache@5.1.1:
@@ -3956,8 +3987,8 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  magicast@0.5.3:
-    resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==}
+  magicast@0.5.4:
+    resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==}
 
   make-dir@4.0.0:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
@@ -3966,8 +3997,8 @@ packages:
   map-stream@0.0.7:
     resolution: {integrity: sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==}
 
-  marked@18.0.5:
-    resolution: {integrity: sha512-S6GcvALHg6K4ohtu4E7x0a1AqhAjp6cV8KhLSyN9qVapnzJkusVBxZRcIU9AeYsbe6P1hKDusSbEOzGyyuce6w==}
+  marked@18.0.9:
+    resolution: {integrity: sha512-/Sa4qiiHZxf0/FQdBBowr9q4r10krCwMvpK48FUBdXdUXScDxiQGR9zCPrFgRVR5LU3iySOiIjy09ZQvADir1w==}
     engines: {node: '>= 20'}
     hasBin: true
 
@@ -3991,8 +4022,8 @@ packages:
     resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
     engines: {node: '>= 0.8'}
 
-  memfs@4.57.6:
-    resolution: {integrity: sha512-WQK+DGjKCnPdpSyJUXphz+COF2uEhhsxQ3VIWBSbzpbbXuch3h4FePMqXrXGdLjsTgo4JFzBFsP6AWd9pVazGw==}
+  memfs@4.64.0:
+    resolution: {integrity: sha512-Kw72fgY7Wn+sD8KmtNWSafl1dz0UvAsE/PHs3YVfLiaZuA3HxNm9sRLqAu0ATiBGJvME1PxZXbBZPv5GycDeAw==}
     peerDependencies:
       tslib: '2'
 
@@ -4079,8 +4110,8 @@ packages:
     resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==}
     hasBin: true
 
-  nanoid@3.3.12:
-    resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==}
+  nanoid@3.3.16:
+    resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -4117,8 +4148,8 @@ packages:
       encoding:
         optional: true
 
-  node-releases@2.0.50:
-    resolution: {integrity: sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==}
+  node-releases@2.0.51:
+    resolution: {integrity: sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==}
     engines: {node: '>=18'}
 
   nodemon@3.1.14:
@@ -4186,8 +4217,8 @@ packages:
     resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
     engines: {node: '>= 0.4'}
 
-  obug@2.1.3:
-    resolution: {integrity: sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==}
+  obug@2.1.4:
+    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
     engines: {node: '>=12.20.0'}
 
   on-finished@2.4.1:
@@ -4224,15 +4255,15 @@ packages:
     resolution: {integrity: sha512-bkgD4qHlN7WxLdX8bLXdaU54TtQtAIg/ZBAfm0aje/mo3MRDo3P0hZSgr4U7O3xfX+fQmR5AP04JS/TGcZLcFA==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
-  oxc-resolver@11.20.0:
-    resolution: {integrity: sha512-CblytBiV/a/ZXY34dsVU2NxhIOxMXst8CvDCtyBelVITgd7PLrKzbEbA6oKLdPjvDKDzCiW48qzmzZ+mYaqn+g==}
+  oxc-resolver@11.24.2:
+    resolution: {integrity: sha512-FY91FiDBj7ls5MsFS9jN3tjz2o0/zsdSsymlakySaBwVJZorHhkWyICLZMKxlu1R9vYo+sd3z1jwb4J8x7bNDw==}
 
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
 
-  p-limit@7.3.0:
-    resolution: {integrity: sha512-7cIXg/Z0M5WZRblrsOla88S4wAK+zOQQWeBYfV3qJuJXMr+LnbYjaadrFaS0JILfEDPVqHyKnZ1Z/1d6J9VVUw==}
+  p-limit@7.3.1:
+    resolution: {integrity: sha512-0trZaiG7Y7kN/Egy9a8j47t9osC0Tch4PaIWd9yGF6bvmlk7muExRvGNYb8sXBwEKMoNKsbNN9P8EefuQekE4Q==}
     engines: {node: '>=20'}
 
   p-locate@5.0.0:
@@ -4317,8 +4348,8 @@ packages:
     resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
     engines: {node: '>=8.6'}
 
-  picomatch@4.0.4:
-    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
     engines: {node: '>=12'}
 
   pidtree@0.3.1:
@@ -4336,14 +4367,14 @@ packages:
   pkg-types@2.3.1:
     resolution: {integrity: sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==}
 
-  playwright-core@1.61.1:
-    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.1:
+    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.61.1:
-    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
-    engines: {node: '>=18'}
+  playwright@1.62.1:
+    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+    engines: {node: '>=20'}
     hasBin: true
 
   pngjs@7.0.0:
@@ -4389,8 +4420,8 @@ packages:
     peerDependencies:
       postcss: ^8.5.10
 
-  postcss-modules@9.0.0:
-    resolution: {integrity: sha512-nyZGaOkHFRvXy10ryKSE3yfh1EhwSrEX2mIhwZblTTdHbKOfH5fNhAC6eZmXB2uCy7x6Bb1Zib5KS2Yw6gSzHQ==}
+  postcss-modules@9.0.1:
+    resolution: {integrity: sha512-BrSXxWSls23TzqMuplpeMRL5VHnDOLh2H9EiHNTMIdLBFumJcurDIi47TBuvkn9GsoTLAoPjv2wLzAt1wdQ2aQ==}
     engines: {node: '>=20.6'}
     peerDependencies:
       postcss: ^8.5.10
@@ -4410,10 +4441,6 @@ packages:
     peerDependencies:
       postcss: ^8.5.10
 
-  postcss-selector-parser@7.1.1:
-    resolution: {integrity: sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==}
-    engines: {node: '>=4'}
-
   postcss-selector-parser@7.1.4:
     resolution: {integrity: sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==}
     engines: {node: '>=4'}
@@ -4424,8 +4451,8 @@ packages:
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  postcss@8.5.16:
-    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
+  postcss@8.5.25:
+    resolution: {integrity: sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==}
     engines: {node: ^10 || ^12 || >=14}
 
   prebuild-install@7.1.3:
@@ -4438,8 +4465,8 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.9.4:
-    resolution: {integrity: sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==}
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -4501,8 +4528,8 @@ packages:
     resolution: {integrity: sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==}
     engines: {node: '>=20'}
 
-  qs@6.15.2:
-    resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==}
+  qs@6.15.3:
+    resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}
     engines: {node: '>=0.6'}
 
   quansync@0.2.11:
@@ -4526,6 +4553,18 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
+  react-aria-components@1.20.0:
+    resolution: {integrity: sha512-BMbpIgoV9aELeBrB0Y120NgoigHb5OdcJwc+4e7uSnbTbamea6lo+gqcc4LAxzMaK3Jf+7LI1oCDE6yANsmxIQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+
+  react-aria@3.51.0:
+    resolution: {integrity: sha512-AyWLw0XR38cFPwBu/ErgGaVrc5dupLEKmRlMXTGvFKOtbaGRQ2+yQJkjVhpdHhoRhU4+G+tJDFeHDTS8tK3bfQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+
   react-compiler-runtime@1.0.0:
     resolution: {integrity: sha512-rRfjYv66HlG8896yPUDONgKzG5BxZD1nV9U6rkm+7VCuvQc903C4MjcoZR4zPw53IKSOX9wMQVpA1IAbRtzQ7w==}
     peerDependencies:
@@ -4540,10 +4579,10 @@ packages:
     resolution: {integrity: sha512-aEZ9qP+/M+58x2qgfSFEWH1BxLyHe5+qkLNJOZQb5iGS017jpbRnoKhNRrXPeA6RfBrZO5wZrT9DMC1UqE1f1w==}
     engines: {node: ^20.9.0 || >=22}
 
-  react-dom@19.2.7:
-    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
+  react-dom@19.2.8:
+    resolution: {integrity: sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==}
     peerDependencies:
-      react: ^19.2.7
+      react: ^19.2.8
 
   react-error-boundary@6.1.2:
     resolution: {integrity: sha512-3DpCr5HVdZ0caUjYE/kIHBEJN0mNP3ZCgf16c48uJ5TbWjorKVp+YG8W3XqlJ7vJAVNw6wNIImyPXmFydwmyng==}
@@ -4559,14 +4598,19 @@ packages:
   react-lifecycles-compat@3.0.4:
     resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
 
+  react-stately@3.49.0:
+    resolution: {integrity: sha512-13iNq2KzBrRAzxRc+n53hgROfIistiYY/sPtIhCw1qUB7/kmo+X1xEU2uiS5zcCIrc55AUPwoHqOIIpKWSwB9A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+
   react-virtualized@9.22.6:
     resolution: {integrity: sha512-U5j7KuUQt3AaMatlMJ0UJddqSiX+Km0YJxSqbAzIiGw5EmNz0khMyqP2hzgu4+QUtm+QPIrxzUX4raJxmVJnHg==}
     peerDependencies:
       react: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  react@19.2.7:
-    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
+  react@19.2.8:
+    resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==}
     engines: {node: '>=0.10.0'}
 
   read-pkg@3.0.0:
@@ -4592,8 +4636,8 @@ packages:
     resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==}
     engines: {node: '>= 0.8.0'}
 
-  recast@0.23.11:
-    resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==}
+  recast@0.23.19:
+    resolution: {integrity: sha512-T98lym7kH+pnZmRaD8yDRdaNqyUbwnbEBx0MuchrzMFOEMray4AO3ZJoTUZ5r78Ao78X/OhzW0DL8GB85w/I2w==}
     engines: {node: '>= 4'}
 
   redent@3.0.0:
@@ -4645,8 +4689,8 @@ packages:
     engines: {node: 20 || >=22}
     hasBin: true
 
-  rolldown@1.1.3:
-    resolution: {integrity: sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==}
+  rolldown@1.2.1:
+    resolution: {integrity: sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -4819,13 +4863,13 @@ packages:
     engines: {node: '>=20.19.0'}
     hasBin: true
 
-  sass@1.101.0:
-    resolution: {integrity: sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw==}
+  sass@1.102.0:
+    resolution: {integrity: sha512-NSOyTnaQF7rTAEOtI2fwb386vL+akyiQLBZu8Na7hXCb+umJy0GAqlcMIaqACZ6Z1VgTBS4K9PG6B3IdjHGJsw==}
     engines: {node: '>=20.19.0'}
     hasBin: true
 
-  sax@1.6.0:
-    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
+  sax@1.6.1:
+    resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==}
     engines: {node: '>=11.0.0'}
 
   saxes@6.0.0:
@@ -4848,11 +4892,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.8.4:
-    resolution: {integrity: sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.8.5:
     resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
     engines: {node: '>=10'}
@@ -4900,12 +4939,12 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shell-quote@1.8.4:
-    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
+  shell-quote@1.9.0:
+    resolution: {integrity: sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==}
     engines: {node: '>= 0.4'}
 
-  side-channel-list@1.0.0:
-    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+  side-channel-list@1.0.1:
+    resolution: {integrity: sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==}
     engines: {node: '>= 0.4'}
 
   side-channel-map@1.0.1:
@@ -4916,8 +4955,8 @@ packages:
     resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
     engines: {node: '>= 0.4'}
 
-  side-channel@1.1.0:
-    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
     engines: {node: '>= 0.4'}
 
   siginfo@2.0.0:
@@ -4989,20 +5028,20 @@ packages:
     resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
     engines: {node: '>= 0.8'}
 
-  std-env@4.1.0:
-    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
+  std-env@4.2.0:
+    resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
 
   stop-iteration-iterator@1.1.0:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
 
-  storybook@10.4.6:
-    resolution: {integrity: sha512-6wkA6LxfDSSilloITsrFOJfsnw0mDUP2h8Ls+lRt8oRsudtz2RWFhLv+Toiwg6NW7hUpdTDc2hzR7DztJid6+A==}
+  storybook@10.5.6:
+    resolution: {integrity: sha512-VhYwqxPySa24CVXKoWD6gCZXx9//DTmo43YpusGuAoHDYj5Osjt8wuBRQVeGoaLUWnHiPWv8S+GYHrJEaBM6Rg==}
     hasBin: true
     peerDependencies:
       '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       prettier: ^2 || ^3
-      vite-plus: ^0.1.15
+      vite-plus: ^0.1.15 || ^0.2.0
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -5029,8 +5068,8 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
-  string-width@8.2.1:
-    resolution: {integrity: sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==}
+  string-width@8.2.2:
+    resolution: {integrity: sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==}
     engines: {node: '>=20'}
 
   string.prototype.includes@2.0.1:
@@ -5097,8 +5136,8 @@ packages:
   stubborn-fs@1.2.5:
     resolution: {integrity: sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==}
 
-  style-dictionary@5.4.4:
-    resolution: {integrity: sha512-Sd7dkEOLn33EpvlMyS8ykUu0us2EIFUqsysf4DSwZQ46nqQkZ2Q9o5mozu8cSizj3t7E220HaPk7EV1O7LjvDQ==}
+  style-dictionary@5.5.0:
+    resolution: {integrity: sha512-AGkOZtAc3OTz99wlzstrmj5OM5BWOW2IbmXD74sf0MXFPi271TGBdywokgd7bS3L0tKOk9M0FR+R9gnbXRSSfg==}
     engines: {node: '>=22.0.0'}
     hasBin: true
 
@@ -5145,8 +5184,8 @@ packages:
     peerDependencies:
       stylelint: ^16.8.2 || ^17.0.0
 
-  stylelint@17.14.0:
-    resolution: {integrity: sha512-8xkHPpdqYryeIsOgfsYTmr6cIeC4nLYWk5S8BPxpodq8mIuepggkMljsHewWfuAjj/+qpRKou2QerhjMH3iasg==}
+  stylelint@17.14.1:
+    resolution: {integrity: sha512-xVQwyiuxALUBNB2fBe0tmNemg9KqLtdj3T64mioFDar79B2cU8LIyz+3KL6LdiHs9NkeNfwxpKSaIVOY8f112g==}
     engines: {node: '>=20.19.0'}
     hasBin: true
 
@@ -5166,8 +5205,8 @@ packages:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
 
-  supports-hyperlinks@4.4.0:
-    resolution: {integrity: sha512-UKbpT93hN5Nr9go5UY7bopIB9YQlMz9nm/ct4IXt/irb5YRkn9WaqrOBJGZ5Pwvsd5FQzSVeYlGdXoCAPQZrPg==}
+  supports-hyperlinks@4.5.0:
+    resolution: {integrity: sha512-ZW2OvfeCXrNTbLakPUzjQG922EeGCOteFSVoek5DKStTh898wf7zgtuFlzQN8HfZCxC3Eh02yJVrRW51hADf+w==}
     engines: {node: '>=20'}
 
   supports-preserve-symlinks-flag@1.0.0:
@@ -5182,8 +5221,8 @@ packages:
   svg-tags@1.0.0:
     resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
 
-  svgo@2.8.2:
-    resolution: {integrity: sha512-TyzE4NVGLUFy+H/Uy4N6c3G0HEeprsVfge6Lmq+0FdQQ/zqoVYB62IsBZORsiL+o96s6ff/V6/3UQo/C0cgCAA==}
+  svgo@2.8.3:
+    resolution: {integrity: sha512-5EZD0pafXX6PphdwOGCiVLDSaV1xyuQao2blHajHLsPxr07q4mmEjdtXEWgG07ae2mIz8Ex2CDXNCTiXhy3Khw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
 
@@ -5215,8 +5254,8 @@ packages:
   text-hex@1.0.0:
     resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==}
 
-  thingies@2.6.0:
-    resolution: {integrity: sha512-rMHRjmlFLM1R96UYPvpmnc3LYtdFrT33JIB7L9hetGue1qAPfn1N2LJeEjxUSidu1Iku+haLZXDuEXUHNGO/lg==}
+  thingies@2.6.1:
+    resolution: {integrity: sha512-cV/CMGTK3M4MlnJ/0At6ismOw/A0EEniDNScajjz/Br3c1sqE72YD01rGpPTKwd27wAxI5Pr+6+0w8yofzFRYw==}
     engines: {node: '>=10.18'}
     peerDependencies:
       tslib: ^2
@@ -5233,8 +5272,8 @@ packages:
   tinycolor2@1.6.0:
     resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
 
-  tinyexec@1.0.2:
-    resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
+  tinyexec@1.2.4:
+    resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
     engines: {node: '>=18'}
 
   tinyglobby@0.2.17:
@@ -5245,19 +5284,19 @@ packages:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
 
-  tinyrainbow@3.1.0:
-    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
+  tinyrainbow@3.1.1:
+    resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==}
     engines: {node: '>=14.0.0'}
 
   tinyspy@4.0.4:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
 
-  tldts-core@7.0.22:
-    resolution: {integrity: sha512-KgbTDC5wzlL6j/x6np6wCnDSMUq4kucHNm00KXPbfNzmllCmtmvtykJHfmgdHntwIeupW04y8s1N/43S1PkQDw==}
+  tldts-core@7.4.10:
+    resolution: {integrity: sha512-KnQjp53ZekKgm/r3l+u8kJGGzYgrWdP8+Mql7a4vijh2WE0IrZWspQj/TpTxDho/YxO+AnOZnIjQcCD+q6iJsw==}
 
-  tldts@7.0.22:
-    resolution: {integrity: sha512-nqpKFC53CgopKPjT6Wfb6tpIcZXHcI6G37hesvikhx0EmUGPkZrujRyAjgnmp1SHNgpQfKVanZ+KfpANFt2Hxw==}
+  tldts@7.4.10:
+    resolution: {integrity: sha512-GgouD1B+sWwvkaEq8vXC15DjQitxbvs12oIXELpconwm+Tg3zfcEv4jgzq3vtKverDXsg3VI8aRgNL2Nra0Iog==}
     hasBin: true
 
   to-regex-range@5.0.1:
@@ -5276,8 +5315,8 @@ packages:
     resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
     hasBin: true
 
-  tough-cookie@6.0.1:
-    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+  tough-cookie@6.0.2:
+    resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==}
     engines: {node: '>=16'}
 
   tr46@0.0.3:
@@ -5326,6 +5365,10 @@ packages:
     resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==}
     engines: {node: '>= 0.6'}
 
+  type-is@2.1.0:
+    resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==}
+    engines: {node: '>= 18'}
+
   typed-array-buffer@1.0.3:
     resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
@@ -5369,9 +5412,9 @@ packages:
   undici-types@8.3.0:
     resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==}
 
-  undici@7.28.0:
-    resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}
-    engines: {node: '>=20.18.1'}
+  undici@8.9.0:
+    resolution: {integrity: sha512-aWZpUj7XoGonMClx4gdDRfgBjqeA+F473aDmROQQbM9n6PRfK/u1q/a0X4wMTgcHfT8H6fpbt98PFuDUwFg2YA==}
+    engines: {node: '>=22.19.0'}
 
   unicorn-magic@0.4.0:
     resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==}
@@ -5474,13 +5517,13 @@ packages:
       vite:
         optional: true
 
-  vite@8.1.2:
-    resolution: {integrity: sha512-6YYPbRXTxx6bRXmOn7XdnQAy5DQNHhDgtjhDHI13oe4pY93kkcdGJWxpGwOm++/Wh0QpQhDrpIoVMrmrsI5AGQ==}
+  vite@8.2.0:
+    resolution: {integrity: sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.3.0
+      '@vitejs/devtools': ^0.4.0
       esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -5517,20 +5560,20 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.1.9:
-    resolution: {integrity: sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==}
+  vitest@4.1.10:
+    resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.9
-      '@vitest/browser-preview': 4.1.9
-      '@vitest/browser-webdriverio': 4.1.9
-      '@vitest/coverage-istanbul': 4.1.9
-      '@vitest/coverage-v8': 4.1.9
-      '@vitest/ui': 4.1.9
+      '@vitest/browser-playwright': 4.1.10
+      '@vitest/browser-preview': 4.1.10
+      '@vitest/browser-webdriverio': 4.1.10
+      '@vitest/coverage-istanbul': 4.1.10
+      '@vitest/coverage-v8': 4.1.10
+      '@vitest/ui': 4.1.10
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -5565,8 +5608,8 @@ packages:
     resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
     engines: {node: '>=18'}
 
-  wait-on@9.0.10:
-    resolution: {integrity: sha512-rCoJEhvMr0X6alHmwc9abbrA5ZrLZFKpFQVKPNFwl2h7DapXOGdmimIHDtLOWhT4PjhZhxFEtZoQgEXbkDWdZw==}
+  wait-on@9.1.0:
+    resolution: {integrity: sha512-PymrLXHLBM1Ju/Xspb2ADUhbPSMvbnuNvy/mN2hWtpbJ3da0h3Ky1LqwKPG5QSVR57liyO0iUpfipYl/s5qNvA==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
@@ -5591,6 +5634,10 @@ packages:
     resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
+  whatwg-url@17.1.0:
+    resolution: {integrity: sha512-3GeworPmc2ZfEEHP7lEbUfBX/L75wdEsi0rLNhXcXxnoN5jyq0SL5gCy06SGW2cyTIZdTvWIDQNQoza++vKeaw==}
+    engines: {node: ^22.14.0 || >=24.0.0}
+
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -5654,8 +5701,20 @@ packages:
     resolution: {integrity: sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==}
     engines: {node: ^20.17.0 || >=22.9.0}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  ws@8.21.2:
+    resolution: {integrity: sha512-54dMVAo4WIe6SKy3vBgN+9bJZqqQ8IMRevAkOLQALhi49qkkQDQfWdAZ8KQlXiEabw88ARXXdUrlvtbKQX+aKw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -5741,25 +5800,20 @@ snapshots:
 
   '@ark/util@0.56.0': {}
 
-  '@asamuzakjp/css-color@5.1.11':
+  '@asamuzakjp/css-color@6.0.5':
     dependencies:
-      '@asamuzakjp/generational-cache': 1.0.1
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      '@csstools/css-color-parser': 4.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-color-parser': 4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
+      lru-cache: 11.5.2
 
-  '@asamuzakjp/dom-selector@7.1.1':
+  '@asamuzakjp/dom-selector@8.3.0':
     dependencies:
-      '@asamuzakjp/generational-cache': 1.0.1
-      '@asamuzakjp/nwsapi': 2.3.9
       bidi-js: 1.0.3
       css-tree: 3.2.1
       is-potential-custom-element-name: 1.0.1
-
-  '@asamuzakjp/generational-cache@1.0.1': {}
-
-  '@asamuzakjp/nwsapi@2.3.9': {}
+      lru-cache: 11.5.2
 
   '@babel/code-frame@7.29.7':
     dependencies:
@@ -5776,16 +5830,36 @@ snapshots:
 
   '@babel/compat-data@8.0.0': {}
 
-  '@babel/core@7.29.7':
+  '@babel/core@7.29.7(supports-color@10.2.2)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.7
       '@babel/helper-compilation-targets': 7.29.7
-      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/helpers': 7.29.7
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
+      '@babel/types': 7.29.7
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3(supports-color@10.2.2)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/core@7.29.7(supports-color@5.5.0)':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@5.5.0))(supports-color@5.5.0)
+      '@babel/helpers': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@5.5.0)
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
@@ -5812,7 +5886,7 @@ snapshots:
       gensync: 1.0.0-beta.2
       import-meta-resolve: 4.2.0
       json5: 2.2.3
-      obug: 2.1.3
+      obug: 2.1.4
       semver: 7.8.5
 
   '@babel/generator@7.29.7':
@@ -5823,6 +5897,14 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
+  '@babel/generator@7.29.8':
+    dependencies:
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
   '@babel/generator@8.0.0':
     dependencies:
       '@babel/parser': 8.0.0
@@ -5840,7 +5922,7 @@ snapshots:
     dependencies:
       '@babel/compat-data': 7.29.7
       '@babel/helper-validator-option': 7.29.7
-      browserslist: 4.28.4
+      browserslist: 4.28.7
       lru-cache: 5.1.1
       semver: 6.3.1
 
@@ -5848,17 +5930,24 @@ snapshots:
     dependencies:
       '@babel/compat-data': 8.0.0
       '@babel/helper-validator-option': 8.0.0
-      browserslist: 4.28.4
-      lru-cache: 11.5.1
+      browserslist: 4.28.7
+      lru-cache: 11.5.2
       semver: 7.8.5
 
   '@babel/helper-globals@7.29.7': {}
 
   '@babel/helper-globals@8.0.0': {}
 
-  '@babel/helper-module-imports@7.29.7':
+  '@babel/helper-module-imports@7.29.7(supports-color@10.2.2)':
     dependencies:
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.29.7(supports-color@5.5.0)':
+    dependencies:
+      '@babel/traverse': 7.29.7(supports-color@5.5.0)
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
@@ -5868,12 +5957,21 @@ snapshots:
       '@babel/traverse': 8.0.0
       '@babel/types': 8.0.0
 
-  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
-      '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
+      '@babel/helper-module-imports': 7.29.7(supports-color@10.2.2)
       '@babel/helper-validator-identifier': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@5.5.0))(supports-color@5.5.0)':
+    dependencies:
+      '@babel/core': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-validator-identifier': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -5907,6 +6005,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.7
 
+  '@babel/parser@7.29.8':
+    dependencies:
+      '@babel/types': 7.29.8
+
   '@babel/parser@8.0.0':
     dependencies:
       '@babel/types': 8.0.0
@@ -5969,7 +6071,7 @@ snapshots:
       '@babel/parser': 8.0.0
       '@babel/types': 8.0.0
 
-  '@babel/traverse@7.29.7':
+  '@babel/traverse@7.29.7(supports-color@10.2.2)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.7
@@ -5977,6 +6079,42 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
+      debug: 4.4.3(supports-color@10.2.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.29.7(supports-color@5.5.0)':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.29.8(supports-color@10.2.2)':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.8
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.8
+      debug: 4.4.3(supports-color@10.2.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.29.8(supports-color@5.5.0)':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.8
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.8
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.8
       debug: 4.4.3(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
@@ -5989,13 +6127,18 @@ snapshots:
       '@babel/parser': 8.0.0
       '@babel/template': 8.0.0
       '@babel/types': 8.0.0
-      obug: 2.1.3
+      obug: 2.1.4
 
   '@babel/types@7.29.7':
     dependencies:
       '@babel/helper-string-parser': 7.29.7
       '@babel/helper-validator-identifier': 7.29.7
 
+  '@babel/types@7.29.8':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
   '@babel/types@8.0.0':
     dependencies:
       '@babel/helper-string-parser': 8.0.0
@@ -6030,7 +6173,7 @@ snapshots:
       assert: 2.1.0
       buffer: 6.0.3
       events: 3.3.0
-      memfs: 4.57.6(tslib@2.8.1)
+      memfs: 4.64.0(tslib@2.8.1)
       path: 0.12.7
       stream: 0.0.3
       util: 0.12.5
@@ -6041,31 +6184,31 @@ snapshots:
     dependencies:
       postcss-calc-ast-parser: 0.1.4
 
-  '@cacheable/memory@2.0.8':
+  '@cacheable/memory@2.2.0':
     dependencies:
-      '@cacheable/utils': 2.4.1
+      '@cacheable/utils': 2.5.0
       '@keyv/bigmap': 1.3.1(keyv@5.6.0)
       hookified: 1.15.1
       keyv: 5.6.0
 
-  '@cacheable/utils@2.4.1':
+  '@cacheable/utils@2.5.0':
     dependencies:
       hashery: 1.5.1
       keyv: 5.6.0
 
   '@colors/colors@1.6.0': {}
 
-  '@csstools/color-helpers@6.0.2': {}
+  '@csstools/color-helpers@6.1.0': {}
 
-  '@csstools/css-calc@3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-calc@3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-color-parser@4.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-color-parser@4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      '@csstools/color-helpers': 6.0.2
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/color-helpers': 6.1.0
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
@@ -6073,11 +6216,7 @@ snapshots:
     dependencies:
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.4(css-tree@3.2.1)':
-    optionalDependencies:
-      css-tree: 3.2.1
-
-  '@csstools/css-syntax-patches-for-csstree@1.1.6(css-tree@3.2.1)':
+  '@csstools/css-syntax-patches-for-csstree@1.1.7(css-tree@3.2.1)':
     optionalDependencies:
       css-tree: 3.2.1
 
@@ -6088,7 +6227,7 @@ snapshots:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/selector-resolve-nested@4.0.0(postcss-selector-parser@7.1.4)':
+  '@csstools/selector-resolve-nested@4.0.1(postcss-selector-parser@7.1.4)':
     dependencies:
       postcss-selector-parser: 7.1.4
 
@@ -6102,13 +6241,7 @@ snapshots:
       enabled: 2.0.0
       kuler: 2.0.0
 
-  '@emnapi/core@1.10.0':
-    dependencies:
-      '@emnapi/wasi-threads': 1.2.1
-      tslib: 2.8.1
-    optional: true
-
-  '@emnapi/core@1.11.1':
+  '@emnapi/core@1.11.2':
     dependencies:
       '@emnapi/wasi-threads': 1.2.2
       tslib: 2.8.1
@@ -6120,12 +6253,13 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
-  '@emnapi/runtime@1.10.0':
+  '@emnapi/core@2.0.0-alpha.3':
     dependencies:
+      '@emnapi/wasi-threads': 2.0.1
       tslib: 2.8.1
     optional: true
 
-  '@emnapi/runtime@1.11.1':
+  '@emnapi/runtime@1.11.2':
     dependencies:
       tslib: 2.8.1
     optional: true
@@ -6135,6 +6269,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/runtime@2.0.0-alpha.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/wasi-threads@1.2.1':
     dependencies:
       tslib: 2.8.1
@@ -6145,6 +6284,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/wasi-threads@2.0.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@esbuild/aix-ppc64@0.28.1':
     optional: true
 
@@ -6223,17 +6367,17 @@ snapshots:
   '@esbuild/win32-x64@0.28.1':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2)':
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2(supports-color@10.2.2))':
     dependencies:
-      eslint: 9.39.2
+      eslint: 9.39.2(supports-color@10.2.2)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.2': {}
 
-  '@eslint/config-array@0.21.2':
+  '@eslint/config-array@0.21.2(supports-color@10.2.2)':
     dependencies:
       '@eslint/object-schema': 2.1.7
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@10.2.2)
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
@@ -6246,10 +6390,10 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/eslintrc@3.3.5':
+  '@eslint/eslintrc@3.3.5(supports-color@10.2.2)':
     dependencies:
       ajv: 6.15.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@10.2.2)
       espree: 10.4.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -6269,7 +6413,7 @@ snapshots:
       '@eslint/core': 0.17.0
       levn: 0.4.1
 
-  '@exodus/bytes@1.15.0': {}
+  '@exodus/bytes@1.15.1': {}
 
   '@hapi/address@5.1.1':
     dependencies:
@@ -6281,7 +6425,7 @@ snapshots:
 
   '@hapi/pinpoint@2.0.1': {}
 
-  '@hapi/tlds@1.1.4': {}
+  '@hapi/tlds@1.1.7': {}
 
   '@hapi/topo@6.0.2':
     dependencies:
@@ -6303,11 +6447,23 @@ snapshots:
 
   '@humanwhocodes/retry@0.4.3': {}
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@internationalized/date@3.12.3':
+    dependencies:
+      '@swc/helpers': 0.5.23
+
+  '@internationalized/number@3.6.7':
+    dependencies:
+      '@swc/helpers': 0.5.23
+
+  '@internationalized/string@3.2.10':
+    dependencies:
+      '@swc/helpers': 0.5.23
+
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
       glob: 13.0.6
       react-docgen-typescript: 2.4.0(typescript@6.0.3)
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
     optionalDependencies:
       typescript: 6.0.3
 
@@ -6354,58 +6510,59 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-core@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-core@4.64.0(tslib@2.8.1)':
     dependencies:
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
-      thingies: 2.6.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-fsa@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-fsa@4.64.0(tslib@2.8.1)':
     dependencies:
-      '@jsonjoy.com/fs-core': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
-      thingies: 2.6.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-core': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-node-builtins@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-node-builtins@4.64.0(tslib@2.8.1)':
     dependencies:
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-node-to-fsa@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-node-to-fsa@4.64.0(tslib@2.8.1)':
     dependencies:
-      '@jsonjoy.com/fs-fsa': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
+      '@jsonjoy.com/fs-fsa': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-node-utils@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-node-utils@4.64.0(tslib@2.8.1)':
     dependencies:
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      tslib: 2.8.1
-
-  '@jsonjoy.com/fs-node@4.57.6(tslib@2.8.1)':
-    dependencies:
-      '@jsonjoy.com/fs-core': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-print': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-snapshot': 4.57.6(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
       glob-to-regex.js: 1.2.0(tslib@2.8.1)
-      thingies: 2.6.0(tslib@2.8.1)
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-print@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-node@4.64.0(tslib@2.8.1)':
     dependencies:
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
+      '@jsonjoy.com/fs-core': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-print': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-snapshot': 4.64.0(tslib@2.8.1)
+      glob-to-regex.js: 1.2.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
+      tslib: 2.8.1
+
+  '@jsonjoy.com/fs-print@4.64.0(tslib@2.8.1)':
+    dependencies:
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
       tree-dump: 1.1.0(tslib@2.8.1)
       tslib: 2.8.1
 
-  '@jsonjoy.com/fs-snapshot@4.57.6(tslib@2.8.1)':
+  '@jsonjoy.com/fs-snapshot@4.64.0(tslib@2.8.1)':
     dependencies:
       '@jsonjoy.com/buffers': 17.67.0(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
       '@jsonjoy.com/json-pack': 17.67.0(tslib@2.8.1)
       '@jsonjoy.com/util': 17.67.0(tslib@2.8.1)
       tslib: 2.8.1
@@ -6418,7 +6575,7 @@ snapshots:
       '@jsonjoy.com/json-pointer': 1.0.2(tslib@2.8.1)
       '@jsonjoy.com/util': 1.9.0(tslib@2.8.1)
       hyperdyperid: 1.2.0
-      thingies: 2.6.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
       tree-dump: 1.1.0(tslib@2.8.1)
       tslib: 2.8.1
 
@@ -6430,7 +6587,7 @@ snapshots:
       '@jsonjoy.com/json-pointer': 17.67.0(tslib@2.8.1)
       '@jsonjoy.com/util': 17.67.0(tslib@2.8.1)
       hyperdyperid: 1.2.0
-      thingies: 2.6.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
       tree-dump: 1.1.0(tslib@2.8.1)
       tslib: 2.8.1
 
@@ -6465,30 +6622,30 @@ snapshots:
 
   '@keyv/serialize@1.1.1': {}
 
-  '@mdx-js/react@3.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@mdx-js/react@3.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       '@types/mdx': 2.0.14
-      '@types/react': 19.2.17
-      react: 19.2.7
+      '@types/react': 19.2.18
+      react: 19.2.8
 
-  '@microsoft/api-extractor-model@7.32.2(@types/node@26.1.0)':
+  '@microsoft/api-extractor-model@7.32.2(@types/node@26.1.2)':
     dependencies:
       '@microsoft/tsdoc': 0.16.0
       '@microsoft/tsdoc-config': 0.18.1
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.0)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
     transitivePeerDependencies:
       - '@types/node'
     optional: true
 
-  '@microsoft/api-extractor@7.56.2(@types/node@26.1.0)':
+  '@microsoft/api-extractor@7.56.2(@types/node@26.1.2)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.32.2(@types/node@26.1.0)
+      '@microsoft/api-extractor-model': 7.32.2(@types/node@26.1.2)
       '@microsoft/tsdoc': 0.16.0
       '@microsoft/tsdoc-config': 0.18.1
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.0)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
       '@rushstack/rig-package': 0.6.0
-      '@rushstack/terminal': 0.21.0(@types/node@26.1.0)
-      '@rushstack/ts-command-line': 5.2.0(@types/node@26.1.0)
+      '@rushstack/terminal': 0.21.0(@types/node@26.1.2)
+      '@rushstack/ts-command-line': 5.2.0(@types/node@26.1.2)
       diff: 8.0.4
       lodash: 4.18.1
       minimatch: 10.2.5
@@ -6511,24 +6668,24 @@ snapshots:
   '@microsoft/tsdoc@0.16.0':
     optional: true
 
-  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)':
     dependencies:
-      '@emnapi/core': 1.10.0
-      '@emnapi/runtime': 1.10.0
-      '@tybys/wasm-util': 0.10.2
+      '@emnapi/core': 1.11.2
+      '@emnapi/runtime': 1.11.2
+      '@tybys/wasm-util': 0.10.3
     optional: true
 
-  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
     dependencies:
       '@emnapi/core': 1.9.2
       '@emnapi/runtime': 1.9.2
-      '@tybys/wasm-util': 0.10.2
+      '@tybys/wasm-util': 0.10.3
     optional: true
 
-  '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)':
     dependencies:
-      '@emnapi/core': 1.11.1
-      '@emnapi/runtime': 1.11.1
+      '@emnapi/core': 2.0.0-alpha.3
+      '@emnapi/runtime': 2.0.0-alpha.3
       '@tybys/wasm-util': 0.10.3
     optional: true
 
@@ -6598,7 +6755,7 @@ snapshots:
     dependencies:
       '@emnapi/core': 1.9.2
       '@emnapi/runtime': 1.9.2
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
     optional: true
 
   '@oxc-parser/binding-win32-arm64-msvc@0.127.0':
@@ -6612,128 +6769,124 @@ snapshots:
 
   '@oxc-project/types@0.127.0': {}
 
-  '@oxc-project/types@0.137.0': {}
+  '@oxc-project/types@0.142.0': {}
 
-  '@oxc-resolver/binding-android-arm-eabi@11.20.0':
+  '@oxc-resolver/binding-android-arm-eabi@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-android-arm64@11.20.0':
+  '@oxc-resolver/binding-android-arm64@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-darwin-arm64@11.20.0':
+  '@oxc-resolver/binding-darwin-arm64@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-darwin-x64@11.20.0':
+  '@oxc-resolver/binding-darwin-x64@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-freebsd-x64@11.20.0':
+  '@oxc-resolver/binding-freebsd-x64@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-arm-gnueabihf@11.20.0':
+  '@oxc-resolver/binding-linux-arm-gnueabihf@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-arm-musleabihf@11.20.0':
+  '@oxc-resolver/binding-linux-arm-musleabihf@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-arm64-gnu@11.20.0':
+  '@oxc-resolver/binding-linux-arm64-gnu@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-arm64-musl@11.20.0':
+  '@oxc-resolver/binding-linux-arm64-musl@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-ppc64-gnu@11.20.0':
+  '@oxc-resolver/binding-linux-ppc64-gnu@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-riscv64-gnu@11.20.0':
+  '@oxc-resolver/binding-linux-riscv64-gnu@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-riscv64-musl@11.20.0':
+  '@oxc-resolver/binding-linux-riscv64-musl@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-s390x-gnu@11.20.0':
+  '@oxc-resolver/binding-linux-s390x-gnu@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-x64-gnu@11.20.0':
+  '@oxc-resolver/binding-linux-x64-gnu@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-linux-x64-musl@11.20.0':
+  '@oxc-resolver/binding-linux-x64-musl@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-openharmony-arm64@11.20.0':
+  '@oxc-resolver/binding-openharmony-arm64@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-wasm32-wasi@11.20.0':
+  '@oxc-resolver/binding-wasm32-wasi@11.24.2':
     dependencies:
-      '@emnapi/core': 1.10.0
-      '@emnapi/runtime': 1.10.0
-      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+      '@emnapi/core': 1.11.2
+      '@emnapi/runtime': 1.11.2
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)
     optional: true
 
-  '@oxc-resolver/binding-win32-arm64-msvc@11.20.0':
+  '@oxc-resolver/binding-win32-arm64-msvc@11.24.2':
     optional: true
 
-  '@oxc-resolver/binding-win32-x64-msvc@11.20.0':
+  '@oxc-resolver/binding-win32-x64-msvc@11.24.2':
     optional: true
 
-  '@parcel/watcher-android-arm64@2.5.6':
+  '@parcel/watcher-android-arm64@2.6.0':
     optional: true
 
-  '@parcel/watcher-darwin-arm64@2.5.6':
+  '@parcel/watcher-darwin-arm64@2.6.0':
     optional: true
 
-  '@parcel/watcher-darwin-x64@2.5.6':
+  '@parcel/watcher-darwin-x64@2.6.0':
     optional: true
 
-  '@parcel/watcher-freebsd-x64@2.5.6':
+  '@parcel/watcher-freebsd-x64@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm-glibc@2.5.6':
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm-musl@2.5.6':
+  '@parcel/watcher-linux-arm-musl@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm64-glibc@2.5.6':
+  '@parcel/watcher-linux-arm64-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm64-musl@2.5.6':
+  '@parcel/watcher-linux-arm64-musl@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-x64-glibc@2.5.6':
+  '@parcel/watcher-linux-x64-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-x64-musl@2.5.6':
+  '@parcel/watcher-linux-x64-musl@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-arm64@2.5.6':
+  '@parcel/watcher-win32-arm64@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-ia32@2.5.6':
+  '@parcel/watcher-win32-x64@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-x64@2.5.6':
-    optional: true
-
-  '@parcel/watcher@2.5.6':
+  '@parcel/watcher@2.6.0':
     dependencies:
       detect-libc: 2.1.2
       is-glob: 4.0.3
       node-addon-api: 7.1.1
-      picomatch: 4.0.4
+      picomatch: 4.0.5
     optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.6
-      '@parcel/watcher-darwin-arm64': 2.5.6
-      '@parcel/watcher-darwin-x64': 2.5.6
-      '@parcel/watcher-freebsd-x64': 2.5.6
-      '@parcel/watcher-linux-arm-glibc': 2.5.6
-      '@parcel/watcher-linux-arm-musl': 2.5.6
-      '@parcel/watcher-linux-arm64-glibc': 2.5.6
-      '@parcel/watcher-linux-arm64-musl': 2.5.6
-      '@parcel/watcher-linux-x64-glibc': 2.5.6
-      '@parcel/watcher-linux-x64-musl': 2.5.6
-      '@parcel/watcher-win32-arm64': 2.5.6
-      '@parcel/watcher-win32-ia32': 2.5.6
-      '@parcel/watcher-win32-x64': 2.5.6
+      '@parcel/watcher-android-arm64': 2.6.0
+      '@parcel/watcher-darwin-arm64': 2.6.0
+      '@parcel/watcher-darwin-x64': 2.6.0
+      '@parcel/watcher-freebsd-x64': 2.6.0
+      '@parcel/watcher-linux-arm-glibc': 2.6.0
+      '@parcel/watcher-linux-arm-musl': 2.6.0
+      '@parcel/watcher-linux-arm64-glibc': 2.6.0
+      '@parcel/watcher-linux-arm64-musl': 2.6.0
+      '@parcel/watcher-linux-x64-glibc': 2.6.0
+      '@parcel/watcher-linux-x64-musl': 2.6.0
+      '@parcel/watcher-win32-arm64': 2.6.0
+      '@parcel/watcher-win32-x64': 2.6.0
     optional: true
 
   '@penpot/svgo@https://codeload.github.com/penpot/svgo/tar.gz/65b3a645df9edbe3c00acf4267dd06c2ca736021':
@@ -6742,16 +6895,20 @@ snapshots:
       css-tree: 3.2.1
       csso: 5.0.5
       lodash: 4.18.1
-      sax: 1.6.0
+      sax: 1.6.1
 
   '@penpot/ua-parser@https://codeload.github.com/penpot/ua-parser/tar.gz/90b970f39f2dc08378b975a0f01045b4ec8e89a4': {}
 
-  '@playwright/test@1.61.1':
+  '@playwright/test@1.62.1':
     dependencies:
-      playwright: 1.61.1
+      playwright: 1.62.1
 
   '@polka/url@1.0.0-next.29': {}
 
+  '@react-types/shared@3.36.1(react@19.2.8)':
+    dependencies:
+      react: 19.2.8
+
   '@resvg/resvg-js-android-arm-eabi@2.6.2':
     optional: true
 
@@ -6803,53 +6960,53 @@ snapshots:
       '@resvg/resvg-js-win32-ia32-msvc': 2.6.2
       '@resvg/resvg-js-win32-x64-msvc': 2.6.2
 
-  '@rolldown/binding-android-arm64@1.1.3':
+  '@rolldown/binding-android-arm64@1.2.1':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
+  '@rolldown/binding-darwin-arm64@1.2.1':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.1.3':
+  '@rolldown/binding-darwin-x64@1.2.1':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
+  '@rolldown/binding-freebsd-x64@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
+  '@rolldown/binding-linux-arm64-gnu@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
+  '@rolldown/binding-linux-arm64-musl@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
+  '@rolldown/binding-linux-ppc64-gnu@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
+  '@rolldown/binding-linux-s390x-gnu@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
+  '@rolldown/binding-linux-x64-gnu@1.2.1':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
+  '@rolldown/binding-linux-x64-musl@1.2.1':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
+  '@rolldown/binding-openharmony-arm64@1.2.1':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
+  '@rolldown/binding-wasm32-wasi@1.2.1':
     dependencies:
-      '@emnapi/core': 1.11.1
-      '@emnapi/runtime': 1.11.1
-      '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
+      '@emnapi/core': 2.0.0-alpha.3
+      '@emnapi/runtime': 2.0.0-alpha.3
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
+  '@rolldown/binding-win32-arm64-msvc@1.2.1':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
+  '@rolldown/binding-win32-x64-msvc@1.2.1':
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
@@ -6858,7 +7015,7 @@ snapshots:
     dependencies:
       '@types/estree': 1.0.9
       estree-walker: 2.0.2
-      picomatch: 4.0.4
+      picomatch: 4.0.5
     optionalDependencies:
       rollup: 4.61.1
 
@@ -6939,7 +7096,7 @@ snapshots:
 
   '@rtsao/scc@1.1.0': {}
 
-  '@rushstack/node-core-library@5.19.1(@types/node@26.1.0)':
+  '@rushstack/node-core-library@5.19.1(@types/node@26.1.2)':
     dependencies:
       ajv: 8.20.0
       ajv-draft-04: 1.0.0(ajv@8.20.0)
@@ -6950,12 +7107,12 @@ snapshots:
       resolve: 1.22.12
       semver: 7.5.4
     optionalDependencies:
-      '@types/node': 26.1.0
+      '@types/node': 26.1.2
     optional: true
 
-  '@rushstack/problem-matcher@0.1.1(@types/node@26.1.0)':
+  '@rushstack/problem-matcher@0.1.1(@types/node@26.1.2)':
     optionalDependencies:
-      '@types/node': 26.1.0
+      '@types/node': 26.1.2
     optional: true
 
   '@rushstack/rig-package@0.6.0':
@@ -6964,18 +7121,18 @@ snapshots:
       strip-json-comments: 3.1.1
     optional: true
 
-  '@rushstack/terminal@0.21.0(@types/node@26.1.0)':
+  '@rushstack/terminal@0.21.0(@types/node@26.1.2)':
     dependencies:
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.0)
-      '@rushstack/problem-matcher': 0.1.1(@types/node@26.1.0)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
+      '@rushstack/problem-matcher': 0.1.1(@types/node@26.1.2)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 26.1.0
+      '@types/node': 26.1.2
     optional: true
 
-  '@rushstack/ts-command-line@5.2.0(@types/node@26.1.0)':
+  '@rushstack/ts-command-line@5.2.0(@types/node@26.1.2)':
     dependencies:
-      '@rushstack/terminal': 0.21.0(@types/node@26.1.0)
+      '@rushstack/terminal': 0.21.0(@types/node@26.1.2)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
@@ -6992,18 +7149,18 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@storybook/addon-docs@10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@storybook/addon-docs@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
-      '@mdx-js/react': 3.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@storybook/csf-plugin': 10.4.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      '@storybook/icons': 2.0.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@storybook/react-dom-shim': 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@mdx-js/react': 3.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@storybook/csf-plugin': 10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@storybook/icons': 2.1.0(react@19.2.8)
+      '@storybook/react-dom-shim': 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       ts-dedent: 2.3.0
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
     transitivePeerDependencies:
       - '@types/react-dom'
       - esbuild
@@ -7011,101 +7168,145 @@ snapshots:
       - vite
       - webpack
 
-  '@storybook/addon-themes@10.4.6(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))':
+  '@storybook/addon-themes@10.5.6(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))':
     dependencies:
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       ts-dedent: 2.3.0
 
-  '@storybook/addon-vitest@10.4.6(@vitest/browser-playwright@4.1.9)(@vitest/browser@4.1.9)(@vitest/runner@4.1.9)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vitest@4.1.9)':
+  '@storybook/addon-vitest@10.5.6(@vitest/browser-playwright@4.1.10)(@vitest/browser@4.1.10)(@vitest/runner@4.1.10)(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vitest@4.1.10)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/icons': 2.0.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@storybook/icons': 2.1.0(react@19.2.8)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
     optionalDependencies:
-      '@vitest/browser': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
-      '@vitest/browser-playwright': 4.1.9(playwright@1.61.1)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
-      '@vitest/runner': 4.1.9
-      vitest: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      '@vitest/browser': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
+      '@vitest/browser-playwright': 4.1.10(playwright@1.62.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
+      '@vitest/runner': 4.1.10
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
     transitivePeerDependencies:
       - react
-      - react-dom
 
-  '@storybook/builder-vite@10.4.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@storybook/builder-vite@10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
-      '@storybook/csf-plugin': 10.4.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@storybook/csf-plugin': 10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       ts-dedent: 2.3.0
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
     transitivePeerDependencies:
       - esbuild
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.4.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@storybook/csf-plugin@10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       unplugin: 2.3.11
     optionalDependencies:
       esbuild: 0.28.1
       rollup: 4.61.1
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
 
   '@storybook/global@5.0.0': {}
 
-  '@storybook/icons@2.0.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@storybook/icons@2.1.0(react@19.2.8)':
     dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
 
-  '@storybook/react-dom-shim@10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))':
+  '@storybook/react-dom-shim@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))':
     dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@storybook/react-vite@10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(esbuild@0.28.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@storybook/react-vite@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
       '@rollup/pluginutils': 5.4.0(rollup@4.61.1)
-      '@storybook/builder-vite': 10.4.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      '@storybook/react': 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)
+      '@storybook/builder-vite': 10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@storybook/react': 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@10.2.2)(typescript@6.0.3)
       empathic: 2.0.1
       magic-string: 0.30.21
-      react: 19.2.7
-      react-docgen: 8.0.3
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-docgen: 8.0.3(supports-color@10.2.2)
+      react-dom: 19.2.8(react@19.2.8)
       resolve: 1.22.12
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
       tsconfig-paths: 4.2.0
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
+    optionalDependencies:
+      typescript: 6.0.3
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
       - esbuild
       - rollup
       - supports-color
-      - typescript
       - webpack
 
-  '@storybook/react@10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(typescript@6.0.3)':
+  '@storybook/react-vite@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@5.5.0)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
+    dependencies:
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@rollup/pluginutils': 5.4.0(rollup@4.61.1)
+      '@storybook/builder-vite': 10.5.6(esbuild@0.28.1)(rollup@4.61.1)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@storybook/react': 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@5.5.0)(typescript@6.0.3)
+      empathic: 2.0.1
+      magic-string: 0.30.21
+      react: 19.2.8
+      react-docgen: 8.0.3(supports-color@5.5.0)
+      react-dom: 19.2.8(react@19.2.8)
+      resolve: 1.22.12
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
+      tsconfig-paths: 4.2.0
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
+    optionalDependencies:
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
+      - esbuild
+      - rollup
+      - supports-color
+      - webpack
+
+  '@storybook/react@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/react-dom-shim': 10.4.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))
-      react: 19.2.7
-      react-docgen: 8.0.3
+      '@storybook/react-dom-shim': 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))
+      react: 19.2.8
+      react-docgen: 8.0.3(supports-color@10.2.2)
       react-docgen-typescript: 2.4.0(typescript@6.0.3)
-      react-dom: 19.2.7(react@19.2.7)
-      storybook: 10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      react-dom: 19.2.8(react@19.2.8)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
+  '@storybook/react@10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))(supports-color@5.5.0)(typescript@6.0.3)':
+    dependencies:
+      '@storybook/global': 5.0.0
+      '@storybook/react-dom-shim': 10.5.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8))
+      react: 19.2.8
+      react-docgen: 8.0.3(supports-color@5.5.0)
+      react-docgen-typescript: 2.4.0(typescript@6.0.3)
+      react-dom: 19.2.8(react@19.2.8)
+      storybook: 10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8)
+    optionalDependencies:
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@swc/helpers@0.5.23':
+    dependencies:
+      tslib: 2.8.1
+
   '@testing-library/dom@10.4.1':
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -7126,21 +7327,21 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@babel/runtime': 7.29.7
       '@testing-library/dom': 10.4.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)':
+  '@testing-library/user-event@14.6.3(@testing-library/dom@10.4.1)':
     dependencies:
       '@testing-library/dom': 10.4.1
 
-  '@tokens-studio/sd-transforms@2.0.3(style-dictionary@5.4.4(tslib@2.8.1))':
+  '@tokens-studio/sd-transforms@2.0.3(style-dictionary@5.5.0(tslib@2.8.1))':
     dependencies:
       '@bundled-es-modules/deepmerge': 4.3.2
       '@bundled-es-modules/postcss-calc-ast-parser': 0.1.6
@@ -7148,7 +7349,7 @@ snapshots:
       colorjs.io: 0.5.2
       expr-eval-fork: 3.0.3
       is-mergeable-object: 1.1.1
-      style-dictionary: 5.4.4(tslib@2.8.1)
+      style-dictionary: 5.5.0(tslib@2.8.1)
 
   '@tokens-studio/tokenscript-interpreter@0.26.0':
     dependencies:
@@ -7159,11 +7360,6 @@ snapshots:
 
   '@tokens-studio/types@0.5.2': {}
 
-  '@tybys/wasm-util@0.10.2':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
   '@tybys/wasm-util@0.10.3':
     dependencies:
       tslib: 2.8.1
@@ -7176,24 +7372,24 @@ snapshots:
 
   '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
       '@types/babel__generator': 7.27.0
       '@types/babel__template': 7.4.4
       '@types/babel__traverse': 7.28.0
 
   '@types/babel__generator@7.27.0':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
 
   '@types/babel__template@7.4.4':
     dependencies:
-      '@babel/parser': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
 
   '@types/babel__traverse@7.28.0':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
 
   '@types/chai@5.2.3':
     dependencies:
@@ -7216,15 +7412,15 @@ snapshots:
 
   '@types/mdx@2.0.14': {}
 
-  '@types/node@26.1.0':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
-  '@types/react-dom@19.2.3(@types/react@19.2.17)':
+  '@types/react-dom@19.2.4(@types/react@19.2.18)':
     dependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@types/react@19.2.17':
+  '@types/react@19.2.18':
     dependencies:
       csstype: 3.2.3
 
@@ -7232,58 +7428,58 @@ snapshots:
 
   '@types/triple-beam@1.3.5': {}
 
-  '@vitejs/plugin-react@6.0.3(babel-plugin-react-compiler@1.0.0)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@vitejs/plugin-react@6.0.5(babel-plugin-react-compiler@1.0.0)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
       '@rolldown/pluginutils': 1.0.1
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
     optionalDependencies:
       babel-plugin-react-compiler: 1.0.0
 
-  '@vitest/browser-playwright@4.1.9(playwright@1.61.1)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)':
+  '@vitest/browser-playwright@4.1.10(playwright@1.62.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)':
     dependencies:
-      '@vitest/browser': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
-      '@vitest/mocker': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      playwright: 1.61.1
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      '@vitest/browser': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
+      '@vitest/mocker': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      playwright: 1.62.1
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/browser@4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)':
+  '@vitest/browser@4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)':
     dependencies:
       '@blazediff/core': 1.9.1
-      '@vitest/mocker': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      '@vitest/utils': 4.1.9
+      '@vitest/mocker': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@vitest/utils': 4.1.10
       magic-string: 0.30.21
       pngjs: 7.0.0
       sirv: 3.0.2
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      ws: 8.21.0
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      ws: 8.21.1
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/coverage-v8@4.1.9(@vitest/browser@4.1.9)(vitest@4.1.9)':
+  '@vitest/coverage-v8@4.1.10(@vitest/browser@4.1.10)(vitest@4.1.10)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.1.9
-      ast-v8-to-istanbul: 1.0.3
+      '@vitest/utils': 4.1.10
+      ast-v8-to-istanbul: 1.0.5
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-reports: 3.2.0
-      magicast: 0.5.3
-      obug: 2.1.3
-      std-env: 4.1.0
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      magicast: 0.5.4
+      obug: 2.1.4
+      std-env: 4.2.0
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
     optionalDependencies:
-      '@vitest/browser': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
+      '@vitest/browser': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
 
   '@vitest/expect@3.2.4':
     dependencies:
@@ -7293,40 +7489,40 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/expect@4.1.9':
+  '@vitest/expect@4.1.10':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
       chai: 6.2.2
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
-  '@vitest/mocker@4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))':
+  '@vitest/mocker@4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))':
     dependencies:
-      '@vitest/spy': 4.1.9
+      '@vitest/spy': 4.1.10
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
       tinyrainbow: 2.0.0
 
-  '@vitest/pretty-format@4.1.9':
+  '@vitest/pretty-format@4.1.10':
     dependencies:
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
-  '@vitest/runner@4.1.9':
+  '@vitest/runner@4.1.10':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.10
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.9':
+  '@vitest/snapshot@4.1.10':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/utils': 4.1.10
       magic-string: 0.30.21
       pathe: 2.0.3
 
@@ -7334,18 +7530,18 @@ snapshots:
     dependencies:
       tinyspy: 4.0.4
 
-  '@vitest/spy@4.1.9': {}
+  '@vitest/spy@4.1.10': {}
 
-  '@vitest/ui@4.1.9(vitest@4.1.9)':
+  '@vitest/ui@4.1.10(vitest@4.1.10)':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.10
       fflate: 0.8.3
-      flatted: 3.4.2
+      flatted: 3.4.4
       pathe: 2.0.3
       sirv: 3.0.2
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -7353,11 +7549,11 @@ snapshots:
       loupe: 3.2.1
       tinyrainbow: 2.0.0
 
-  '@vitest/utils@4.1.9':
+  '@vitest/utils@4.1.10':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
+      '@vitest/pretty-format': 4.1.10
       convert-source-map: 2.0.0
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
   '@volar/language-core@2.4.28':
     dependencies:
@@ -7365,17 +7561,19 @@ snapshots:
 
   '@volar/source-map@2.4.28': {}
 
-  '@volar/typescript@2.4.28':
+  '@volar/typescript@2.4.28(typescript@6.0.3)':
     dependencies:
       '@volar/language-core': 2.4.28
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
+    optionalDependencies:
+      typescript: 6.0.3
 
   '@webcontainer/env@1.1.1': {}
 
   '@xmldom/xmldom@0.8.13': {}
 
-  '@zip.js/zip.js@2.8.26(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)': {}
+  '@zip.js/zip.js@2.8.34(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)': {}
 
   abbrev@5.0.0: {}
 
@@ -7384,11 +7582,11 @@ snapshots:
       mime-types: 3.0.2
       negotiator: 1.0.0
 
-  acorn-jsx@5.3.2(acorn@8.17.0):
+  acorn-jsx@5.3.2(acorn@8.18.0):
     dependencies:
-      acorn: 8.17.0
+      acorn: 8.18.0
 
-  acorn@8.17.0: {}
+  acorn@8.18.0: {}
 
   agent-base@6.0.2(supports-color@5.5.0):
     dependencies:
@@ -7416,7 +7614,7 @@ snapshots:
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.3
+      fast-uri: 3.1.5
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
     optional: true
@@ -7424,7 +7622,7 @@ snapshots:
   ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.3
+      fast-uri: 3.1.5
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -7456,6 +7654,10 @@ snapshots:
 
   argparse@2.0.1: {}
 
+  aria-hidden@1.2.6:
+    dependencies:
+      tslib: 2.8.1
+
   aria-query@5.3.0:
     dependencies:
       dequal: 2.0.3
@@ -7557,7 +7759,7 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  ast-v8-to-istanbul@1.0.3:
+  ast-v8-to-istanbul@1.0.5:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       estree-walker: 3.0.3
@@ -7571,13 +7773,13 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  autoprefixer@10.5.2(postcss@8.5.16):
+  autoprefixer@10.5.4(postcss@8.5.25):
     dependencies:
-      browserslist: 4.28.4
-      caniuse-lite: 1.0.30001799
+      browserslist: 4.28.7
+      caniuse-lite: 1.0.30001806
       fraction.js: 5.3.4
       picocolors: 1.1.1
-      postcss: 8.5.16
+      postcss: 8.5.25
       postcss-value-parser: 4.2.0
 
   available-typed-arrays@1.0.7:
@@ -7586,9 +7788,9 @@ snapshots:
 
   axe-core@4.11.1: {}
 
-  axios@1.16.1(supports-color@5.5.0):
+  axios@1.19.0(debug@4.4.3(supports-color@5.5.0))(supports-color@5.5.0):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@5.5.0))
       form-data: 4.0.6
       https-proxy-agent: 5.0.1(supports-color@5.5.0)
       proxy-from-env: 2.1.0
@@ -7608,7 +7810,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.40: {}
+  baseline-browser-mapping@2.11.8: {}
 
   bidi-js@1.0.3:
     dependencies:
@@ -7624,17 +7826,17 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  body-parser@2.2.2(supports-color@5.5.0):
+  body-parser@2.3.0(supports-color@5.5.0):
     dependencies:
       bytes: 3.1.2
-      content-type: 1.0.5
+      content-type: 2.0.0
       debug: 4.4.3(supports-color@5.5.0)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
-      qs: 6.15.2
+      qs: 6.15.3
       raw-body: 3.0.2
-      type-is: 2.0.1
+      type-is: 2.1.0
     transitivePeerDependencies:
       - supports-color
 
@@ -7642,12 +7844,12 @@ snapshots:
 
   boolbase@2.0.0: {}
 
-  brace-expansion@1.1.15:
+  brace-expansion@1.1.18:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@5.0.7:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -7655,13 +7857,13 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.28.4:
+  browserslist@4.28.7:
     dependencies:
-      baseline-browser-mapping: 2.10.40
-      caniuse-lite: 1.0.30001800
-      electron-to-chromium: 1.5.382
-      node-releases: 2.0.50
-      update-browserslist-db: 1.2.3(browserslist@4.28.4)
+      baseline-browser-mapping: 2.11.8
+      caniuse-lite: 1.0.30001806
+      electron-to-chromium: 1.5.399
+      node-releases: 2.0.51
+      update-browserslist-db: 1.2.3(browserslist@4.28.7)
 
   buffer-from@1.1.2: {}
 
@@ -7681,10 +7883,10 @@ snapshots:
 
   bytes@3.1.2: {}
 
-  cacheable@2.3.5:
+  cacheable@2.5.0:
     dependencies:
-      '@cacheable/memory': 2.0.8
-      '@cacheable/utils': 2.4.1
+      '@cacheable/memory': 2.2.0
+      '@cacheable/utils': 2.5.0
       hookified: 1.15.1
       keyv: 5.6.0
       qified: 0.10.1
@@ -7708,9 +7910,7 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  caniuse-lite@1.0.30001799: {}
-
-  caniuse-lite@1.0.30001800: {}
+  caniuse-lite@1.0.30001806: {}
 
   canvas@3.2.3:
     dependencies:
@@ -7766,6 +7966,8 @@ snapshots:
     dependencies:
       source-map: 0.6.1
 
+  client-only@0.0.1: {}
+
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -7792,6 +7994,8 @@ snapshots:
 
   clsx@1.2.1: {}
 
+  clsx@2.1.1: {}
+
   color-convert@1.9.3:
     dependencies:
       color-name: 1.1.3
@@ -7843,11 +8047,11 @@ snapshots:
     dependencies:
       mime-db: 1.54.0
 
-  compression@1.8.1:
+  compression@1.8.1(supports-color@5.5.0):
     dependencies:
       bytes: 3.1.2
       compressible: 2.0.18
-      debug: 2.6.9
+      debug: 2.6.9(supports-color@5.5.0)
       negotiator: 0.6.4
       on-headers: 1.1.0
       safe-buffer: 5.2.1
@@ -7857,11 +8061,11 @@ snapshots:
 
   concat-map@0.0.1: {}
 
-  concurrently@10.0.3:
+  concurrently@10.0.4:
     dependencies:
       chalk: 5.6.2
       rxjs: 7.8.2
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       supports-color: 10.2.2
       tree-kill: 1.2.2
       yargs: 18.0.0
@@ -7879,6 +8083,8 @@ snapshots:
 
   content-type@1.0.5: {}
 
+  content-type@2.0.0: {}
+
   convert-source-map@2.0.0: {}
 
   cookie-signature@1.2.2: {}
@@ -8002,13 +8208,23 @@ snapshots:
 
   date-fns@4.4.0: {}
 
-  debug@2.6.9:
+  debug@2.6.9(supports-color@5.5.0):
     dependencies:
       ms: 2.0.0
+    optionalDependencies:
+      supports-color: 5.5.0
 
-  debug@3.2.7:
+  debug@3.2.7(supports-color@10.2.2):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 10.2.2
+
+  debug@4.4.3(supports-color@10.2.2):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 10.2.2
 
   debug@4.4.3(supports-color@5.5.0):
     dependencies:
@@ -8117,13 +8333,13 @@ snapshots:
       domelementtype: 3.0.0
       domhandler: 6.0.1
 
-  draft-js@https://codeload.github.com/penpot/draft-js/tar.gz/ba3b26ed63a01227a3560e440531b69d79c03f35(encoding@0.1.13)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  draft-js@https://codeload.github.com/penpot/draft-js/tar.gz/c58ebd9429a6359d72a88cff87e078aaf6fe285d(encoding@0.1.13)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       fbjs: 3.0.5(encoding@0.1.13)
       immutable: 3.8.3
       object-assign: 4.1.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
     transitivePeerDependencies:
       - encoding
 
@@ -8142,7 +8358,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.382: {}
+  electron-to-chromium@1.5.399: {}
 
   emoji-regex@10.6.0: {}
 
@@ -8254,7 +8470,7 @@ snapshots:
       iterator.prototype: 1.1.5
       safe-array-concat: 1.1.3
 
-  es-module-lexer@2.1.0: {}
+  es-module-lexer@2.3.1: {}
 
   es-object-atoms@1.1.1:
     dependencies:
@@ -8314,35 +8530,35 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-import-resolver-node@0.3.9:
+  eslint-import-resolver-node@0.3.9(supports-color@10.2.2):
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
       is-core-module: 2.16.2
       resolve: 1.22.12
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(eslint-import-resolver-node@0.3.9)(eslint@9.39.2):
+  eslint-module-utils@2.12.1(eslint-import-resolver-node@0.3.9(supports-color@10.2.2))(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
     optionalDependencies:
-      eslint: 9.39.2
-      eslint-import-resolver-node: 0.3.9
+      eslint: 9.39.2(supports-color@10.2.2)
+      eslint-import-resolver-node: 0.3.9(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(eslint@9.39.2):
+  eslint-plugin-import@2.32.0(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
       array.prototype.findlastindex: 1.2.6
       array.prototype.flat: 1.3.3
       array.prototype.flatmap: 1.3.3
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
       doctrine: 2.1.0
-      eslint: 9.39.2
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(eslint-import-resolver-node@0.3.9)(eslint@9.39.2)
+      eslint: 9.39.2(supports-color@10.2.2)
+      eslint-import-resolver-node: 0.3.9(supports-color@10.2.2)
+      eslint-module-utils: 2.12.1(eslint-import-resolver-node@0.3.9(supports-color@10.2.2))(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2)
       hasown: 2.0.4
       is-core-module: 2.16.2
       is-glob: 4.0.3
@@ -8358,7 +8574,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-jsx-a11y@6.10.2(eslint@9.39.2):
+  eslint-plugin-jsx-a11y@6.10.2(eslint@9.39.2(supports-color@10.2.2)):
     dependencies:
       aria-query: 5.3.2
       array-includes: 3.1.9
@@ -8368,7 +8584,7 @@ snapshots:
       axobject-query: 4.1.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 9.39.2
+      eslint: 9.39.2(supports-color@10.2.2)
       hasown: 2.0.4
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
@@ -8377,18 +8593,18 @@ snapshots:
       safe-regex-test: 1.1.0
       string.prototype.includes: 2.0.1
 
-  eslint-plugin-react-hooks@7.1.1(eslint@9.39.2):
+  eslint-plugin-react-hooks@7.1.1(eslint@9.39.2(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      '@babel/core': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/parser': 7.29.7
-      eslint: 9.39.2
+      eslint: 9.39.2(supports-color@10.2.2)
       hermes-parser: 0.25.1
       zod: 4.3.6
       zod-validation-error: 4.0.2(zod@4.3.6)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react@7.37.5(eslint@9.39.2):
+  eslint-plugin-react@7.37.5(eslint@9.39.2(supports-color@10.2.2)):
     dependencies:
       array-includes: 3.1.9
       array.prototype.findlast: 1.2.5
@@ -8396,7 +8612,7 @@ snapshots:
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
       es-iterator-helpers: 1.2.2
-      eslint: 9.39.2
+      eslint: 9.39.2(supports-color@10.2.2)
       estraverse: 5.3.0
       hasown: 2.0.4
       jsx-ast-utils: 3.3.5
@@ -8419,14 +8635,14 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
-  eslint@9.39.2:
+  eslint@9.39.2(supports-color@10.2.2):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(supports-color@10.2.2))
       '@eslint-community/regexpp': 4.12.2
-      '@eslint/config-array': 0.21.2
+      '@eslint/config-array': 0.21.2(supports-color@10.2.2)
       '@eslint/config-helpers': 0.4.2
       '@eslint/core': 0.17.0
-      '@eslint/eslintrc': 3.3.5
+      '@eslint/eslintrc': 3.3.5(supports-color@10.2.2)
       '@eslint/js': 9.39.2
       '@eslint/plugin-kit': 0.4.1
       '@humanfs/node': 0.16.8
@@ -8436,7 +8652,7 @@ snapshots:
       ajv: 6.15.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@10.2.2)
       escape-string-regexp: 4.0.0
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -8460,8 +8676,8 @@ snapshots:
 
   espree@10.4.0:
     dependencies:
-      acorn: 8.17.0
-      acorn-jsx: 5.3.2(acorn@8.17.0)
+      acorn: 8.18.0
+      acorn-jsx: 5.3.2(acorn@8.18.0)
       eslint-visitor-keys: 4.2.1
 
   esprima@4.0.1: {}
@@ -8492,14 +8708,14 @@ snapshots:
 
   expand-template@2.0.3: {}
 
-  expect-type@1.3.0: {}
+  expect-type@1.4.0: {}
 
   expr-eval-fork@3.0.3: {}
 
   express@5.2.1(supports-color@5.5.0):
     dependencies:
       accepts: 2.0.0
-      body-parser: 2.2.2(supports-color@5.5.0)
+      body-parser: 2.3.0(supports-color@5.5.0)
       content-disposition: 1.0.1
       content-type: 1.0.5
       cookie: 0.7.2
@@ -8518,11 +8734,11 @@ snapshots:
       once: 1.4.0
       parseurl: 1.3.3
       proxy-addr: 2.0.7
-      qs: 6.15.2
+      qs: 6.15.3
       range-parser: 1.2.1
       router: 2.2.0(supports-color@5.5.0)
       send: 1.2.1(supports-color@5.5.0)
-      serve-static: 2.2.1
+      serve-static: 2.2.1(supports-color@5.5.0)
       statuses: 2.0.2
       type-is: 2.0.1
       vary: 1.1.2
@@ -8549,7 +8765,7 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-uri@3.1.3: {}
+  fast-uri@3.1.5: {}
 
   fastest-levenshtein@1.0.16: {}
 
@@ -8571,17 +8787,17 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  fdir@6.5.0(picomatch@4.0.4):
+  fdir@6.5.0(picomatch@4.0.5):
     optionalDependencies:
-      picomatch: 4.0.4
+      picomatch: 4.0.5
 
   fecha@4.2.3: {}
 
   fflate@0.8.3: {}
 
-  file-entry-cache@11.1.3:
+  file-entry-cache@11.1.5:
     dependencies:
-      flat-cache: 6.1.22
+      flat-cache: 6.1.23
 
   file-entry-cache@8.0.0:
     dependencies:
@@ -8609,20 +8825,22 @@ snapshots:
 
   flat-cache@4.0.1:
     dependencies:
-      flatted: 3.4.2
+      flatted: 3.4.4
       keyv: 4.5.4
 
-  flat-cache@6.1.22:
+  flat-cache@6.1.23:
     dependencies:
-      cacheable: 2.3.5
-      flatted: 3.4.2
+      cacheable: 2.5.0
+      flatted: 3.4.4
       hookified: 1.15.1
 
-  flatted@3.4.2: {}
+  flatted@3.4.4: {}
 
   fn.name@1.1.0: {}
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@5.5.0)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@5.5.0)
 
   for-each@0.3.5:
     dependencies:
@@ -8710,7 +8928,7 @@ snapshots:
 
   getopts@2.3.0: {}
 
-  gettext-parser@9.0.2:
+  gettext-parser@9.1.1:
     dependencies:
       content-type: 1.0.5
       encoding: 0.1.13
@@ -8761,11 +8979,11 @@ snapshots:
       define-properties: 1.2.1
       gopd: 1.2.0
 
-  globby@16.2.0:
+  globby@16.2.2:
     dependencies:
       '@sindresorhus/merge-streams': 4.0.0
       fast-glob: 3.3.3
-      ignore: 7.0.5
+      ignore: 7.0.6
       is-path-inside: 4.0.0
       slash: 5.1.0
       unicorn-magic: 0.4.0
@@ -8822,7 +9040,7 @@ snapshots:
 
   html-encoding-sniffer@6.0.0:
     dependencies:
-      '@exodus/bytes': 1.15.0
+      '@exodus/bytes': 1.15.1
     transitivePeerDependencies:
       - '@noble/hashes'
 
@@ -8855,9 +9073,9 @@ snapshots:
     dependencies:
       safer-buffer: 2.1.2
 
-  icss-utils@5.1.0(postcss@8.5.16):
+  icss-utils@5.1.0(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
   ieee754@1.2.1: {}
 
@@ -8865,7 +9083,7 @@ snapshots:
 
   ignore@5.3.2: {}
 
-  ignore@7.0.5: {}
+  ignore@7.0.6: {}
 
   immutable@3.8.3: {}
 
@@ -8900,7 +9118,7 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
       hasown: 2.0.4
-      side-channel: 1.1.0
+      side-channel: 1.1.1
 
   ipaddr.js@1.9.1: {}
 
@@ -9085,13 +9303,13 @@ snapshots:
   jju@1.4.0:
     optional: true
 
-  joi@18.2.1:
+  joi@18.2.3:
     dependencies:
       '@hapi/address': 5.1.1
       '@hapi/formula': 3.0.2
       '@hapi/hoek': 11.0.7
       '@hapi/pinpoint': 2.0.1
-      '@hapi/tlds': 1.1.4
+      '@hapi/tlds': 1.1.7
       '@hapi/topo': 6.0.2
       '@standard-schema/spec': 1.1.0
 
@@ -9109,36 +9327,32 @@ snapshots:
 
   js-tokens@4.0.0: {}
 
-  js-yaml@4.2.0:
-    dependencies:
-      argparse: 2.0.1
-
   js-yaml@4.3.0:
     dependencies:
       argparse: 2.0.1
 
-  jsdom@29.1.1(canvas@3.2.3):
+  jsdom@30.0.1(canvas@3.2.3):
     dependencies:
-      '@asamuzakjp/css-color': 5.1.11
-      '@asamuzakjp/dom-selector': 7.1.1
+      '@asamuzakjp/css-color': 6.0.5
+      '@asamuzakjp/dom-selector': 8.3.0
       '@bramus/specificity': 2.4.2
-      '@csstools/css-syntax-patches-for-csstree': 1.1.4(css-tree@3.2.1)
-      '@exodus/bytes': 1.15.0
+      '@csstools/css-syntax-patches-for-csstree': 1.1.7(css-tree@3.2.1)
+      '@exodus/bytes': 1.15.1
       css-tree: 3.2.1
       data-urls: 7.0.0
       decimal.js: 10.6.0
       html-encoding-sniffer: 6.0.0
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.5.1
+      lru-cache: 11.5.2
       parse5: 8.0.1
       saxes: 6.0.0
       symbol-tree: 3.2.4
-      tough-cookie: 6.0.1
-      undici: 7.28.0
+      tough-cookie: 6.0.2
+      undici: 8.9.0
       w3c-xmlserializer: 5.0.0
       webidl-conversions: 8.0.1
       whatwg-mimetype: 5.0.0
-      whatwg-url: 16.0.1
+      whatwg-url: 17.1.0
       xml-name-validator: 5.0.0
     optionalDependencies:
       canvas: 3.2.3
@@ -9165,6 +9379,8 @@ snapshots:
 
   json5@2.2.3: {}
 
+  jsonc-parser@3.3.1: {}
+
   jsonfile@6.2.1:
     dependencies:
       universalify: 2.0.1
@@ -9206,54 +9422,54 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lightningcss-android-arm64@1.32.0:
+  lightningcss-android-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-arm64@1.32.0:
+  lightningcss-darwin-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-x64@1.32.0:
+  lightningcss-darwin-x64@1.33.0:
     optional: true
 
-  lightningcss-freebsd-x64@1.32.0:
+  lightningcss-freebsd-x64@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
+  lightningcss-linux-arm-gnueabihf@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.32.0:
+  lightningcss-linux-arm64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.32.0:
+  lightningcss-linux-arm64-musl@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-gnu@1.32.0:
+  lightningcss-linux-x64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-musl@1.32.0:
+  lightningcss-linux-x64-musl@1.33.0:
     optional: true
 
-  lightningcss-win32-arm64-msvc@1.32.0:
+  lightningcss-win32-arm64-msvc@1.33.0:
     optional: true
 
-  lightningcss-win32-x64-msvc@1.32.0:
+  lightningcss-win32-x64-msvc@1.33.0:
     optional: true
 
-  lightningcss@1.32.0:
+  lightningcss@1.33.0:
     dependencies:
       detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-android-arm64: 1.32.0
-      lightningcss-darwin-arm64: 1.32.0
-      lightningcss-darwin-x64: 1.32.0
-      lightningcss-freebsd-x64: 1.32.0
-      lightningcss-linux-arm-gnueabihf: 1.32.0
-      lightningcss-linux-arm64-gnu: 1.32.0
-      lightningcss-linux-arm64-musl: 1.32.0
-      lightningcss-linux-x64-gnu: 1.32.0
-      lightningcss-linux-x64-musl: 1.32.0
-      lightningcss-win32-arm64-msvc: 1.32.0
-      lightningcss-win32-x64-msvc: 1.32.0
+      lightningcss-android-arm64: 1.33.0
+      lightningcss-darwin-arm64: 1.33.0
+      lightningcss-darwin-x64: 1.33.0
+      lightningcss-freebsd-x64: 1.33.0
+      lightningcss-linux-arm-gnueabihf: 1.33.0
+      lightningcss-linux-arm64-gnu: 1.33.0
+      lightningcss-linux-arm64-musl: 1.33.0
+      lightningcss-linux-x64-gnu: 1.33.0
+      lightningcss-linux-x64-musl: 1.33.0
+      lightningcss-win32-arm64-msvc: 1.33.0
+      lightningcss-win32-x64-msvc: 1.33.0
 
   lines-and-columns@1.2.4: {}
 
@@ -9303,7 +9519,7 @@ snapshots:
 
   loupe@3.2.1: {}
 
-  lru-cache@11.5.1: {}
+  lru-cache@11.5.2: {}
 
   lru-cache@5.1.1:
     dependencies:
@@ -9320,7 +9536,7 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  magicast@0.5.3:
+  magicast@0.5.4:
     dependencies:
       '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
@@ -9332,7 +9548,7 @@ snapshots:
 
   map-stream@0.0.7: {}
 
-  marked@18.0.5: {}
+  marked@18.0.9: {}
 
   math-intrinsics@1.1.0: {}
 
@@ -9346,20 +9562,20 @@ snapshots:
 
   media-typer@1.1.0: {}
 
-  memfs@4.57.6(tslib@2.8.1):
+  memfs@4.64.0(tslib@2.8.1):
     dependencies:
-      '@jsonjoy.com/fs-core': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-fsa': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-builtins': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-to-fsa': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-node-utils': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-print': 4.57.6(tslib@2.8.1)
-      '@jsonjoy.com/fs-snapshot': 4.57.6(tslib@2.8.1)
+      '@jsonjoy.com/fs-core': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-fsa': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-builtins': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-to-fsa': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-node-utils': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-print': 4.64.0(tslib@2.8.1)
+      '@jsonjoy.com/fs-snapshot': 4.64.0(tslib@2.8.1)
       '@jsonjoy.com/json-pack': 1.21.0(tslib@2.8.1)
       '@jsonjoy.com/util': 1.9.0(tslib@2.8.1)
       glob-to-regex.js: 1.2.0(tslib@2.8.1)
-      thingies: 2.6.0(tslib@2.8.1)
+      thingies: 2.6.1(tslib@2.8.1)
       tree-dump: 1.1.0(tslib@2.8.1)
       tslib: 2.8.1
 
@@ -9394,11 +9610,11 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.7
+      brace-expansion: 5.0.9
 
   minimatch@3.1.5:
     dependencies:
-      brace-expansion: 1.1.15
+      brace-expansion: 1.1.18
 
   minimist@1.2.8: {}
 
@@ -9410,7 +9626,7 @@ snapshots:
 
   mlly@1.8.2:
     dependencies:
-      acorn: 8.17.0
+      acorn: 8.18.0
       pathe: 2.0.3
       pkg-types: 1.3.1
       ufo: 1.6.4
@@ -9423,7 +9639,7 @@ snapshots:
 
   mustache@4.2.0: {}
 
-  nanoid@3.3.12: {}
+  nanoid@3.3.16: {}
 
   napi-build-utils@2.0.0: {}
 
@@ -9447,7 +9663,7 @@ snapshots:
     optionalDependencies:
       encoding: 0.1.13
 
-  node-releases@2.0.50: {}
+  node-releases@2.0.51: {}
 
   nodemon@3.1.14:
     dependencies:
@@ -9456,7 +9672,7 @@ snapshots:
       ignore-by-default: 1.0.1
       minimatch: 10.2.5
       pstree.remy: 1.1.8
-      semver: 7.8.4
+      semver: 7.8.5
       simple-update-notifier: 2.0.0
       supports-color: 5.5.0
       touch: 3.1.1
@@ -9484,7 +9700,7 @@ snapshots:
       minimatch: 3.1.5
       pidtree: 0.3.1
       read-pkg: 3.0.0
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       string.prototype.padend: 3.1.6
 
   nth-check@2.1.1:
@@ -9542,7 +9758,7 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
-  obug@2.1.3: {}
+  obug@2.1.4: {}
 
   on-finished@2.4.1:
     dependencies:
@@ -9607,33 +9823,33 @@ snapshots:
       '@oxc-parser/binding-win32-ia32-msvc': 0.127.0
       '@oxc-parser/binding-win32-x64-msvc': 0.127.0
 
-  oxc-resolver@11.20.0:
+  oxc-resolver@11.24.2:
     optionalDependencies:
-      '@oxc-resolver/binding-android-arm-eabi': 11.20.0
-      '@oxc-resolver/binding-android-arm64': 11.20.0
-      '@oxc-resolver/binding-darwin-arm64': 11.20.0
-      '@oxc-resolver/binding-darwin-x64': 11.20.0
-      '@oxc-resolver/binding-freebsd-x64': 11.20.0
-      '@oxc-resolver/binding-linux-arm-gnueabihf': 11.20.0
-      '@oxc-resolver/binding-linux-arm-musleabihf': 11.20.0
-      '@oxc-resolver/binding-linux-arm64-gnu': 11.20.0
-      '@oxc-resolver/binding-linux-arm64-musl': 11.20.0
-      '@oxc-resolver/binding-linux-ppc64-gnu': 11.20.0
-      '@oxc-resolver/binding-linux-riscv64-gnu': 11.20.0
-      '@oxc-resolver/binding-linux-riscv64-musl': 11.20.0
-      '@oxc-resolver/binding-linux-s390x-gnu': 11.20.0
-      '@oxc-resolver/binding-linux-x64-gnu': 11.20.0
-      '@oxc-resolver/binding-linux-x64-musl': 11.20.0
-      '@oxc-resolver/binding-openharmony-arm64': 11.20.0
-      '@oxc-resolver/binding-wasm32-wasi': 11.20.0
-      '@oxc-resolver/binding-win32-arm64-msvc': 11.20.0
-      '@oxc-resolver/binding-win32-x64-msvc': 11.20.0
+      '@oxc-resolver/binding-android-arm-eabi': 11.24.2
+      '@oxc-resolver/binding-android-arm64': 11.24.2
+      '@oxc-resolver/binding-darwin-arm64': 11.24.2
+      '@oxc-resolver/binding-darwin-x64': 11.24.2
+      '@oxc-resolver/binding-freebsd-x64': 11.24.2
+      '@oxc-resolver/binding-linux-arm-gnueabihf': 11.24.2
+      '@oxc-resolver/binding-linux-arm-musleabihf': 11.24.2
+      '@oxc-resolver/binding-linux-arm64-gnu': 11.24.2
+      '@oxc-resolver/binding-linux-arm64-musl': 11.24.2
+      '@oxc-resolver/binding-linux-ppc64-gnu': 11.24.2
+      '@oxc-resolver/binding-linux-riscv64-gnu': 11.24.2
+      '@oxc-resolver/binding-linux-riscv64-musl': 11.24.2
+      '@oxc-resolver/binding-linux-s390x-gnu': 11.24.2
+      '@oxc-resolver/binding-linux-x64-gnu': 11.24.2
+      '@oxc-resolver/binding-linux-x64-musl': 11.24.2
+      '@oxc-resolver/binding-openharmony-arm64': 11.24.2
+      '@oxc-resolver/binding-wasm32-wasi': 11.24.2
+      '@oxc-resolver/binding-win32-arm64-msvc': 11.24.2
+      '@oxc-resolver/binding-win32-x64-msvc': 11.24.2
 
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
 
-  p-limit@7.3.0:
+  p-limit@7.3.1:
     dependencies:
       yocto-queue: 1.2.2
 
@@ -9679,7 +9895,7 @@ snapshots:
 
   path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.5.1
+      lru-cache: 11.5.2
       minipass: 7.1.3
 
   path-to-regexp@8.4.2: {}
@@ -9705,7 +9921,7 @@ snapshots:
 
   picomatch@2.3.2: {}
 
-  picomatch@4.0.4: {}
+  picomatch@4.0.5: {}
 
   pidtree@0.3.1: {}
 
@@ -9723,11 +9939,11 @@ snapshots:
       exsolve: 1.1.0
       pathe: 2.0.3
 
-  playwright-core@1.61.1: {}
+  playwright-core@1.62.1: {}
 
-  playwright@1.61.1:
+  playwright@1.62.1:
     dependencies:
-      playwright-core: 1.61.1
+      playwright-core: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -9742,57 +9958,52 @@ snapshots:
   postcss-clean@1.2.2:
     dependencies:
       clean-css: 4.2.4
-      postcss: 8.5.16
+      postcss: 8.5.25
 
   postcss-media-query-parser@0.2.3: {}
 
-  postcss-modules-extract-imports@3.1.0(postcss@8.5.16):
+  postcss-modules-extract-imports@3.1.0(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
-  postcss-modules-local-by-default@4.2.0(postcss@8.5.16):
+  postcss-modules-local-by-default@4.2.0(postcss@8.5.25):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.5.16)
-      postcss: 8.5.16
+      icss-utils: 5.1.0(postcss@8.5.25)
+      postcss: 8.5.25
       postcss-selector-parser: 7.1.4
       postcss-value-parser: 4.2.0
 
-  postcss-modules-scope@3.2.1(postcss@8.5.16):
+  postcss-modules-scope@3.2.1(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
       postcss-selector-parser: 7.1.4
 
-  postcss-modules-values@4.0.0(postcss@8.5.16):
+  postcss-modules-values@4.0.0(postcss@8.5.25):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.5.16)
-      postcss: 8.5.16
+      icss-utils: 5.1.0(postcss@8.5.25)
+      postcss: 8.5.25
 
-  postcss-modules@9.0.0(postcss@8.5.16):
+  postcss-modules@9.0.1(postcss@8.5.25):
     dependencies:
       generic-names: 4.0.0
-      icss-utils: 5.1.0(postcss@8.5.16)
+      icss-utils: 5.1.0(postcss@8.5.25)
       lodash.camelcase: 4.3.0
-      postcss: 8.5.16
-      postcss-modules-extract-imports: 3.1.0(postcss@8.5.16)
-      postcss-modules-local-by-default: 4.2.0(postcss@8.5.16)
-      postcss-modules-scope: 3.2.1(postcss@8.5.16)
-      postcss-modules-values: 4.0.0(postcss@8.5.16)
+      postcss: 8.5.25
+      postcss-modules-extract-imports: 3.1.0(postcss@8.5.25)
+      postcss-modules-local-by-default: 4.2.0(postcss@8.5.25)
+      postcss-modules-scope: 3.2.1(postcss@8.5.25)
+      postcss-modules-values: 4.0.0(postcss@8.5.25)
       string-hash: 1.1.3
 
   postcss-resolve-nested-selector@0.1.6: {}
 
-  postcss-safe-parser@7.0.1(postcss@8.5.16):
+  postcss-safe-parser@7.0.1(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
-  postcss-scss@4.0.9(postcss@8.5.16):
+  postcss-scss@4.0.9(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
-
-  postcss-selector-parser@7.1.1:
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
+      postcss: 8.5.25
 
   postcss-selector-parser@7.1.4:
     dependencies:
@@ -9803,9 +10014,9 @@ snapshots:
 
   postcss-value-parser@4.2.0: {}
 
-  postcss@8.5.16:
+  postcss@8.5.25:
     dependencies:
-      nanoid: 3.3.12
+      nanoid: 3.3.16
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
@@ -9826,7 +10037,7 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.9.4: {}
+  prettier@3.9.6: {}
 
   pretty-format@27.5.1:
     dependencies:
@@ -9882,9 +10093,10 @@ snapshots:
     dependencies:
       hookified: 2.2.0
 
-  qs@6.15.2:
+  qs@6.15.3:
     dependencies:
-      side-channel: 1.1.0
+      es-define-property: 1.0.1
+      side-channel: 1.1.1
 
   quansync@0.2.11: {}
 
@@ -9908,19 +10120,45 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-compiler-runtime@1.0.0(react@19.2.7):
+  react-aria-components@1.20.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      '@internationalized/date': 3.12.3
+      '@internationalized/string': 3.2.10
+      '@react-types/shared': 3.36.1(react@19.2.8)
+      '@swc/helpers': 0.5.23
+      client-only: 0.0.1
+      react: 19.2.8
+      react-aria: 3.51.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      react-dom: 19.2.8(react@19.2.8)
+      react-stately: 3.49.0(react@19.2.8)
+
+  react-aria@3.51.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
+    dependencies:
+      '@internationalized/date': 3.12.3
+      '@internationalized/number': 3.6.7
+      '@internationalized/string': 3.2.10
+      '@react-types/shared': 3.36.1(react@19.2.8)
+      '@swc/helpers': 0.5.23
+      aria-hidden: 1.2.6
+      clsx: 2.1.1
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      react-stately: 3.49.0(react@19.2.8)
+      use-sync-external-store: 1.6.0(react@19.2.8)
+
+  react-compiler-runtime@1.0.0(react@19.2.8):
+    dependencies:
+      react: 19.2.8
 
   react-docgen-typescript@2.4.0(typescript@6.0.3):
     dependencies:
       typescript: 6.0.3
 
-  react-docgen@8.0.3:
+  react-docgen@8.0.3(supports-color@10.2.2):
     dependencies:
-      '@babel/core': 7.29.7
-      '@babel/traverse': 7.29.7
-      '@babel/types': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
+      '@babel/traverse': 7.29.8(supports-color@10.2.2)
+      '@babel/types': 7.29.8
       '@types/babel__core': 7.20.5
       '@types/babel__traverse': 7.28.0
       '@types/doctrine': 0.0.9
@@ -9931,14 +10169,29 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-dom@19.2.7(react@19.2.7):
+  react-docgen@8.0.3(supports-color@5.5.0):
     dependencies:
-      react: 19.2.7
+      '@babel/core': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.8(supports-color@5.5.0)
+      '@babel/types': 7.29.8
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.28.0
+      '@types/doctrine': 0.0.9
+      '@types/resolve': 1.20.6
+      doctrine: 3.0.0
+      resolve: 1.22.12
+      strip-indent: 4.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  react-dom@19.2.8(react@19.2.8):
+    dependencies:
+      react: 19.2.8
       scheduler: 0.27.0
 
-  react-error-boundary@6.1.2(react@19.2.7):
+  react-error-boundary@6.1.2(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   react-is@16.13.1: {}
 
@@ -9946,18 +10199,28 @@ snapshots:
 
   react-lifecycles-compat@3.0.4: {}
 
-  react-virtualized@9.22.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  react-stately@3.49.0(react@19.2.8):
+    dependencies:
+      '@internationalized/date': 3.12.3
+      '@internationalized/number': 3.6.7
+      '@internationalized/string': 3.2.10
+      '@react-types/shared': 3.36.1(react@19.2.8)
+      '@swc/helpers': 0.5.23
+      react: 19.2.8
+      use-sync-external-store: 1.6.0(react@19.2.8)
+
+  react-virtualized@9.22.6(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       '@babel/runtime': 7.29.7
       clsx: 1.2.1
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
       react-lifecycles-compat: 3.0.4
 
-  react@19.2.7: {}
+  react@19.2.8: {}
 
   read-pkg@3.0.0:
     dependencies:
@@ -9989,7 +10252,7 @@ snapshots:
 
   readline-sync@1.4.10: {}
 
-  recast@0.23.11:
+  recast@0.23.19:
     dependencies:
       ast-types: 0.16.1
       esprima: 4.0.1
@@ -10052,26 +10315,26 @@ snapshots:
       glob: 13.0.6
       package-json-from-dist: 1.0.1
 
-  rolldown@1.1.3:
+  rolldown@1.2.1:
     dependencies:
-      '@oxc-project/types': 0.137.0
+      '@oxc-project/types': 0.142.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.1.3
-      '@rolldown/binding-darwin-arm64': 1.1.3
-      '@rolldown/binding-darwin-x64': 1.1.3
-      '@rolldown/binding-freebsd-x64': 1.1.3
-      '@rolldown/binding-linux-arm-gnueabihf': 1.1.3
-      '@rolldown/binding-linux-arm64-gnu': 1.1.3
-      '@rolldown/binding-linux-arm64-musl': 1.1.3
-      '@rolldown/binding-linux-ppc64-gnu': 1.1.3
-      '@rolldown/binding-linux-s390x-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-musl': 1.1.3
-      '@rolldown/binding-openharmony-arm64': 1.1.3
-      '@rolldown/binding-wasm32-wasi': 1.1.3
-      '@rolldown/binding-win32-arm64-msvc': 1.1.3
-      '@rolldown/binding-win32-x64-msvc': 1.1.3
+      '@rolldown/binding-android-arm64': 1.2.1
+      '@rolldown/binding-darwin-arm64': 1.2.1
+      '@rolldown/binding-darwin-x64': 1.2.1
+      '@rolldown/binding-freebsd-x64': 1.2.1
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.1
+      '@rolldown/binding-linux-arm64-gnu': 1.2.1
+      '@rolldown/binding-linux-arm64-musl': 1.2.1
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.1
+      '@rolldown/binding-linux-s390x-gnu': 1.2.1
+      '@rolldown/binding-linux-x64-gnu': 1.2.1
+      '@rolldown/binding-linux-x64-musl': 1.2.1
+      '@rolldown/binding-openharmony-arm64': 1.2.1
+      '@rolldown/binding-wasm32-wasi': 1.2.1
+      '@rolldown/binding-win32-arm64-msvc': 1.2.1
+      '@rolldown/binding-win32-x64-msvc': 1.2.1
 
   rollup@4.61.1:
     dependencies:
@@ -10247,18 +10510,18 @@ snapshots:
       immutable: 5.1.9
       source-map-js: 1.2.1
     optionalDependencies:
-      '@parcel/watcher': 2.5.6
+      '@parcel/watcher': 2.6.0
     optional: true
 
-  sass@1.101.0:
+  sass@1.102.0:
     dependencies:
       chokidar: 5.0.0
       immutable: 5.1.9
       source-map-js: 1.2.1
     optionalDependencies:
-      '@parcel/watcher': 2.5.6
+      '@parcel/watcher': 2.6.0
 
-  sax@1.6.0: {}
+  sax@1.6.1: {}
 
   saxes@6.0.0:
     dependencies:
@@ -10275,8 +10538,6 @@ snapshots:
       lru-cache: 6.0.0
     optional: true
 
-  semver@7.8.4: {}
-
   semver@7.8.5: {}
 
   send@1.2.1(supports-color@5.5.0):
@@ -10295,7 +10556,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@2.2.1:
+  serve-static@2.2.1(supports-color@5.5.0):
     dependencies:
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -10342,9 +10603,9 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shell-quote@1.8.4: {}
+  shell-quote@1.9.0: {}
 
-  side-channel-list@1.0.0:
+  side-channel-list@1.0.1:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
@@ -10364,11 +10625,11 @@ snapshots:
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
-  side-channel@1.1.0:
+  side-channel@1.1.1:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
-      side-channel-list: 1.0.0
+      side-channel-list: 1.0.1
       side-channel-map: 1.0.1
       side-channel-weakmap: 1.0.2
 
@@ -10386,7 +10647,7 @@ snapshots:
 
   simple-update-notifier@2.0.0:
     dependencies:
-      semver: 7.8.4
+      semver: 7.8.5
 
   sirv@3.0.2:
     dependencies:
@@ -10436,38 +10697,38 @@ snapshots:
 
   statuses@2.0.2: {}
 
-  std-env@4.1.0: {}
+  std-env@4.2.0: {}
 
   stop-iteration-iterator@1.1.0:
     dependencies:
       es-errors: 1.3.0
       internal-slot: 1.1.0
 
-  storybook@10.4.6(@testing-library/dom@10.4.1)(@types/react@19.2.17)(prettier@3.9.4)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  storybook@10.5.6(@types/react@19.2.18)(prettier@3.9.6)(react@19.2.8):
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/icons': 2.0.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@storybook/icons': 2.1.0(react@19.2.8)
+      '@testing-library/dom': 10.4.1
       '@testing-library/jest-dom': 6.9.1
-      '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
+      '@testing-library/user-event': 14.6.3(@testing-library/dom@10.4.1)
       '@vitest/expect': 3.2.4
       '@vitest/spy': 3.2.4
       '@webcontainer/env': 1.1.1
       esbuild: 0.28.1
+      jsonc-parser: 3.3.1
       open: 10.2.0
       oxc-parser: 0.127.0
-      oxc-resolver: 11.20.0
-      recast: 0.23.11
-      semver: 7.8.4
-      use-sync-external-store: 1.6.0(react@19.2.7)
-      ws: 8.21.0
+      oxc-resolver: 11.24.2
+      recast: 0.23.19
+      semver: 7.8.5
+      use-sync-external-store: 1.6.0(react@19.2.8)
+      ws: 8.21.2
     optionalDependencies:
-      '@types/react': 19.2.17
-      prettier: 3.9.4
+      '@types/react': 19.2.18
+      prettier: 3.9.6
     transitivePeerDependencies:
-      - '@testing-library/dom'
       - bufferutil
       - react
-      - react-dom
       - utf-8-validate
 
   stream@0.0.3:
@@ -10491,7 +10752,7 @@ snapshots:
       get-east-asian-width: 1.6.0
       strip-ansi: 7.2.0
 
-  string-width@8.2.1:
+  string-width@8.2.2:
     dependencies:
       get-east-asian-width: 1.6.0
       strip-ansi: 7.2.0
@@ -10516,7 +10777,7 @@ snapshots:
       internal-slot: 1.1.0
       regexp.prototype.flags: 1.5.4
       set-function-name: 2.0.2
-      side-channel: 1.1.0
+      side-channel: 1.1.1
 
   string.prototype.padend@3.1.6:
     dependencies:
@@ -10583,12 +10844,12 @@ snapshots:
 
   stubborn-fs@1.2.5: {}
 
-  style-dictionary@5.4.4(tslib@2.8.1):
+  style-dictionary@5.5.0(tslib@2.8.1):
     dependencies:
       '@bundled-es-modules/deepmerge': 4.3.2
       '@bundled-es-modules/glob': 13.0.6
       '@bundled-es-modules/memfs': 4.17.0(tslib@2.8.1)
-      '@zip.js/zip.js': 2.8.26(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
+      '@zip.js/zip.js': 2.8.34(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
       chalk: 5.6.2
       change-case: 5.4.4
       colorjs.io: 0.5.2
@@ -10596,64 +10857,64 @@ snapshots:
       is-plain-obj: 4.1.0
       json5: 2.2.3
       path-unified: 0.2.0
-      prettier: 3.9.4
+      prettier: 3.9.6
       tinycolor2: 1.6.0
     transitivePeerDependencies:
       - tslib
 
-  stylelint-config-recommended-scss@17.0.1(postcss@8.5.16)(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-config-recommended-scss@17.0.1(postcss@8.5.25)(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      postcss-scss: 4.0.9(postcss@8.5.16)
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
-      stylelint-config-recommended: 18.0.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
-      stylelint-scss: 7.2.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+      postcss-scss: 4.0.9(postcss@8.5.25)
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint-config-recommended: 18.0.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
+      stylelint-scss: 7.2.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
     optionalDependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
-  stylelint-config-recommended@18.0.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-config-recommended@18.0.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
 
-  stylelint-config-standard-scss@17.0.0(postcss@8.5.16)(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-config-standard-scss@17.0.0(postcss@8.5.25)(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
-      stylelint-config-recommended-scss: 17.0.1(postcss@8.5.16)(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
-      stylelint-config-standard: 40.0.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint-config-recommended-scss: 17.0.1(postcss@8.5.25)(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
+      stylelint-config-standard: 40.0.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
     optionalDependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
-  stylelint-config-standard@40.0.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-config-standard@40.0.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
-      stylelint-config-recommended: 18.0.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3))
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint-config-recommended: 18.0.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3))
 
-  stylelint-plugin-logical-css@2.1.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-plugin-logical-css@2.1.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
 
-  stylelint-scss@7.2.0(stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3)):
+  stylelint-scss@7.2.0(stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3)):
     dependencies:
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
-      '@csstools/css-syntax-patches-for-csstree': 1.1.4(css-tree@3.2.1)
+      '@csstools/css-syntax-patches-for-csstree': 1.1.7(css-tree@3.2.1)
       '@csstools/css-tokenizer': 4.0.0
       css-tree: 3.2.1
       is-plain-object: 5.0.0
       known-css-properties: 0.37.0
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.6
-      postcss-selector-parser: 7.1.1
+      postcss-selector-parser: 7.1.4
       postcss-value-parser: 4.2.0
-      stylelint: 17.14.0(supports-color@5.5.0)(typescript@6.0.3)
+      stylelint: 17.14.1(supports-color@5.5.0)(typescript@6.0.3)
 
-  stylelint@17.14.0(supports-color@5.5.0)(typescript@6.0.3):
+  stylelint@17.14.1(supports-color@5.5.0)(typescript@6.0.3):
     dependencies:
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
-      '@csstools/css-syntax-patches-for-csstree': 1.1.6(css-tree@3.2.1)
+      '@csstools/css-syntax-patches-for-csstree': 1.1.7(css-tree@3.2.1)
       '@csstools/css-tokenizer': 4.0.0
       '@csstools/media-query-list-parser': 5.0.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      '@csstools/selector-resolve-nested': 4.0.0(postcss-selector-parser@7.1.4)
+      '@csstools/selector-resolve-nested': 4.0.1(postcss-selector-parser@7.1.4)
       '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.4)
       colord: 2.9.3
       cosmiconfig: 9.0.2(typescript@6.0.3)
@@ -10662,24 +10923,24 @@ snapshots:
       debug: 4.4.3(supports-color@5.5.0)
       fast-glob: 3.3.3
       fastest-levenshtein: 1.0.16
-      file-entry-cache: 11.1.3
+      file-entry-cache: 11.1.5
       global-modules: 2.0.0
-      globby: 16.2.0
+      globby: 16.2.2
       globjoin: 0.1.4
       html-tags: 5.1.0
-      ignore: 7.0.5
+      ignore: 7.0.6
       import-meta-resolve: 4.2.0
       mathml-tag-names: 4.0.0
       meow: 14.1.0
       micromatch: 4.0.8
       normalize-path: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.5.16
-      postcss-safe-parser: 7.0.1(postcss@8.5.16)
+      postcss: 8.5.25
+      postcss-safe-parser: 7.0.1(postcss@8.5.25)
       postcss-selector-parser: 7.1.4
       postcss-value-parser: 4.2.0
-      string-width: 8.2.1
-      supports-hyperlinks: 4.4.0
+      string-width: 8.2.2
+      supports-hyperlinks: 4.5.0
       svg-tags: 1.0.0
       table: 6.9.0
       write-file-atomic: 7.0.1
@@ -10701,7 +10962,7 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
-  supports-hyperlinks@4.4.0:
+  supports-hyperlinks@4.5.0:
     dependencies:
       has-flag: 5.0.1
       supports-color: 10.2.2
@@ -10717,12 +10978,12 @@ snapshots:
       csso: 4.2.0
       cssom: 0.5.0
       glob: 7.2.3
-      js-yaml: 4.2.0
+      js-yaml: 4.3.0
       lodash.escape: 4.0.1
       lodash.merge: 4.6.2
       mustache: 4.2.0
       prettysize: 2.0.0
-      svgo: 2.8.2
+      svgo: 2.8.3
       vinyl: 2.2.1
       winston: 3.19.0
       xpath: 0.0.34
@@ -10730,14 +10991,14 @@ snapshots:
 
   svg-tags@1.0.0: {}
 
-  svgo@2.8.2:
+  svgo@2.8.3:
     dependencies:
       commander: 7.2.0
       css-select: 4.3.0
       css-tree: 1.1.3
       csso: 4.2.0
       picocolors: 1.1.1
-      sax: 1.6.0
+      sax: 1.6.1
       stable: 0.1.8
 
   symbol-tree@3.2.4: {}
@@ -10777,7 +11038,7 @@ snapshots:
 
   text-hex@1.0.0: {}
 
-  thingies@2.6.0(tslib@2.8.1):
+  thingies@2.6.1(tslib@2.8.1):
     dependencies:
       tslib: 2.8.1
 
@@ -10791,24 +11052,24 @@ snapshots:
 
   tinycolor2@1.6.0: {}
 
-  tinyexec@1.0.2: {}
+  tinyexec@1.2.4: {}
 
   tinyglobby@0.2.17:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
 
   tinyrainbow@2.0.0: {}
 
-  tinyrainbow@3.1.0: {}
+  tinyrainbow@3.1.1: {}
 
   tinyspy@4.0.4: {}
 
-  tldts-core@7.0.22: {}
+  tldts-core@7.4.10: {}
 
-  tldts@7.0.22:
+  tldts@7.4.10:
     dependencies:
-      tldts-core: 7.0.22
+      tldts-core: 7.4.10
 
   to-regex-range@5.0.1:
     dependencies:
@@ -10820,9 +11081,9 @@ snapshots:
 
   touch@3.1.1: {}
 
-  tough-cookie@6.0.1:
+  tough-cookie@6.0.2:
     dependencies:
-      tldts: 7.0.22
+      tldts: 7.4.10
 
   tr46@0.0.3: {}
 
@@ -10869,6 +11130,12 @@ snapshots:
       media-typer: 1.1.0
       mime-types: 3.0.2
 
+  type-is@2.1.0:
+    dependencies:
+      content-type: 2.0.0
+      media-typer: 1.1.0
+      mime-types: 3.0.2
+
   typed-array-buffer@1.0.3:
     dependencies:
       call-bound: 1.0.4
@@ -10922,7 +11189,7 @@ snapshots:
 
   undici-types@8.3.0: {}
 
-  undici@7.28.0: {}
+  undici@8.9.0: {}
 
   unicorn-magic@0.4.0: {}
 
@@ -10931,36 +11198,36 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-dts@1.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.0))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.61.1)(supports-color@5.5.0)(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)):
+  unplugin-dts@1.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.2))(esbuild@0.28.1)(rolldown@1.2.1)(rollup@4.61.1)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)):
     dependencies:
       '@rollup/pluginutils': 5.4.0(rollup@4.61.1)
-      '@volar/typescript': 2.4.28
+      '@volar/typescript': 2.4.28(typescript@6.0.3)
       compare-versions: 6.1.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@10.2.2)
       kolorist: 1.8.0
       local-pkg: 1.2.1
       magic-string: 0.30.21
       typescript: 6.0.3
       unplugin: 2.3.11
     optionalDependencies:
-      '@microsoft/api-extractor': 7.56.2(@types/node@26.1.0)
+      '@microsoft/api-extractor': 7.56.2(@types/node@26.1.2)
       esbuild: 0.28.1
-      rolldown: 1.1.3
+      rolldown: 1.2.1
       rollup: 4.61.1
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
     transitivePeerDependencies:
       - supports-color
 
   unplugin@2.3.11:
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      acorn: 8.17.0
-      picomatch: 4.0.4
+      acorn: 8.18.0
+      picomatch: 4.0.5
       webpack-virtual-modules: 0.6.2
 
-  update-browserslist-db@1.2.3(browserslist@4.28.4):
+  update-browserslist-db@1.2.3(browserslist@4.28.7):
     dependencies:
-      browserslist: 4.28.4
+      browserslist: 4.28.7
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -10971,11 +11238,11 @@ snapshots:
   url@0.11.4:
     dependencies:
       punycode: 1.4.1
-      qs: 6.15.2
+      qs: 6.15.3
 
-  use-sync-external-store@1.6.0(react@19.2.7):
+  use-sync-external-store@1.6.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   util-deprecate@1.0.2: {}
 
@@ -11009,13 +11276,13 @@ snapshots:
       remove-trailing-separator: 1.1.0
       replace-ext: 1.0.1
 
-  vite-plugin-dts@5.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.0))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.61.1)(supports-color@5.5.0)(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)):
+  vite-plugin-dts@5.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.2))(esbuild@0.28.1)(rolldown@1.2.1)(rollup@4.61.1)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)):
     dependencies:
-      unplugin-dts: 1.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.0))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.61.1)(supports-color@5.5.0)(typescript@6.0.3)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
+      unplugin-dts: 1.0.3(@microsoft/api-extractor@7.56.2(@types/node@26.1.2))(esbuild@0.28.1)(rolldown@1.2.1)(rollup@4.61.1)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
     optionalDependencies:
-      '@microsoft/api-extractor': 7.56.2(@types/node@26.1.0)
+      '@microsoft/api-extractor': 7.56.2(@types/node@26.1.2)
       rollup: 4.61.1
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
     transitivePeerDependencies:
       - '@rspack/core'
       - '@vue/language-core'
@@ -11025,48 +11292,48 @@ snapshots:
       - typescript
       - webpack
 
-  vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0):
+  vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0):
     dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.16
-      rolldown: 1.1.3
+      lightningcss: 1.33.0
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.2.1
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 26.1.0
+      '@types/node': 26.1.2
       esbuild: 0.28.1
       fsevents: 2.3.3
-      sass: 1.101.0
+      sass: 1.102.0
       sass-embedded: 1.100.0
 
-  vitest@4.1.9(@types/node@26.1.0)(@vitest/browser-playwright@4.1.9)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(jsdom@29.1.1(canvas@3.2.3))(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)):
+  vitest@4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(jsdom@30.0.1(canvas@3.2.3))(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)):
     dependencies:
-      '@vitest/expect': 4.1.9
-      '@vitest/mocker': 4.1.9(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/runner': 4.1.9
-      '@vitest/snapshot': 4.1.9
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
-      es-module-lexer: 2.1.0
-      expect-type: 1.3.0
+      '@vitest/expect': 4.1.10
+      '@vitest/mocker': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/runner': 4.1.10
+      '@vitest/snapshot': 4.1.10
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      es-module-lexer: 2.3.1
+      expect-type: 1.4.0
       magic-string: 0.30.21
-      obug: 2.1.3
+      obug: 2.1.4
       pathe: 2.0.3
-      picomatch: 4.0.4
-      std-env: 4.1.0
+      picomatch: 4.0.5
+      std-env: 4.2.0
       tinybench: 2.9.0
-      tinyexec: 1.0.2
+      tinyexec: 1.2.4
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
-      vite: 8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0)
+      tinyrainbow: 3.1.1
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 26.1.0
-      '@vitest/browser-playwright': 4.1.9(playwright@1.61.1)(vite@8.1.2(@types/node@26.1.0)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.101.0))(vitest@4.1.9)
-      '@vitest/coverage-v8': 4.1.9(@vitest/browser@4.1.9)(vitest@4.1.9)
-      '@vitest/ui': 4.1.9(vitest@4.1.9)
-      jsdom: 29.1.1(canvas@3.2.3)
+      '@types/node': 26.1.2
+      '@vitest/browser-playwright': 4.1.10(playwright@1.62.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(sass-embedded@1.100.0)(sass@1.102.0))(vitest@4.1.10)
+      '@vitest/coverage-v8': 4.1.10(@vitest/browser@4.1.10)(vitest@4.1.10)
+      '@vitest/ui': 4.1.10(vitest@4.1.10)
+      jsdom: 30.0.1(canvas@3.2.3)
     transitivePeerDependencies:
       - msw
 
@@ -11076,10 +11343,10 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
-  wait-on@9.0.10(supports-color@5.5.0):
+  wait-on@9.1.0(debug@4.4.3(supports-color@5.5.0))(supports-color@5.5.0):
     dependencies:
-      axios: 1.16.1(supports-color@5.5.0)
-      joi: 18.2.1
+      axios: 1.19.0(debug@4.4.3(supports-color@5.5.0))(supports-color@5.5.0)
+      joi: 18.2.3
       lodash: 4.18.1
       minimist: 1.2.8
       rxjs: 7.8.2
@@ -11103,7 +11370,15 @@ snapshots:
 
   whatwg-url@16.0.1:
     dependencies:
-      '@exodus/bytes': 1.15.0
+      '@exodus/bytes': 1.15.1
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  whatwg-url@17.1.0:
+    dependencies:
+      '@exodus/bytes': 1.15.1
       tr46: 6.0.0
       webidl-conversions: 8.0.1
     transitivePeerDependencies:
@@ -11210,7 +11485,9 @@ snapshots:
     dependencies:
       signal-exit: 4.1.0
 
-  ws@8.21.0: {}
+  ws@8.21.1: {}
+
+  ws@8.21.2: {}
 
   wsl-utils@0.1.0:
     dependencies:
diff --git a/frontend/pnpm-workspace.yaml b/frontend/pnpm-workspace.yaml
index 51ad5db958..2c3a2c026f 100644
--- a/frontend/pnpm-workspace.yaml
+++ b/frontend/pnpm-workspace.yaml
@@ -6,7 +6,7 @@ packages:
   - "packages/ui"
 
 patchedDependencies:
-  '@zip.js/zip.js@2.8.26': patches/@zip.js__zip.js@2.8.26.patch
+  '@zip.js/zip.js@2.8.34': patches/@zip.js__zip.js@2.8.26.patch
 
 shamefullyHoist: true
 
@@ -31,3 +31,4 @@ overrides:
   postcss@<8.4.31: ^8.4.31
   postcss@<8.5.10: ^8.5.10
   yaml@>=2.0.0 <2.8.3: ^2.8.3
+  playwright@>=1.61.1 <2.0.0-0: "1.62.1"
diff --git a/frontend/resources/images/assets/nitrate-welcome-light.svg b/frontend/resources/images/assets/nitrate-welcome-light.svg
new file mode 100644
index 0000000000..2ee4fbd363
--- /dev/null
+++ b/frontend/resources/images/assets/nitrate-welcome-light.svg
@@ -0,0 +1 @@
+<svg width="242" xmlns="http://www.w3.org/2000/svg" height="371" id="screenshot-5b8199c2-509f-80e2-8008-36d5ccee8335" viewBox="8 11 242 371" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8335"><g class="frame-container-wrapper"><g class="frame-container-blur"><g class="frame-container-shadows"><g fill="none"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8335"></g><g class="frame-children"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8336" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8338"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8338"><path d="M28.221342086791992,357.556884765625L13.980985641479492,124.88574981689453C13.857328414916992,122.93103790283203,15.246732711791992,121.18415069580078,17.201810836791992,120.83600616455078L119.26345825195312,98.59668731689453C121.50857543945312,98.18750762939453,123.61172485351562,99.74469757080078,123.85501098632812,101.98011016845703L149.02529907226562,335.62384033203125L28.221342086791992,357.556884765625" style="fill: rgb(24, 24, 26); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8339"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8339"><path d="M22.772977828979492,361.37445068359375C22.772977828979492,361.37445068359375,14.967313766479492,242.020263671875,10.569974899291992,127.74994659423828C10.424711227416992,123.97467803955078,12.580839157104492,120.66663360595703,20.569974899291992,121.74994659423828C79.56997680664062,129.74993896484375,86.04812622070312,130.9998779296875,104.56997680664062,133.74993896484375C106.87393188476562,134.092041015625,107.28494262695312,135.76007080078125,107.56997680664062,139.74993896484375C112.56997680664062,209.74993896484375,113.56997680664062,225.74993896484375,123.00064086914062,371.4102783203125C123.30618286132812,376.12872314453125,123.56997680664062,379.74993896484375,116.56997680664062,378.74993896484375C52.361358642578125,369.5760498046875,22.772977828979492,361.37445068359375,22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375" style="fill: rgb(18, 186, 182); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833a"><path d="M19.435819625854492,364.592041015625L10.569974899291992,127.74994659423828C10.477811813354492,125.06580352783203,11.569974899291992,123.74994659423828,15.275297164916992,124.17627716064453C15.275297164916992,124.17627716064453,44.291778564453125,127.20825958251953,101.75466918945312,136.71759033203125C104.00003051757812,137.08917236328125,104.67654418945312,137.48529052734375,104.83767700195312,138.9976806640625C104.83767700195312,138.9976806640625,110.20156860351562,217.515869140625,119.66348266601562,374.62786865234375C119.80313110351562,376.94775390625,117.98977661132812,378.853515625,115.72427368164062,378.5458984375C51.453643798828125,369.81781005859375,19.435819625854492,364.592041015625,19.435819625854492,364.592041015625L19.435819625854492,364.592041015625L19.435819625854492,364.592041015625" style="fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833b" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833b"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3c4367-5b8199c2-509f-80e2-8008-36d5ccee833b" class="strokes"><g class="stroke-shape"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833c" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833c"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3dcb51-5b8199c2-509f-80e2-8008-36d5ccee833c" class="strokes"><g class="stroke-shape"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833d" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833d"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3e4479-5b8199c2-509f-80e2-8008-36d5ccee833d" class="strokes"><g class="stroke-shape"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8337" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833e" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8342" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8344"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8344"><path d="M85.50942993164062,261.81634521484375L85.88479614257812,276.485107421875C86.42654418945312,276.33636474609375,103.22024536132812,271.736328125,103.22024536132812,271.736328125L96.27297973632812,258.65789794921875C97.67898559570312,256.48687744140625,98.19778442382812,253.68243408203125,97.47109985351562,250.909912109375C96.15737915039062,245.89788818359375,91.26773071289062,242.87615966796875,86.55862426757812,244.1661376953125C81.84976196289062,245.4560546875,79.09304809570312,250.5723876953125,80.40676879882812,255.5843505859375C81.16250610351562,258.46771240234375,83.10183715820312,260.6923828125,85.50942993164062,261.81634521484375" style="fill: rgb(30, 30, 30); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8343" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8347"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8347"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf405f31-5b8199c2-509f-80e2-8008-36d5ccee8347" class="strokes"><g class="stroke-shape"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8348"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8348"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf41ee9c-5b8199c2-509f-80e2-8008-36d5ccee8348" class="strokes"><g class="stroke-shape"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8349"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8349"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf4204f2-5b8199c2-509f-80e2-8008-36d5ccee8349" class="strokes"><g class="stroke-shape"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833f" rx="0" ry="0" style="fill: rgb(242, 58, 229); fill-opacity: 1;"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834a"><path d="M117.41555786132812,120.83710479736328C117.41555786132812,120.83710479736328,117.43728637695312,108.54859161376953,112.41091918945312,101.52857208251953C107.55960083007812,94.75196075439453,94.40628051757812,94.82941436767578,94.40628051757812,94.82941436767578C94.40628051757812,94.82941436767578,107.55960083007812,94.75196075439453,112.40676879882812,88.13916778564453C117.59036254882812,81.06909942626953,117.39639282226562,68.83710479736328,117.39639282226562,68.83710479736328C117.39639282226562,68.83710479736328,117.50686645507812,81.00708770751953,122.40103149414062,88.14221954345703C127.11013793945312,95.00788116455078,140.40603637695312,94.84436798095703,140.40603637695312,94.84436798095703C140.40603637695312,94.84436798095703,127.45437622070312,94.75196075439453,122.40530395507812,101.53186798095703C117.32180786132812,108.35926055908203,117.41555786132812,120.83710479736328,117.41555786132812,120.83710479736328L117.41555786132812,120.83710479736328" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(200, 162, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834b"><path d="M79.89883422851562,95.22174835205078C79.89883422851562,95.22174835205078,79.92300415039062,76.55664825439453,74.36489868164062,68.89563751220703C68.99990844726562,61.500186920166016,54.454498291015625,61.584781646728516,54.454498291015625,61.584781646728516C54.454498291015625,61.584781646728516,68.99990844726562,61.500186920166016,74.36001586914062,54.283573150634766C80.09219360351562,46.567813873291016,79.87759399414062,27.9644832611084,79.87759399414062,27.9644832611084C79.87759399414062,27.9644832611084,79.99990844726562,46.500186920166016,85.41201782226562,54.286930084228516C90.61953735351562,61.779483795166016,105.32241821289062,61.601078033447266,105.32241821289062,61.601078033447266C105.32241821289062,61.601078033447266,90.99990844726562,61.500186920166016,85.41665649414062,68.89917755126953C79.79531860351562,76.35004425048828,79.89883422851562,95.22174835205078,79.89883422851562,95.22174835205078L79.89883422851562,95.22174835205078" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834c"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834c"><path d="M117.41238403320312,52.500858306884766C117.41238403320312,52.500858306884766,117.42654418945312,41.677433013916016,114.14846801757812,37.234989166259766C110.98416137695312,32.946537017822266,102.40554809570312,32.995609283447266,102.40554809570312,32.995609283447266C102.40554809570312,32.995609283447266,110.98416137695312,32.946537017822266,114.14553833007812,28.76178550720215C117.52615356445312,24.2876033782959,117.39968872070312,13.500005722045898,117.39968872070312,13.500005722045898C117.39968872070312,13.500005722045898,117.47195434570312,24.24835777282715,120.66384887695312,28.7636775970459C123.73513793945312,33.108524322509766,132.40652465820312,33.005069732666016,132.40652465820312,33.005069732666016C132.40652465820312,33.005069732666016,123.95950317382812,32.946537017822266,120.66653442382812,37.237064361572266C117.35110473632812,41.557621002197266,117.41238403320312,52.500858306884766,117.41238403320312,52.500858306884766L117.41238403320312,52.500858306884766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(24, 24, 26); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8340" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834d"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834d"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf44b652-5b8199c2-509f-80e2-8008-36d5ccee834d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834e"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834e"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf45071d-5b8199c2-509f-80e2-8008-36d5ccee834e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834f"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834f"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf454c99-5b8199c2-509f-80e2-8008-36d5ccee834f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8350"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8350"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf467c76-5b8199c2-509f-80e2-8008-36d5ccee8350" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8351"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8351"><path d="M145.72329711914062,155.92919921875C148.13980102539062,161.8565673828125,152.14321899414062,165.52490234375,154.66494750976562,164.12158203125C157.18692016601562,162.71826171875,157.27212524414062,156.77569580078125,154.85586547851562,150.8482666015625C152.43984985351562,144.92041015625,148.43545532226562,141.2525634765625,145.91421508789062,142.6556396484375C143.39224243164062,144.0592041015625,143.30703735351562,150.00201416015625,145.72329711914062,155.92919921875L145.72329711914062,155.92919921875" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8352"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8352"><path d="M209.99990844726562,144.5001220703125C208.48306274414062,151.05560302734375,210.35928344726562,154.93487548828125,212.99990844726562,155.5001220703125C215.64102172851562,156.06488037109375,220.48330688476562,153.05517578125,221.99990844726562,146.5001220703125C223.51699829101562,139.945556640625,221.64102172851562,136.06536865234375,218.99990844726562,135.5001220703125C216.35806274414062,134.93536376953125,211.51651000976562,137.945556640625,209.99990844726562,144.5001220703125L209.99990844726562,144.5001220703125" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8353"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8353"><path d="M146.57583618164062,56.821903228759766C140.68984985351562,57.666080474853516,135.99526977539062,60.835941314697266,136.09024047851562,63.902530670166016C136.18496704101562,66.96863555908203,141.03384399414062,68.77002716064453,146.91958618164062,67.92560577392578C152.80606079101562,67.08161163330078,157.50137329101562,63.911502838134766,157.40664672851562,60.845401763916016C157.31143188476562,57.779300689697266,152.46255493164062,55.977420806884766,146.57583618164062,56.821903228759766L146.57583618164062,56.821903228759766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8354"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8354"><path d="M153.79995727539062,38.550235748291016C147.76284790039062,38.552066802978516,142.72695922851562,41.126468658447266,142.55435180664062,44.300418853759766C142.38101196289062,47.473331451416016,147.13516235351562,50.045780181884766,153.17300415039062,50.043949127197266C159.21133422851562,50.042606353759766,164.24575805664062,47.468387603759766,164.41909790039062,44.294498443603516C164.59243774414062,41.120365142822266,159.83755493164062,38.548892974853516,153.79995727539062,38.550235748291016L153.79995727539062,38.550235748291016" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8355"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8355"><path d="M164.13858032226562,24.99933433532715C158.10049438476562,25.00067710876465,153.06509399414062,27.57538414001465,152.89151000976562,30.7487850189209C152.71890258789062,33.922794342041016,157.47305297851562,36.494510650634766,163.51089477539062,36.492923736572266C169.54873657226562,36.491764068603516,174.58389282226562,33.917606353759766,174.75698852539062,30.7434139251709C174.93057250976562,27.5699520111084,170.17593383789062,24.99774742126465,164.13858032226562,24.99933433532715L164.13858032226562,24.99933433532715" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8341" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8356"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8356"><path d="M100.69619750976562,233.677978515625L183.92715454101562,150.261474609375L204.49526977539062,170.879638671875L121.26431274414062,254.2960205078125L91.96450805664062,263.09771728515625L100.69619750976562,233.677978515625" style="fill: rgb(255, 255, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8357"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8357"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="84.90637585126069" y="190.4379852837294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -94.747697, 159.341948)" width="120.00028844031931" height="7.995995492221255" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8358"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8358"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="92.68080526465019" y="198.21223368774076" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -97.954455, 167.114921)" width="120.00004201562115" height="7.995991255809031" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8359"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8359"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="100.45495491702968" y="205.98651118717294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708053, -101.161377, 174.888020)" width="120.0003012917532" height="7.995991246062658" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835a"><path d="M106.61416625976562,258.69696044921875L91.96450805664062,263.09771728515625L96.33023071289062,248.38818359375L106.61416625976562,258.69696044921875" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835b"><path d="M182.35000610351562,154.132080078125C181.55728149414062,153.3372802734375,181.55288696289062,152.05126953125,182.34048461914062,151.2618408203125L183.73648071289062,149.862548828125C184.52359008789062,149.07330322265625,185.80679321289062,149.07757568359375,186.59951782226562,149.87237548828125L204.92886352539062,168.19512939453125C205.72158813476562,168.98992919921875,205.72598266601562,170.27593994140625,204.93862915039062,171.065185546875L203.54263305664062,172.4644775390625C202.75527954101562,173.25390625,201.47232055664062,173.2493896484375,200.67959594726562,172.45465087890625L182.35000610351562,154.132080078125" style="fill: rgb(24, 24, 26); fill-opacity: 1;"/></g></g></g></g></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/frontend/resources/images/assets/nitrate-welcome.svg b/frontend/resources/images/assets/nitrate-welcome.svg
index ef9296dbcc..2956031d64 100644
--- a/frontend/resources/images/assets/nitrate-welcome.svg
+++ b/frontend/resources/images/assets/nitrate-welcome.svg
@@ -1 +1 @@
-<svg width="242" xmlns="http://www.w3.org/2000/svg" height="371" id="screenshot-5b8199c2-509f-80e2-8008-36d5ccee8335" viewBox="8 11 242 371" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8335"><g class="frame-container-wrapper"><g class="frame-container-blur"><g class="frame-container-shadows"><g fill="none"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8335"></g><g class="frame-children"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8336" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8338"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8338"><path d="M28.221342086791992,357.556884765625L13.980985641479492,124.88574981689453C13.857328414916992,122.93103790283203,15.246732711791992,121.18415069580078,17.201810836791992,120.83600616455078L119.26345825195312,98.59668731689453C121.50857543945312,98.18750762939453,123.61172485351562,99.74469757080078,123.85501098632812,101.98011016845703L149.02529907226562,335.62384033203125L28.221342086791992,357.556884765625" style="fill: rgb(24, 24, 26); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8339"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8339"><path d="M22.772977828979492,361.37445068359375C22.772977828979492,361.37445068359375,14.967313766479492,242.020263671875,10.569974899291992,127.74994659423828C10.424711227416992,123.97467803955078,12.580839157104492,120.66663360595703,20.569974899291992,121.74994659423828C79.56997680664062,129.74993896484375,86.04812622070312,130.9998779296875,104.56997680664062,133.74993896484375C106.87393188476562,134.092041015625,107.28494262695312,135.76007080078125,107.56997680664062,139.74993896484375C112.56997680664062,209.74993896484375,113.56997680664062,225.74993896484375,123.00064086914062,371.4102783203125C123.30618286132812,376.12872314453125,123.56997680664062,379.74993896484375,116.56997680664062,378.74993896484375C52.361358642578125,369.5760498046875,22.772977828979492,361.37445068359375,22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375" style="fill: rgb(18, 186, 182); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833a"><path d="M19.435819625854492,364.592041015625L10.569974899291992,127.74994659423828C10.477811813354492,125.06580352783203,11.569974899291992,123.74994659423828,15.275297164916992,124.17627716064453C15.275297164916992,124.17627716064453,44.291778564453125,127.20825958251953,101.75466918945312,136.71759033203125C104.00003051757812,137.08917236328125,104.67654418945312,137.48529052734375,104.83767700195312,138.9976806640625C104.83767700195312,138.9976806640625,110.20156860351562,217.515869140625,119.66348266601562,374.62786865234375C119.80313110351562,376.94775390625,117.98977661132812,378.853515625,115.72427368164062,378.5458984375C51.453643798828125,369.81781005859375,19.435819625854492,364.592041015625,19.435819625854492,364.592041015625L19.435819625854492,364.592041015625L19.435819625854492,364.592041015625" style="fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833b" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833b"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3c4367-5b8199c2-509f-80e2-8008-36d5ccee833b" class="strokes"><g class="stroke-shape"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833c" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833c"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3dcb51-5b8199c2-509f-80e2-8008-36d5ccee833c" class="strokes"><g class="stroke-shape"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833d" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833d"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3e4479-5b8199c2-509f-80e2-8008-36d5ccee833d" class="strokes"><g class="stroke-shape"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8337" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833e" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8342" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8344"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8344"><path d="M85.50942993164062,261.81634521484375L85.88479614257812,276.485107421875C86.42654418945312,276.33636474609375,103.22024536132812,271.736328125,103.22024536132812,271.736328125L96.27297973632812,258.65789794921875C97.67898559570312,256.48687744140625,98.19778442382812,253.68243408203125,97.47109985351562,250.909912109375C96.15737915039062,245.89788818359375,91.26773071289062,242.87615966796875,86.55862426757812,244.1661376953125C81.84976196289062,245.4560546875,79.09304809570312,250.5723876953125,80.40676879882812,255.5843505859375C81.16250610351562,258.46771240234375,83.10183715820312,260.6923828125,85.50942993164062,261.81634521484375" style="fill: rgb(30, 30, 30); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8343" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8347"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8347"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf405f31-5b8199c2-509f-80e2-8008-36d5ccee8347" class="strokes"><g class="stroke-shape"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8348"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8348"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf41ee9c-5b8199c2-509f-80e2-8008-36d5ccee8348" class="strokes"><g class="stroke-shape"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8349"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8349"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf4204f2-5b8199c2-509f-80e2-8008-36d5ccee8349" class="strokes"><g class="stroke-shape"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833f" rx="0" ry="0" style="fill: rgb(242, 58, 229); fill-opacity: 1;"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834a"><path d="M117.41555786132812,120.83710479736328C117.41555786132812,120.83710479736328,117.43728637695312,108.54859161376953,112.41091918945312,101.52857208251953C107.55960083007812,94.75196075439453,94.40628051757812,94.82941436767578,94.40628051757812,94.82941436767578C94.40628051757812,94.82941436767578,107.55960083007812,94.75196075439453,112.40676879882812,88.13916778564453C117.59036254882812,81.06909942626953,117.39639282226562,68.83710479736328,117.39639282226562,68.83710479736328C117.39639282226562,68.83710479736328,117.50686645507812,81.00708770751953,122.40103149414062,88.14221954345703C127.11013793945312,95.00788116455078,140.40603637695312,94.84436798095703,140.40603637695312,94.84436798095703C140.40603637695312,94.84436798095703,127.45437622070312,94.75196075439453,122.40530395507812,101.53186798095703C117.32180786132812,108.35926055908203,117.41555786132812,120.83710479736328,117.41555786132812,120.83710479736328L117.41555786132812,120.83710479736328" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(200, 162, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834b"><path d="M79.89883422851562,95.22174835205078C79.89883422851562,95.22174835205078,79.92300415039062,76.55664825439453,74.36489868164062,68.89563751220703C68.99990844726562,61.500186920166016,54.454498291015625,61.584781646728516,54.454498291015625,61.584781646728516C54.454498291015625,61.584781646728516,68.99990844726562,61.500186920166016,74.36001586914062,54.283573150634766C80.09219360351562,46.567813873291016,79.87759399414062,27.9644832611084,79.87759399414062,27.9644832611084C79.87759399414062,27.9644832611084,79.99990844726562,46.500186920166016,85.41201782226562,54.286930084228516C90.61953735351562,61.779483795166016,105.32241821289062,61.601078033447266,105.32241821289062,61.601078033447266C105.32241821289062,61.601078033447266,90.99990844726562,61.500186920166016,85.41665649414062,68.89917755126953C79.79531860351562,76.35004425048828,79.89883422851562,95.22174835205078,79.89883422851562,95.22174835205078L79.89883422851562,95.22174835205078" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834c"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834c"><path d="M117.41238403320312,52.500858306884766C117.41238403320312,52.500858306884766,117.42654418945312,41.677433013916016,114.14846801757812,37.234989166259766C110.98416137695312,32.946537017822266,102.40554809570312,32.995609283447266,102.40554809570312,32.995609283447266C102.40554809570312,32.995609283447266,110.98416137695312,32.946537017822266,114.14553833007812,28.76178550720215C117.52615356445312,24.2876033782959,117.39968872070312,13.500005722045898,117.39968872070312,13.500005722045898C117.39968872070312,13.500005722045898,117.47195434570312,24.24835777282715,120.66384887695312,28.7636775970459C123.73513793945312,33.108524322509766,132.40652465820312,33.005069732666016,132.40652465820312,33.005069732666016C132.40652465820312,33.005069732666016,123.95950317382812,32.946537017822266,120.66653442382812,37.237064361572266C117.35110473632812,41.557621002197266,117.41238403320312,52.500858306884766,117.41238403320312,52.500858306884766L117.41238403320312,52.500858306884766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(249, 249, 251); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8340" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834d"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834d"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf44b652-5b8199c2-509f-80e2-8008-36d5ccee834d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834e"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834e"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf45071d-5b8199c2-509f-80e2-8008-36d5ccee834e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834f"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834f"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf454c99-5b8199c2-509f-80e2-8008-36d5ccee834f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8350"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8350"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf467c76-5b8199c2-509f-80e2-8008-36d5ccee8350" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8351"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8351"><path d="M145.72329711914062,155.92919921875C148.13980102539062,161.8565673828125,152.14321899414062,165.52490234375,154.66494750976562,164.12158203125C157.18692016601562,162.71826171875,157.27212524414062,156.77569580078125,154.85586547851562,150.8482666015625C152.43984985351562,144.92041015625,148.43545532226562,141.2525634765625,145.91421508789062,142.6556396484375C143.39224243164062,144.0592041015625,143.30703735351562,150.00201416015625,145.72329711914062,155.92919921875L145.72329711914062,155.92919921875" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8352"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8352"><path d="M209.99990844726562,144.5001220703125C208.48306274414062,151.05560302734375,210.35928344726562,154.93487548828125,212.99990844726562,155.5001220703125C215.64102172851562,156.06488037109375,220.48330688476562,153.05517578125,221.99990844726562,146.5001220703125C223.51699829101562,139.945556640625,221.64102172851562,136.06536865234375,218.99990844726562,135.5001220703125C216.35806274414062,134.93536376953125,211.51651000976562,137.945556640625,209.99990844726562,144.5001220703125L209.99990844726562,144.5001220703125" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8353"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8353"><path d="M146.57583618164062,56.821903228759766C140.68984985351562,57.666080474853516,135.99526977539062,60.835941314697266,136.09024047851562,63.902530670166016C136.18496704101562,66.96863555908203,141.03384399414062,68.77002716064453,146.91958618164062,67.92560577392578C152.80606079101562,67.08161163330078,157.50137329101562,63.911502838134766,157.40664672851562,60.845401763916016C157.31143188476562,57.779300689697266,152.46255493164062,55.977420806884766,146.57583618164062,56.821903228759766L146.57583618164062,56.821903228759766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8354"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8354"><path d="M153.79995727539062,38.550235748291016C147.76284790039062,38.552066802978516,142.72695922851562,41.126468658447266,142.55435180664062,44.300418853759766C142.38101196289062,47.473331451416016,147.13516235351562,50.045780181884766,153.17300415039062,50.043949127197266C159.21133422851562,50.042606353759766,164.24575805664062,47.468387603759766,164.41909790039062,44.294498443603516C164.59243774414062,41.120365142822266,159.83755493164062,38.548892974853516,153.79995727539062,38.550235748291016L153.79995727539062,38.550235748291016" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8355"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8355"><path d="M164.13858032226562,24.99933433532715C158.10049438476562,25.00067710876465,153.06509399414062,27.57538414001465,152.89151000976562,30.7487850189209C152.71890258789062,33.922794342041016,157.47305297851562,36.494510650634766,163.51089477539062,36.492923736572266C169.54873657226562,36.491764068603516,174.58389282226562,33.917606353759766,174.75698852539062,30.7434139251709C174.93057250976562,27.5699520111084,170.17593383789062,24.99774742126465,164.13858032226562,24.99933433532715L164.13858032226562,24.99933433532715" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8341" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8356"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8356"><path d="M100.69619750976562,233.677978515625L183.92715454101562,150.261474609375L204.49526977539062,170.879638671875L121.26431274414062,254.2960205078125L91.96450805664062,263.09771728515625L100.69619750976562,233.677978515625" style="fill: rgb(255, 255, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8357"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8357"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="84.90637585126069" y="190.4379852837294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -94.747697, 159.341948)" width="120.00028844031931" height="7.995995492221255" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8358"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8358"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="92.68080526465019" y="198.21223368774076" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -97.954455, 167.114921)" width="120.00004201562115" height="7.995991255809031" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8359"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8359"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="100.45495491702968" y="205.98651118717294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708053, -101.161377, 174.888020)" width="120.0003012917532" height="7.995991246062658" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835a"><path d="M106.61416625976562,258.69696044921875L91.96450805664062,263.09771728515625L96.33023071289062,248.38818359375L106.61416625976562,258.69696044921875" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835b"><path d="M182.35000610351562,154.132080078125C181.55728149414062,153.3372802734375,181.55288696289062,152.05126953125,182.34048461914062,151.2618408203125L183.73648071289062,149.862548828125C184.52359008789062,149.07330322265625,185.80679321289062,149.07757568359375,186.59951782226562,149.87237548828125L204.92886352539062,168.19512939453125C205.72158813476562,168.98992919921875,205.72598266601562,170.27593994140625,204.93862915039062,171.065185546875L203.54263305664062,172.4644775390625C202.75527954101562,173.25390625,201.47232055664062,173.2493896484375,200.67959594726562,172.45465087890625L182.35000610351562,154.132080078125" style="fill: rgb(24, 24, 26); fill-opacity: 1;"/></g></g></g></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg width="242" xmlns="http://www.w3.org/2000/svg" height="371" id="screenshot-5b8199c2-509f-80e2-8008-36d5ccee8335" viewBox="8 11 242 371" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8335"><g class="frame-container-wrapper"><g class="frame-container-blur"><g class="frame-container-shadows"><g fill="none"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8335"></g><g class="frame-children"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8336" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8338"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8338"><path d="M28.221342086791992,357.556884765625L13.980985641479492,124.88574981689453C13.857328414916992,122.93103790283203,15.246732711791992,121.18415069580078,17.201810836791992,120.83600616455078L119.26345825195312,98.59668731689453C121.50857543945312,98.18750762939453,123.61172485351562,99.74469757080078,123.85501098632812,101.98011016845703L149.02529907226562,335.62384033203125L28.221342086791992,357.556884765625" style="fill: rgb(249, 249, 251); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8339"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8339"><path d="M22.772977828979492,361.37445068359375C22.772977828979492,361.37445068359375,14.967313766479492,242.020263671875,10.569974899291992,127.74994659423828C10.424711227416992,123.97467803955078,12.580839157104492,120.66663360595703,20.569974899291992,121.74994659423828C79.56997680664062,129.74993896484375,86.04812622070312,130.9998779296875,104.56997680664062,133.74993896484375C106.87393188476562,134.092041015625,107.28494262695312,135.76007080078125,107.56997680664062,139.74993896484375C112.56997680664062,209.74993896484375,113.56997680664062,225.74993896484375,123.00064086914062,371.4102783203125C123.30618286132812,376.12872314453125,123.56997680664062,379.74993896484375,116.56997680664062,378.74993896484375C52.361358642578125,369.5760498046875,22.772977828979492,361.37445068359375,22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375L22.772977828979492,361.37445068359375" style="fill: rgb(18, 186, 182); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833a"><path d="M19.435819625854492,364.592041015625L10.569974899291992,127.74994659423828C10.477811813354492,125.06580352783203,11.569974899291992,123.74994659423828,15.275297164916992,124.17627716064453C15.275297164916992,124.17627716064453,44.291778564453125,127.20825958251953,101.75466918945312,136.71759033203125C104.00003051757812,137.08917236328125,104.67654418945312,137.48529052734375,104.83767700195312,138.9976806640625C104.83767700195312,138.9976806640625,110.20156860351562,217.515869140625,119.66348266601562,374.62786865234375C119.80313110351562,376.94775390625,117.98977661132812,378.853515625,115.72427368164062,378.5458984375C51.453643798828125,369.81781005859375,19.435819625854492,364.592041015625,19.435819625854492,364.592041015625L19.435819625854492,364.592041015625L19.435819625854492,364.592041015625" style="fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833b" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833b"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3c4367-5b8199c2-509f-80e2-8008-36d5ccee833b" class="strokes"><g class="stroke-shape"><path d="M33.406280517578125,186.83709716796875C30.601835250854492,186.27618408203125,27.627103805541992,185.8248291015625,27.406278610229492,183.83709716796875C26.406278610229492,174.83709716796875,26.406278610229492,157.83709716796875,25.735624313354492,146.30279541015625C25.675809860229492,144.825927734375,27.004423141479492,143.53533935546875,28.866727828979492,143.25836181640625L89.60855102539062,152.04388427734375C90.66006469726562,151.88677978515625,91.66116333007812,152.46209716796875,91.77163696289062,153.29412841796875C91.77163696289062,153.29412841796875,94.40628051757812,176.83709716796875,94.94155883789062,194.0987548828125C94.98135375976562,195.3829345703125,93.75723266601562,196.42645263671875,92.16519165039062,196.26043701171875C75.40628051757812,193.83709716796875,38.406280517578125,187.83709716796875,33.406280517578125,186.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833c" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833c"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3dcb51-5b8199c2-509f-80e2-8008-36d5ccee833c" class="strokes"><g class="stroke-shape"><path d="M93.40628051757812,211.83709716796875C94.40628051757812,211.83709716796875,95.02932739257812,211.88995361328125,95.40628051757812,214.83709716796875L97.52713012695312,292.4794921875C97.58694458007812,293.95635986328125,96.25833129882812,295.2469482421875,94.39602661132812,295.52392578125L33.654205322265625,286.73846435546875C32.602691650390625,286.89556884765625,31.601591110229492,286.3201904296875,31.491117477416992,285.48822021484375C31.491117477416992,285.48822021484375,28.856473922729492,221.94525146484375,28.321195602416992,204.68353271484375C28.281400680541992,203.3994140625,29.517362594604492,202.2666015625,31.097562789916992,202.5218505859375C48.406280517578125,204.83709716796875,75.40628051757812,208.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875C93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875,93.40628051757812,211.83709716796875" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833d" style="opacity: 0.1;"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee833d"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf3e4479-5b8199c2-509f-80e2-8008-36d5ccee833d" class="strokes"><g class="stroke-shape"><path d="M35.539215087890625,344.70855712890625L32.735626220703125,304.302734375C32.675811767578125,302.82586669921875,33.004425048828125,302.5352783203125,34.866729736328125,302.25830078125L96.60855102539062,310.0438232421875C97.66006469726562,309.88671875,98.66116333007812,310.4620361328125,98.77163696289062,311.2940673828125C98.77163696289062,311.2940673828125,101.40628051757812,336.8370361328125,101.94155883789062,354.09869384765625C101.98135375976562,355.38287353515625,100.74722290039062,356.50372314453125,99.16519165039062,356.2603759765625C57.406280517578125,349.8370361328125,35.539215087890625,344.70855712890625,35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625L35.539215087890625,344.70855712890625" style="fill: none; stroke-width: 3; stroke: rgb(0, 0, 0); stroke-opacity: 1;"/></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8337" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833e" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8342" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8344"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8344"><path d="M85.50942993164062,261.81634521484375L85.88479614257812,276.485107421875C86.42654418945312,276.33636474609375,103.22024536132812,271.736328125,103.22024536132812,271.736328125L96.27297973632812,258.65789794921875C97.67898559570312,256.48687744140625,98.19778442382812,253.68243408203125,97.47109985351562,250.909912109375C96.15737915039062,245.89788818359375,91.26773071289062,242.87615966796875,86.55862426757812,244.1661376953125C81.84976196289062,245.4560546875,79.09304809570312,250.5723876953125,80.40676879882812,255.5843505859375C81.16250610351562,258.46771240234375,83.10183715820312,260.6923828125,85.50942993164062,261.81634521484375" style="fill: rgb(30, 30, 30); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8343" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8347"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8347"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf405f31-5b8199c2-509f-80e2-8008-36d5ccee8347" class="strokes"><g class="stroke-shape"><path d="M58.741241455078125,239.13427734375L70.00430297851562,243.940673828125" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8348"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8348"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf41ee9c-5b8199c2-509f-80e2-8008-36d5ccee8348" class="strokes"><g class="stroke-shape"><path d="M76.04678344726562,221.35076904296875L81.28994750976562,232.5438232421875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8349"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8349"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875"/></g><g id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf4204f2-5b8199c2-509f-80e2-8008-36d5ccee8349" class="strokes"><g class="stroke-shape"><path d="M56.820587158203125,264.14532470703125L68.81509399414062,262.08807373046875" style="fill: none; stroke-width: 4.43525; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee833f" rx="0" ry="0" style="fill: rgb(242, 58, 229); fill-opacity: 1;"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834a"><path d="M117.41555786132812,120.83710479736328C117.41555786132812,120.83710479736328,117.43728637695312,108.54859161376953,112.41091918945312,101.52857208251953C107.55960083007812,94.75196075439453,94.40628051757812,94.82941436767578,94.40628051757812,94.82941436767578C94.40628051757812,94.82941436767578,107.55960083007812,94.75196075439453,112.40676879882812,88.13916778564453C117.59036254882812,81.06909942626953,117.39639282226562,68.83710479736328,117.39639282226562,68.83710479736328C117.39639282226562,68.83710479736328,117.50686645507812,81.00708770751953,122.40103149414062,88.14221954345703C127.11013793945312,95.00788116455078,140.40603637695312,94.84436798095703,140.40603637695312,94.84436798095703C140.40603637695312,94.84436798095703,127.45437622070312,94.75196075439453,122.40530395507812,101.53186798095703C117.32180786132812,108.35926055908203,117.41555786132812,120.83710479736328,117.41555786132812,120.83710479736328L117.41555786132812,120.83710479736328" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(200, 162, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834b"><path d="M79.89883422851562,95.22174835205078C79.89883422851562,95.22174835205078,79.92300415039062,76.55664825439453,74.36489868164062,68.89563751220703C68.99990844726562,61.500186920166016,54.454498291015625,61.584781646728516,54.454498291015625,61.584781646728516C54.454498291015625,61.584781646728516,68.99990844726562,61.500186920166016,74.36001586914062,54.283573150634766C80.09219360351562,46.567813873291016,79.87759399414062,27.9644832611084,79.87759399414062,27.9644832611084C79.87759399414062,27.9644832611084,79.99990844726562,46.500186920166016,85.41201782226562,54.286930084228516C90.61953735351562,61.779483795166016,105.32241821289062,61.601078033447266,105.32241821289062,61.601078033447266C105.32241821289062,61.601078033447266,90.99990844726562,61.500186920166016,85.41665649414062,68.89917755126953C79.79531860351562,76.35004425048828,79.89883422851562,95.22174835205078,79.89883422851562,95.22174835205078L79.89883422851562,95.22174835205078" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834c"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834c"><path d="M117.41238403320312,52.500858306884766C117.41238403320312,52.500858306884766,117.42654418945312,41.677433013916016,114.14846801757812,37.234989166259766C110.98416137695312,32.946537017822266,102.40554809570312,32.995609283447266,102.40554809570312,32.995609283447266C102.40554809570312,32.995609283447266,110.98416137695312,32.946537017822266,114.14553833007812,28.76178550720215C117.52615356445312,24.2876033782959,117.39968872070312,13.500005722045898,117.39968872070312,13.500005722045898C117.39968872070312,13.500005722045898,117.47195434570312,24.24835777282715,120.66384887695312,28.7636775970459C123.73513793945312,33.108524322509766,132.40652465820312,33.005069732666016,132.40652465820312,33.005069732666016C132.40652465820312,33.005069732666016,123.95950317382812,32.946537017822266,120.66653442382812,37.237064361572266C117.35110473632812,41.557621002197266,117.41238403320312,52.500858306884766,117.41238403320312,52.500858306884766L117.41238403320312,52.500858306884766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(249, 249, 251); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8340" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834d"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834d"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf44b652-5b8199c2-509f-80e2-8008-36d5ccee834d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M194.98648071289062,56.186893463134766C194.98648071289062,56.186893463134766,171.71939086914062,33.890872955322266,150.82070922851562,37.737247467041016C143.64419555664062,39.057682037353516,141.09609985351562,42.933841705322266,140.05239868164062,46.540958404541016C138.78457641601562,50.924198150634766,141.59121704101562,56.083744049072266,141.59121704101562,56.083744049072266" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834e"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834e"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf45071d-5b8199c2-509f-80e2-8008-36d5ccee834e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M168.86978149414062,96.43701934814453C168.86978149414062,96.43701934814453,166.28872680664062,88.10431671142578,154.28848266601562,83.94879913330078C142.28799438476562,79.79376983642578,131.94790649414062,81.10944366455078,133.72695922851562,66.85218048095703C135.50552368164062,52.594181060791016,158.12368774414062,56.147403717041016,158.12368774414062,56.147403717041016C158.12368774414062,56.147403717041016,179.83755493164062,58.728763580322266,190.71865844726562,72.07062530517578" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee834f"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee834f"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf454c99-5b8199c2-509f-80e2-8008-36d5ccee834f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M151.03237915039062,37.107242584228516C151.03237915039062,37.107242584228516,148.39102172851562,30.5869197845459,153.56948852539062,27.15497398376465C156.96817016601562,24.90204429626465,163.35391235351562,22.2002010345459,175.99697875976562,24.69354820251465C195.24111938476562,28.48798179626465,204.64028930664062,32.892032623291016,217.49282836914062,41.439456939697266C217.49282836914062,41.439456939697266,229.21231079101562,49.026126861572266,238.01138305664062,61.197025299072266C245.58218383789062,71.66876983642578,247.87783813476562,78.75116729736328,247.87783813476562,78.75116729736328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8350"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8350"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-6b3b30b6-c1cd-80ca-8008-5b1cdf467c76-5b8199c2-509f-80e2-8008-36d5ccee8350" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M234.94839477539062,123.28711700439453C234.94839477539062,123.28711700439453,220.62734985351562,167.48272705078125,207.08120727539062,153.0997314453125C201.78506469726562,147.47705078125,207.13003540039062,141.18646240234375,206.90811157226562,133.22015380859375C206.67715454101562,124.93671417236328,201.08218383789062,119.59735870361328,187.40176391601562,116.52735137939453C168.59927368164062,112.30823516845703,159.26480102539062,129.9432373046875,162.85928344726562,140.75567626953125C166.11318969726562,150.54412841796875,164.26748657226562,158.31671142578125,158.87466430664062,163.0218505859375C157.15811157226562,164.52020263671875,150.65811157226562,167.912109375,145.73672485351562,158.92138671875C140.81484985351562,149.9312744140625,135.20376586914062,132.6365966796875,145.62759399414062,115.81848907470703C153.13491821289062,103.70648956298828,164.98428344726562,96.35840606689453,178.83901977539062,92.52997589111328" style="fill: none; stroke-width: 3; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8351"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8351"><path d="M145.72329711914062,155.92919921875C148.13980102539062,161.8565673828125,152.14321899414062,165.52490234375,154.66494750976562,164.12158203125C157.18692016601562,162.71826171875,157.27212524414062,156.77569580078125,154.85586547851562,150.8482666015625C152.43984985351562,144.92041015625,148.43545532226562,141.2525634765625,145.91421508789062,142.6556396484375C143.39224243164062,144.0592041015625,143.30703735351562,150.00201416015625,145.72329711914062,155.92919921875L145.72329711914062,155.92919921875" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8352"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8352"><path d="M209.99990844726562,144.5001220703125C208.48306274414062,151.05560302734375,210.35928344726562,154.93487548828125,212.99990844726562,155.5001220703125C215.64102172851562,156.06488037109375,220.48330688476562,153.05517578125,221.99990844726562,146.5001220703125C223.51699829101562,139.945556640625,221.64102172851562,136.06536865234375,218.99990844726562,135.5001220703125C216.35806274414062,134.93536376953125,211.51651000976562,137.945556640625,209.99990844726562,144.5001220703125L209.99990844726562,144.5001220703125" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8353"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8353"><path d="M146.57583618164062,56.821903228759766C140.68984985351562,57.666080474853516,135.99526977539062,60.835941314697266,136.09024047851562,63.902530670166016C136.18496704101562,66.96863555908203,141.03384399414062,68.77002716064453,146.91958618164062,67.92560577392578C152.80606079101562,67.08161163330078,157.50137329101562,63.911502838134766,157.40664672851562,60.845401763916016C157.31143188476562,57.779300689697266,152.46255493164062,55.977420806884766,146.57583618164062,56.821903228759766L146.57583618164062,56.821903228759766" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8354"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8354"><path d="M153.79995727539062,38.550235748291016C147.76284790039062,38.552066802978516,142.72695922851562,41.126468658447266,142.55435180664062,44.300418853759766C142.38101196289062,47.473331451416016,147.13516235351562,50.045780181884766,153.17300415039062,50.043949127197266C159.21133422851562,50.042606353759766,164.24575805664062,47.468387603759766,164.41909790039062,44.294498443603516C164.59243774414062,41.120365142822266,159.83755493164062,38.548892974853516,153.79995727539062,38.550235748291016L153.79995727539062,38.550235748291016" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8355"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8355"><path d="M164.13858032226562,24.99933433532715C158.10049438476562,25.00067710876465,153.06509399414062,27.57538414001465,152.89151000976562,30.7487850189209C152.71890258789062,33.922794342041016,157.47305297851562,36.494510650634766,163.51089477539062,36.492923736572266C169.54873657226562,36.491764068603516,174.58389282226562,33.917606353759766,174.75698852539062,30.7434139251709C174.93057250976562,27.5699520111084,170.17593383789062,24.99774742126465,164.13858032226562,24.99933433532715L164.13858032226562,24.99933433532715" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8341" rx="0" ry="0"><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8356"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8356"><path d="M100.69619750976562,233.677978515625L183.92715454101562,150.261474609375L204.49526977539062,170.879638671875L121.26431274414062,254.2960205078125L91.96450805664062,263.09771728515625L100.69619750976562,233.677978515625" style="fill: rgb(255, 255, 255); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8357"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8357"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="84.90637585126069" y="190.4379852837294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -94.747697, 159.341948)" width="120.00028844031931" height="7.995995492221255" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8358"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8358"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="92.68080526465019" y="198.21223368774076" transform="matrix(0.706328, -0.707884, 0.706159, 0.708054, -97.954455, 167.114921)" width="120.00004201562115" height="7.995991255809031" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee8359"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee8359"><rect rx="1.9202647889057114" ry="1.9202647889057114" x="100.45495491702968" y="205.98651118717294" transform="matrix(0.706328, -0.707884, 0.706159, 0.708053, -101.161377, 174.888020)" width="120.0003012917532" height="7.995991246062658" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835a"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835a"><path d="M106.61416625976562,258.69696044921875L91.96450805664062,263.09771728515625L96.33023071289062,248.38818359375L106.61416625976562,258.69696044921875" style="fill: rgb(242, 58, 229); fill-opacity: 1;"/></g></g><g id="shape-5b8199c2-509f-80e2-8008-36d5ccee835b"><g class="fills" id="fills-5b8199c2-509f-80e2-8008-36d5ccee835b"><path d="M182.35000610351562,154.132080078125C181.55728149414062,153.3372802734375,181.55288696289062,152.05126953125,182.34048461914062,151.2618408203125L183.73648071289062,149.862548828125C184.52359008789062,149.07330322265625,185.80679321289062,149.07757568359375,186.59951782226562,149.87237548828125L204.92886352539062,168.19512939453125C205.72158813476562,168.98992919921875,205.72598266601562,170.27593994140625,204.93862915039062,171.065185546875L203.54263305664062,172.4644775390625C202.75527954101562,173.25390625,201.47232055664062,173.2493896484375,200.67959594726562,172.45465087890625L182.35000610351562,154.132080078125" style="fill: rgb(249, 249, 251); fill-opacity: 1;"/></g></g></g></g></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/frontend/resources/images/form/slide-final-team.svg b/frontend/resources/images/form/slide-final-team.svg
index 48f2611188..63f817d00b 100644
--- a/frontend/resources/images/form/slide-final-team.svg
+++ b/frontend/resources/images/form/slide-final-team.svg
@@ -1 +1 @@
-<svg width="458" xmlns="http://www.w3.org/2000/svg" height="226" id="screenshot-8af6a589-27c7-808d-8007-67be2c637aed" viewBox="0 0 458 226" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-8af6a589-27c7-808d-8007-67be2c637aed"><defs><clipPath id="frame-clip-8af6a589-27c7-808d-8007-67be2c637aed-render-1" class="frame-clip frame-clip-def"><rect rx="0" ry="0" x="0" y="0" width="458" height="226" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"/></clipPath></defs><g class="frame-container-wrapper"><g class="frame-container-blur"><g class="frame-container-shadows"><g clip-path="url(#frame-clip-8af6a589-27c7-808d-8007-67be2c637aed-render-1)" fill="none"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67be2c637aed"><rect rx="0" ry="0" x="0" y="0" width="458" height="226" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" class="frame-background"/></g><g class="frame-children"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d126b" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d126c" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d126d"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d126d"><path d="M194.12115478515625,77.82977294921875C195.1409912109375,78.36700439453125,195.53375244140625,79.63104248046875,194.9970703125,80.6531982421875C194.46038818359375,81.67529296875,193.1978759765625,82.06829833984375,192.1768798828125,81.53009033203125C191.15594482421875,80.992919921875,190.76434326171875,79.72882080078125,191.3009033203125,78.70770263671875C191.83758544921875,77.6856689453125,193.10009765625,77.2926025390625,194.12115478515625,77.82977294921875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(74, 207, 203);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d126e"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d126e"><path d="M166,131.954345703125C165.970458984375,132.01214599609375,167.6259765625,128.82861328125,167.6259765625,128.82861328125L175.58050537109375,113.52740478515625C175.58050537109375,113.52740478515625,190.66925048828125,84.5047607421875,192.4527587890625,81.07427978515625" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd945ee8b9-8af6a589-27c7-808d-8007-67bdbb1d126e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M166,131.954345703125C165.970458984375,132.01214599609375,167.6259765625,128.82861328125,167.6259765625,128.82861328125L175.58050537109375,113.52740478515625C175.58050537109375,113.52740478515625,190.66925048828125,84.5047607421875,192.4527587890625,81.07427978515625" style="fill: none; stroke-width: 0.597491; stroke: rgb(74, 207, 203); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d126f"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d126f"><path d="M207.00244140625,160.53076171875C186.0748291015625,159.06134033203125,165.759765625,134.6412353515625,179.57257080078125,109.7744140625C195.0296630859375,81.94488525390625,218.725341796875,97.6492919921875,218.725341796875,97.6492919921875C218.725341796875,97.6492919921875,254.13812255859375,121.72479248046875,259.9769287109375,89.4381103515625" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd945ff325-8af6a589-27c7-808d-8007-67bdbb1d126f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M207.00244140625,160.53076171875C186.0748291015625,159.06134033203125,165.759765625,134.6412353515625,179.57257080078125,109.7744140625C195.0296630859375,81.94488525390625,218.725341796875,97.6492919921875,218.725341796875,97.6492919921875C218.725341796875,97.6492919921875,254.13812255859375,121.72479248046875,259.9769287109375,89.4381103515625" style="fill: none; stroke-width: 2.99042; stroke: rgb(74, 207, 203); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1270" style="opacity: 1;"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1270"><path d="M199.17169189453125,178.39996337890625L220.7369384765625,177.9161376953125C220.7369384765625,177.9161376953125,249.0638427734375,203.88568115234375,279.8045654296875,191.78741455078125C310.543701171875,179.690673828125,299.43865966796875,146.62646484375,284.79400634765625,140.1746826171875C270.1478271484375,133.722900390625,261.779052734375,132.916015625,261.939453125,123.56146240234375C262.0997314453125,114.2052001953125,295.67950439453125,110.08355712890625,278.37969970703125,79.3758544921875C274.3494873046875,72.2218017578125,273.02880859375,74.49102783203125,269.764892578125,64.70721435546875C265.22528076171875,51.101318359375,251.1568603515625,47.59136962890625,251.1568603515625,47.59136962890625C251.1568603515625,47.59136962890625,256.62744140625,32.75262451171875,246.1673583984375,30.01055908203125C235.70562744140625,27.2684326171875,235.35357666015625,34.2586669921875,235.35357666015625,34.2586669921875C235.35357666015625,34.2586669921875,235.86590576171875,26.94537353515625,228.78497314453125,27.42913818359375C221.7041015625,27.91448974609375,218.4322509765625,36.75885009765625,218.4322509765625,36.75885009765625C218.4322509765625,36.75885009765625,216.8748779296875,31.138916015625,211.72503662109375,32.75262451171875C206.5750732421875,34.36474609375,190.80279541015625,48.07525634765625,208.345703125,73.07550048828125C225.88848876953125,98.0758056640625,237.84521484375,105.14093017578125,230.7906494140625,118.37841796875C223.73468017578125,131.6175537109375,195.81427001953125,128.15753173828125,195.96533203125,154.3330078125C196.11480712890625,180.50848388671875,199.17169189453125,178.39996337890625,199.17169189453125,178.39996337890625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(163, 120, 243); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1271"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1271"><path d="M387.8619384765625,45.24334716796875C387.8619384765625,45.24334716796875,388.2259521484375,35.58929443359375,385.4420166015625,31.05908203125C382.65728759765625,26.5286865234375,376.72393798828125,27.12213134765625,376.72393798828125,27.12213134765625C376.72393798828125,27.12213134765625,382.65728759765625,27.714599609375,385.4420166015625,23.1842041015625C388.2259521484375,18.65399169921875,387.8619384765625,9,387.8619384765625,9C387.8619384765625,9,387.49725341796875,18.65399169921875,390.28204345703125,23.1842041015625C393.06658935546875,27.714599609375,399.00006103515625,27.12213134765625,399.00006103515625,27.12213134765625C399.00006103515625,27.12213134765625,393.06658935546875,26.5286865234375,390.28204345703125,31.05908203125C387.49725341796875,35.58929443359375,387.8619384765625,45.24334716796875,387.8619384765625,45.24334716796875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232); fill-opacity: 1;"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd9460e1e2-8af6a589-27c7-808d-8007-67bdbb1d1271" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M387.8619384765625,45.24334716796875C387.8619384765625,45.24334716796875,388.2259521484375,35.58929443359375,385.4420166015625,31.05908203125C382.65728759765625,26.5286865234375,376.72393798828125,27.12213134765625,376.72393798828125,27.12213134765625C376.72393798828125,27.12213134765625,382.65728759765625,27.714599609375,385.4420166015625,23.1842041015625C388.2259521484375,18.65399169921875,387.8619384765625,9,387.8619384765625,9C387.8619384765625,9,387.49725341796875,18.65399169921875,390.28204345703125,23.1842041015625C393.06658935546875,27.714599609375,399.00006103515625,27.12213134765625,399.00006103515625,27.12213134765625C399.00006103515625,27.12213134765625,393.06658935546875,26.5286865234375,390.28204345703125,31.05908203125C387.49725341796875,35.58929443359375,387.8619384765625,45.24334716796875,387.8619384765625,45.24334716796875Z" style="fill: none; stroke-width: 1.3882; stroke: rgb(255, 154, 232); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1273"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1273"><path d="M235.2113037109375,32.24993896484375C235.1513671875,34.84716796875,238.3984375,44.9727783203125,235.0367431640625,43.77740478515625C231.67510986328125,42.5819091796875,235.543701171875,32.6090087890625,235.543701171875,32.6090087890625" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946141a7-8af6a589-27c7-808d-8007-67bdbb1d1273" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M235.2113037109375,32.24993896484375C235.1513671875,34.84716796875,238.3984375,44.9727783203125,235.0367431640625,43.77740478515625C231.67510986328125,42.5819091796875,235.543701171875,32.6090087890625,235.543701171875,32.6090087890625" style="fill: none; stroke-width: 0.522657; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1274"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1274"><path d="M217.6776123046875,35.15618896484375C217.6776123046875,35.15618896484375,220.9912109375,47.9244384765625,217.7244873046875,46.6982421875C214.45648193359375,45.471923828125,217.6954345703125,35.84930419921875,217.6954345703125,35.84930419921875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd94619363-8af6a589-27c7-808d-8007-67bdbb1d1274" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M217.6776123046875,35.15618896484375C217.6776123046875,35.15618896484375,220.9912109375,47.9244384765625,217.7244873046875,46.6982421875C214.45648193359375,45.471923828125,217.6954345703125,35.84930419921875,217.6954345703125,35.84930419921875" style="fill: none; stroke-width: 0.522657; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1275" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127b"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d127b"><path d="M278.050537109375,157.8902587890625C278.21783447265625,157.585205078125,278.106201171875,157.20233154296875,277.80242919921875,157.0343017578125L207.90509033203125,118.54583740234375C207.59967041015625,118.3792724609375,207.21820068359375,118.4913330078125,207.0509033203125,118.79638671875L204.597900390625,123.2864990234375C204.430419921875,123.59149169921875,204.54205322265625,123.9759521484375,204.845947265625,124.1424560546875L274.74322509765625,162.63092041015625C275.04876708984375,162.79901123046875,275.43011474609375,162.68695068359375,275.59765625,162.3818359375L278.050537109375,157.8902587890625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd94623301-8af6a589-27c7-808d-8007-67bdbb1d127b" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M278.050537109375,157.8902587890625C278.21783447265625,157.585205078125,278.106201171875,157.20233154296875,277.80242919921875,157.0343017578125L207.90509033203125,118.54583740234375C207.59967041015625,118.3792724609375,207.21820068359375,118.4913330078125,207.0509033203125,118.79638671875L204.597900390625,123.2864990234375C204.430419921875,123.59149169921875,204.54205322265625,123.9759521484375,204.845947265625,124.1424560546875L274.74322509765625,162.63092041015625C275.04876708984375,162.79901123046875,275.43011474609375,162.68695068359375,275.59765625,162.3818359375L278.050537109375,157.8902587890625Z" style="fill: none; stroke-width: 1.31672; stroke: rgb(255, 255, 255); stroke-opacity: 0.002;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127c"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d127c"><path d="M274.4114990234375,164.8502197265625C274.5789794921875,164.545166015625,274.46734619140625,164.16229248046875,274.16339111328125,163.9942626953125L204.2659912109375,125.505859375C203.96221923828125,125.3377685546875,203.57928466796875,125.4498291015625,203.41180419921875,125.75640869140625L200.95880126953125,130.24639892578125C200.79150390625,130.551513671875,200.903076171875,130.93438720703125,201.20697021484375,131.10247802734375L271.1043701171875,169.59088134765625C271.40985107421875,169.75738525390625,271.79119873046875,169.64691162109375,271.95849609375,169.34033203125L274.4114990234375,164.8502197265625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd9462bb5d-8af6a589-27c7-808d-8007-67bdbb1d127c" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M274.4114990234375,164.8502197265625C274.5789794921875,164.545166015625,274.46734619140625,164.16229248046875,274.16339111328125,163.9942626953125L204.2659912109375,125.505859375C203.96221923828125,125.3377685546875,203.57928466796875,125.4498291015625,203.41180419921875,125.75640869140625L200.95880126953125,130.24639892578125C200.79150390625,130.551513671875,200.903076171875,130.93438720703125,201.20697021484375,131.10247802734375L271.1043701171875,169.59088134765625C271.40985107421875,169.75738525390625,271.79119873046875,169.64691162109375,271.95849609375,169.34033203125L274.4114990234375,164.8502197265625Z" style="fill: none; stroke-width: 1.31672; stroke: rgb(255, 255, 255); stroke-opacity: 0.002;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127d"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d127d"><path d="M270.46246337890625,171.7760009765625C270.6298828125,171.47100830078125,270.51824951171875,171.0865478515625,270.21429443359375,170.91998291015625L200.31707763671875,132.43157958984375C200.01153564453125,132.26348876953125,199.63006591796875,132.37554931640625,199.46270751953125,132.6805419921875L197.009765625,137.172119140625C196.84228515625,137.477294921875,196.95391845703125,137.86004638671875,197.25787353515625,138.0281982421875L267.1552734375,176.5166015625C267.46063232421875,176.68310546875,267.84197998046875,176.571044921875,268.0096435546875,176.26605224609375L270.46246337890625,171.7760009765625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd94631d24-8af6a589-27c7-808d-8007-67bdbb1d127d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M270.46246337890625,171.7760009765625C270.6298828125,171.47100830078125,270.51824951171875,171.0865478515625,270.21429443359375,170.91998291015625L200.31707763671875,132.43157958984375C200.01153564453125,132.26348876953125,199.63006591796875,132.37554931640625,199.46270751953125,132.6805419921875L197.009765625,137.172119140625C196.84228515625,137.477294921875,196.95391845703125,137.86004638671875,197.25787353515625,138.0281982421875L267.1552734375,176.5166015625C267.46063232421875,176.68310546875,267.84197998046875,176.571044921875,268.0096435546875,176.26605224609375L270.46246337890625,171.7760009765625Z" style="fill: none; stroke-width: 1.31672; stroke: rgb(255, 255, 255); stroke-opacity: 0.002;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1276"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1276"><path d="M252.99609375,178.4093017578125C252.99609375,178.4093017578125,251.5234375,148.51739501953125,241.88067626953125,151.97454833984375C232.23779296875,155.43011474609375,238.4169921875,185.96392822265625,240.42987060546875,176.83526611328125C242.44384765625,167.7066650390625,239.7996826171875,149.3170166015625,231.27099609375,149.78851318359375C222.7423095703125,150.25860595703125,226.3673095703125,182.490966796875,229.16998291015625,174.2030029296875C231.9739990234375,165.9166259765625,229.05511474609375,146.0191650390625,219.424560546875,149.98565673828125C209.7943115234375,153.9522705078125,220.03765869140625,177.70892333984375,220.03765869140625,177.70892333984375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9463adc9-8af6a589-27c7-808d-8007-67bdbb1d1276" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M252.99609375,178.4093017578125C252.99609375,178.4093017578125,251.5234375,148.51739501953125,241.88067626953125,151.97454833984375C232.23779296875,155.43011474609375,238.4169921875,185.96392822265625,240.42987060546875,176.83526611328125C242.44384765625,167.7066650390625,239.7996826171875,149.3170166015625,231.27099609375,149.78851318359375C222.7423095703125,150.25860595703125,226.3673095703125,182.490966796875,229.16998291015625,174.2030029296875C231.9739990234375,165.9166259765625,229.05511474609375,146.0191650390625,219.424560546875,149.98565673828125C209.7943115234375,153.9522705078125,220.03765869140625,177.70892333984375,220.03765869140625,177.70892333984375" style="fill: none; stroke-width: 0.786313; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1277"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1277"><path d="M264.595703125,83.473388671875C264.595703125,83.473388671875,263.394287109375,93.64288330078125,251.86181640625,92.1658935546875C240.33087158203125,90.68896484375,241.42437744140625,78.74993896484375,241.42437744140625,78.74993896484375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9463e9c4-8af6a589-27c7-808d-8007-67bdbb1d1277" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M264.595703125,83.473388671875C264.595703125,83.473388671875,263.394287109375,93.64288330078125,251.86181640625,92.1658935546875C240.33087158203125,90.68896484375,241.42437744140625,78.74993896484375,241.42437744140625,78.74993896484375" style="fill: none; stroke-width: 2.61794; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1278"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1278"><path d="M262.0059814453125,77.72589111328125C263.4842529296875,74.9288330078125,262.38165283203125,71.38623046875,259.54119873046875,69.8111572265625C256.70074462890625,68.23614501953125,253.198486328125,69.22705078125,251.72021484375,72.02410888671875C250.240478515625,74.8211669921875,251.343017578125,78.36529541015625,254.1834716796875,79.938720703125C257.02392578125,81.51385498046875,260.52618408203125,80.52288818359375,262.0059814453125,77.72589111328125Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd94645c8f-8af6a589-27c7-808d-8007-67bdbb1d1278" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M262.0059814453125,77.72589111328125C263.4842529296875,74.9288330078125,262.38165283203125,71.38623046875,259.54119873046875,69.8111572265625C256.70074462890625,68.23614501953125,253.198486328125,69.22705078125,251.72021484375,72.02410888671875C250.240478515625,74.8211669921875,251.343017578125,78.36529541015625,254.1834716796875,79.938720703125C257.02392578125,81.51385498046875,260.52618408203125,80.52288818359375,262.0059814453125,77.72589111328125Z" style="fill: none; stroke-width: 1.99137; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1279"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1279"><path d="M175.941162109375,104.03228759765625C178.2440185546875,101.4715576171875,182.2039794921875,101.286376953125,184.78741455078125,103.61956787109375C187.36981201171875,105.9527587890625,187.5980224609375,109.92022705078125,185.2960205078125,112.48095703125C182.99407958984375,115.04180908203125,179.0330810546875,115.22686767578125,176.45068359375,112.894775390625C173.86737060546875,110.56158447265625,173.63922119140625,106.59417724609375,175.941162109375,104.03228759765625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 255, 255);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd9464ab5d-8af6a589-27c7-808d-8007-67bdbb1d1279" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M175.941162109375,104.03228759765625C178.2440185546875,101.4715576171875,182.2039794921875,101.286376953125,184.78741455078125,103.61956787109375C187.36981201171875,105.9527587890625,187.5980224609375,109.92022705078125,185.2960205078125,112.48095703125C182.99407958984375,115.04180908203125,179.0330810546875,115.22686767578125,176.45068359375,112.894775390625C173.86737060546875,110.56158447265625,173.63922119140625,106.59417724609375,175.941162109375,104.03228759765625Z" style="fill: none; stroke-width: 2.99042; stroke: rgb(74, 207, 203); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127a"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d127a"><path d="M191.52850341796875,117.8677978515625C191.9862060546875,117.90673828125,192.2451171875,118.3985595703125,192.01092529296875,118.7850341796875L186.5089111328125,127.85699462890625C186.29473876953125,128.21044921875,185.790771484375,128.26007080078125,185.50860595703125,127.956298828125L175.83013916015625,117.5504150390625C175.44805908203125,117.13983154296875,175.7808837890625,116.48431396484375,176.347900390625,116.533935546875L191.52850341796875,117.8677978515625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd9464e991-8af6a589-27c7-808d-8007-67bdbb1d127a" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M191.52850341796875,117.8677978515625C191.9862060546875,117.90673828125,192.2451171875,118.3985595703125,192.01092529296875,118.7850341796875L186.5089111328125,127.85699462890625C186.29473876953125,128.21044921875,185.790771484375,128.26007080078125,185.50860595703125,127.956298828125L175.83013916015625,117.5504150390625C175.44805908203125,117.13983154296875,175.7808837890625,116.48431396484375,176.347900390625,116.533935546875L191.52850341796875,117.8677978515625Z" style="fill: none; stroke-width: 1.31672; stroke: rgb(255, 255, 255); stroke-opacity: 0.002;"/></g></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127e" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d127f" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1289" style="opacity: 1;"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1289"><path d="M100.6737060546875,103.302978515625C100.6737060546875,101.724853515625,101.96209716796875,100.4466552734375,103.54962158203125,100.4466552734375L167.1240234375,100.4466552734375C168.71307373046875,100.4466552734375,170,101.724853515625,170,103.302978515625L170,139.19232177734375C170,140.76898193359375,168.71307373046875,142.048583984375,167.1240234375,142.048583984375L103.54962158203125,142.048583984375C101.96209716796875,142.048583984375,100.6737060546875,140.76898193359375,100.6737060546875,139.19232177734375L100.6737060546875,103.302978515625L100.6737060546875,103.302978515625" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd94658b39-8af6a589-27c7-808d-8007-67bdbb1d1289" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M100.6737060546875,103.302978515625C100.6737060546875,101.724853515625,101.96209716796875,100.4466552734375,103.54962158203125,100.4466552734375L167.1240234375,100.4466552734375C168.71307373046875,100.4466552734375,170,101.724853515625,170,103.302978515625L170,139.19232177734375C170,140.76898193359375,168.71307373046875,142.048583984375,167.1240234375,142.048583984375L103.54962158203125,142.048583984375C101.96209716796875,142.048583984375,100.6737060546875,140.76898193359375,100.6737060546875,139.19232177734375L100.6737060546875,103.302978515625L100.6737060546875,103.302978515625" style="fill: none; stroke-width: 0.0143162; stroke: rgb(231, 68, 188); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128a"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128a"><path d="M105.720947265625,129.9136962890625L151.9102783203125,129.7451171875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9465cf4a-8af6a589-27c7-808d-8007-67bdbb1d128a" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M105.720947265625,129.9136962890625L151.9102783203125,129.7451171875" style="fill: none; stroke-width: 2.32638; stroke: rgb(255, 154, 232); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128b"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128b"><path d="M106.58514404296875,134.87933349609375L126.2366943359375,135.1163330078125" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946623a7-8af6a589-27c7-808d-8007-67bdbb1d128b" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M106.58514404296875,134.87933349609375L126.2366943359375,135.1163330078125" style="fill: none; stroke-width: 4.33494; stroke: rgb(62, 229, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128c"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128c"><path d="M114.17340087890625,107.1904296875L110.33544921875,111.59619140625L114.003662109375,116.04632568359375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946659a1-8af6a589-27c7-808d-8007-67bdbb1d128c" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M114.17340087890625,107.1904296875L110.33544921875,111.59619140625L114.003662109375,116.04632568359375" style="fill: none; stroke-width: 1.86683; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128d"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128d"><path d="M127.03173828125,116.04779052734375L130.75909423828125,111.5577392578125L126.9814453125,107.1904296875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9466887a-8af6a589-27c7-808d-8007-67bdbb1d128d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M127.03173828125,116.04779052734375L130.75909423828125,111.5577392578125L126.9814453125,107.1904296875" style="fill: none; stroke-width: 1.86683; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128e"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128e"><path d="M118.08331298828125,116.04632568359375L123.3778076171875,108.091552734375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9466c901-8af6a589-27c7-808d-8007-67bdbb1d128e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M118.08331298828125,116.04632568359375L123.3778076171875,108.091552734375" style="fill: none; stroke-width: 1.86683; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d128f"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d128f"><path d="M135.33758544921875,113.85272216796875C135.34332275390625,112.38031005859375,136.5281982421875,111.190673828125,137.98486328125,111.19635009765625C139.4415283203125,111.20062255859375,140.61907958984375,112.39886474609375,140.613525390625,113.87127685546875C140.6077880859375,115.3450927734375,139.42132568359375,116.53472900390625,137.96466064453125,116.529052734375C136.50811767578125,116.52337646484375,135.33184814453125,115.32513427734375,135.33758544921875,113.85272216796875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(80, 15, 185);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1290"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1290"><path d="M155.55987548828125,114.05841064453125C155.56549072265625,112.58447265625,156.75048828125,111.39630126953125,158.20709228515625,111.40057373046875C159.66387939453125,111.40631103515625,160.84149169921875,112.6044921875,160.835693359375,114.076904296875C160.8299560546875,115.54931640625,159.6436767578125,116.73895263671875,158.1868896484375,116.7332763671875C156.730224609375,116.72900390625,155.5540771484375,115.53076171875,155.55987548828125,114.05841064453125Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(62, 229, 255);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1291"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1291"><path d="M145.39044189453125,114.05841064453125C145.39605712890625,112.58447265625,146.58251953125,111.39630126953125,148.03912353515625,111.40057373046875C149.495849609375,111.40631103515625,150.67218017578125,112.6044921875,150.66644287109375,114.076904296875C150.6605224609375,115.54931640625,149.47576904296875,116.73895263671875,148.01898193359375,116.7332763671875C146.5625,116.72900390625,145.3846435546875,115.53076171875,145.39044189453125,114.05841064453125Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 255, 255);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1292"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1292"><path d="M132.7578125,135.07928466796875L163.299072265625,135.2791748046875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9467dc80-8af6a589-27c7-808d-8007-67bdbb1d1292" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M132.7578125,135.07928466796875L163.299072265625,135.2791748046875" style="fill: none; stroke-width: 3.25264; stroke: rgb(231, 68, 188); stroke-opacity: 1;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1280" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1293"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1293"><path d="M139.91162109375,123.3184814453125C88.44354248046875,123.15850830078125,103.638671875,125.87908935546875,66.876953125,153.2481689453125C49.032958984375,166.5328369140625,18,152.1585693359375,18,179.54608154296875C18,187.25811767578125,23.168212890625,189.95013427734375,27.156982421875,190.108642578125" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd9468567f-8af6a589-27c7-808d-8007-67bdbb1d1293" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M139.91162109375,123.3184814453125C88.44354248046875,123.15850830078125,103.638671875,125.87908935546875,66.876953125,153.2481689453125C49.032958984375,166.5328369140625,18,152.1585693359375,18,179.54608154296875C18,187.25811767578125,23.168212890625,189.95013427734375,27.156982421875,190.108642578125" style="fill: none; stroke-width: 2.32638; stroke: rgb(236, 48, 193); stroke-opacity: 1;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1281" style="opacity: 1;"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1281"><path d="M93.1473388671875,57.04864501953125C92.865478515625,56.90521240234375,92.520263671875,57.09521484375,92.472900390625,57.40570068359375C92.42962646484375,57.69305419921875,92.2945556640625,58.1932373046875,92.02410888671875,58.87835693359375C91.56829833984375,60.030029296875,90.9068603515625,61.1934814453125,89.9564208984375,62.270263671875C88.78875732421875,63.59344482421875,87.2889404296875,64.73284912109375,85.4180908203125,65.5728759765625C84.12677001953125,66.152587890625,82.97796630859375,66.2691650390625,81.73272705078125,66.06390380859375C81.198974609375,65.97589111328125,80.65692138671875,65.8082275390625,79.93511962890625,65.5728759765625C79.57696533203125,65.4556884765625,78.18365478515625,65.00872802734375,77.8687744140625,64.90350341796875C72.55120849609375,63.129638671875,67.5152587890625,62.925537109375,59.17510986328125,65.26055908203125C43.744140625,69.58026123046875,38.371826171875,86.0081787109375,39.358154296875,108.68572998046875C39.625732421875,114.84381103515625,40.5013427734375,120.539306640625,41.7396240234375,125.6448974609375C42.2730712890625,127.845703125,42.8297119140625,129.773681640625,43.40185546875,131.44610595703125C43.603271484375,132.03302001953125,43.7728271484375,132.57568359375,43.941162109375,133.00848388671875C44.043212890625,133.26983642578125,44.1265869140625,133.451171875,44.1654052734375,133.5440673828125C45.5501708984375,136.90728759765625,47.1004638671875,139.88641357421875,48.8389892578125,142.6484375C51.4473876953125,146.79010009765625,58.96368408203125,155.47467041015625,59.669677734375,156.75140380859375C60.34698486328125,157.97821044921875,60.63177490234375,159.093505859375,60.6129150390625,160.32177734375C60.51519775390625,166.6456298828125,55.6160888671875,170.078857421875,39.2677001953125,175.2274169921875C32.8873291015625,177.23822021484375,28.864013671875,181.823974609375,26.77587890625,188.17071533203125C25.32080078125,192.59088134765625,24.984375,197.19512939453125,25.2474365234375,201.20263671875C25.2747802734375,201.61236572265625,25.2733154296875,201.89373779296875,25.2919921875,202.05096435546875C25.31787109375,202.2708740234375,25.5191650390625,202.48223876953125,25.741943359375,202.4964599609375C25.9346923828125,202.5093994140625,42.380859375,203.44476318359375,43.8966064453125,203.5233154296875C50.6866455078125,203.87457275390625,55.90081787109375,204.098876953125,58.995361328125,204.1031494140625C59.2669677734375,204.1031494140625,69.1171875,203.794677734375,69.2408447265625,203.7904052734375C71.38916015625,203.720458984375,78.8408203125,203.4832763671875,78.99188232421875,203.47906494140625C79.0435791015625,203.48895263671875,79.25360107421875,203.491943359375,79.57568359375,203.5233154296875C80.11346435546875,203.57611083984375,85.6842041015625,204.06884765625,88.06982421875,204.23736572265625C94.39984130859375,204.68292236328125,100.69366455078125,204.95855712890625,106.58367919921875,204.9957275390625C115.31658935546875,205.04998779296875,122.38134765625,204.54443359375,127.25457763671875,203.3890380859375C137.0572509765625,201.0640869140625,146.18267822265625,195.945556640625,151.0703125,189.15185546875C157.128662109375,180.73431396484375,156.5333251953125,170.3931884765625,148.01470947265625,158.7593994140625C142.3218994140625,150.98455810546875,135.11480712890625,147.65277099609375,126.6693115234375,148.00408935546875C120.00006103515625,148.281005859375,113.08050537109375,150.753173828125,105.19036865234375,155.010498046875C104.0140380859375,155.6446533203125,93.89788818359375,161.61712646484375,92.74322509765625,161.8841552734375C90.09722900390625,162.4925537109375,88.1142578125,161.80419921875,86.6763916015625,160.2774658203125C86.296630859375,159.87481689453125,85.9788818359375,159.45916748046875,85.7330322265625,159.02783203125C85.58648681640625,158.772216796875,85.50299072265625,158.54949951171875,85.46270751953125,158.44659423828125C85.43402099609375,158.373779296875,85.339111328125,158.40667724609375,85.28302001953125,158.35809326171875C87.0733642578125,157.61395263671875,88.7916259765625,156.647216796875,90.40655517578125,155.50177001953125C96.0491943359375,151.50152587890625,99.86834716796875,145.48760986328125,100.201904296875,140.23773193359375C100.47662353515625,135.92327880859375,99.40399169921875,133.35699462890625,96.6976318359375,129.83941650390625C96.63006591796875,129.7523193359375,96.0146484375,128.992431640625,95.84344482421875,128.76824951171875C93.90362548828125,126.2276611328125,93.23480224609375,124.5352783203125,93.416259765625,121.984619140625C93.68359375,118.25848388671875,93.46795654296875,114.78961181640625,93.01202392578125,111.720458984375C92.90570068359375,110.999267578125,92.813720703125,110.353759765625,92.6971435546875,109.801025390625C92.68865966796875,109.75390625,92.6627197265625,109.75537109375,92.6527099609375,109.7110595703125C93.72955322265625,109.74249267578125,95.05548095703125,109.71246337890625,96.60711669921875,109.5325927734375C99.07037353515625,109.248291015625,101.54937744140625,108.669921875,103.9766845703125,107.7474365234375C106.323486328125,106.856201171875,108.65155029296875,105.1552734375,110.897705078125,102.9273681640625C112.095458984375,101.73919677734375,113.1983642578125,100.4952392578125,114.177734375,99.22418212890625C114.52001953125,98.77862548828125,114.81475830078125,98.3458251953125,115.076416015625,97.97454833984375C115.23321533203125,97.74884033203125,115.333740234375,97.57183837890625,115.39129638671875,97.48321533203125C115.4676513671875,97.36614990234375,115.4791259765625,97.25762939453125,115.43585205078125,97.126220703125L112.91949462890625,89.494140625C112.79290771484375,89.11285400390625,112.2593994140625,89.05291748046875,112.06536865234375,89.40570068359375C112.01336669921875,89.49847412109375,111.89996337890625,89.6883544921875,111.75048828125,89.9412841796875C111.500244140625,90.3624267578125,111.22698974609375,90.816650390625,110.897705078125,91.3236083984375C109.95294189453125,92.77471923828125,108.90460205078125,94.21282958984375,107.75128173828125,95.5638427734375C105.49224853515625,98.21307373046875,103.169921875,100.17816162109375,100.87646484375,101.097900390625C97.29443359375,102.53466796875,93.89788818359375,102.6903076171875,91.03485107421875,102.124755859375C90.49554443359375,102.01763916015625,90.10162353515625,101.92333984375,89.91180419921875,101.856201171875L86.9007568359375,99.4912109375C87.64697265625,99.484130859375,88.33575439453125,99.501220703125,89.28204345703125,99.44696044921875C91.39874267578125,99.32415771484375,93.48089599609375,99.07275390625,95.43939208984375,98.68865966796875C98.18310546875,98.150146484375,100.492431640625,97.36328125,102.2237548828125,96.27789306640625C104.7803955078125,94.67694091796875,107.14739990234375,92.24334716796875,109.27996826171875,89.35992431640625C109.96728515625,88.43023681640625,110.59283447265625,87.53759765625,111.1219482421875,86.68212890625C111.4398193359375,86.16802978515625,111.67999267578125,85.781005859375,111.79632568359375,85.5667724609375C111.8697509765625,85.4296875,111.87115478515625,85.25689697265625,111.79632568359375,85.1212158203125L107.93109130859375,78.158447265625C107.74127197265625,77.817138671875,107.21929931640625,77.8399658203125,107.076904296875,78.203125C107.0252685546875,78.33514404296875,106.90283203125,78.58642578125,106.71746826171875,78.9617919921875C106.40679931640625,79.59429931640625,106.03448486328125,80.31549072265625,105.5498046875,81.10382080078125C104.159423828125,83.365966796875,102.32159423828125,85.740966796875,99.9775390625,88.11029052734375C95.7069091796875,92.4276123046875,88.72979736328125,92.6746826171875,78.3173828125,90.6995849609375C75.07904052734375,90.08404541015625,72.94085693359375,90.53533935546875,71.712890625,91.6806640625C71.3260498046875,92.04193115234375,71.2109375,92.3475341796875,71.08294677734375,92.66326904296875L65.82568359375,92.21624755859375C65.792724609375,92.1348876953125,65.77392578125,92.07061767578125,65.73504638671875,91.94915771484375C65.46478271484375,91.0780029296875,65.46051025390625,90.16400146484375,65.87030029296875,89.315673828125C66.155029296875,88.72869873046875,66.64105224609375,88.21173095703125,67.35284423828125,87.7532958984375C68.62689208984375,86.9349365234375,69.37030029296875,87.0220947265625,75.980712890625,88.28887939453125C80.941650390625,89.24005126953125,84.5611572265625,89.56414794921875,88.7427978515625,89.1370849609375C93.3931884765625,88.66302490234375,97.58624267578125,85.6824951171875,101.23590087890625,81.0595703125C102.625,79.29888916015625,103.8385009765625,77.4091796875,104.87548828125,75.525390625C105.2391357421875,74.86578369140625,105.5540771484375,74.24609375,105.81884765625,73.6954345703125C105.97979736328125,73.3634033203125,106.07763671875,73.15606689453125,106.13372802734375,73.02606201171875C106.19110107421875,72.89434814453125,106.20550537109375,72.74908447265625,106.13372802734375,72.624267578125L102.17913818359375,65.70684814453125C102.0009765625,65.3944091796875,101.54656982421875,65.3929443359375,101.3709716796875,65.70684814453125C101.30645751953125,65.8209228515625,101.19415283203125,66.02569580078125,101.01153564453125,66.3316650390625C100.703857421875,66.84332275390625,100.335693359375,67.41253662109375,99.93304443359375,68.02752685546875C98.7813720703125,69.78460693359375,97.5029296875,71.52197265625,96.11248779296875,73.15985107421875C92.78631591796875,77.078857421875,89.388427734375,79.698486328125,86.18182373046875,80.38970947265625C84.7725830078125,80.69390869140625,83.29132080078125,80.76251220703125,81.6435546875,80.612548828125C79.9322509765625,80.4569091796875,78.4884033203125,80.1669921875,75.53204345703125,79.452880859375C68.67730712890625,77.798095703125,65.8905029296875,77.617431640625,62.5902099609375,79.452880859375C60.10833740234375,80.83392333984375,58.4876708984375,83.07037353515625,57.5572509765625,85.92376708984375C56.7476806640625,88.40740966796875,56.55059814453125,90.98663330078125,56.70318603515625,93.2431640625C56.708984375,93.32305908203125,56.69744873046875,93.3572998046875,56.70318603515625,93.421630859375L52.120361328125,94.98406982421875C51.9088134765625,91.63641357421875,52.36767578125,87.67333984375,54.0069580078125,83.87158203125C55.3974609375,80.6468505859375,57.49114990234375,77.96014404296875,60.4779052734375,75.9716796875C65.49212646484375,72.63250732421875,69.17327880859375,72.38287353515625,75.6212158203125,73.82940673828125C75.87432861328125,73.8861083984375,76.00091552734375,73.88958740234375,76.51995849609375,74.0079345703125C80.78790283203125,74.9818115234375,82.826904296875,75.27099609375,85.55316162109375,74.9898681640625C89.4603271484375,74.58697509765625,92.90570068359375,71.96368408203125,95.84344482421875,67.8935546875C96.9549560546875,66.35333251953125,97.90557861328125,64.72137451171875,98.719482421875,63.0736083984375C99.004150390625,62.4969482421875,99.27593994140625,61.94866943359375,99.48297119140625,61.4669189453125C99.6080322265625,61.17626953125,99.66424560546875,61.00103759765625,99.70733642578125,60.88677978515625C99.790771484375,60.66839599609375,99.6929931640625,60.41339111328125,99.48297119140625,60.30657958984375L93.1473388671875,57.04864501953125L93.1473388671875,57.04864501953125" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 217, 212);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1282"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1282"><path d="M85.3304443359375,157.9710693359375C80.35784912109375,159.3834228515625,74.49957275390625,159.44207763671875,68.35076904296875,157.555419921875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946994eb-8af6a589-27c7-808d-8007-67bdbb1d1282" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M85.3304443359375,157.9710693359375C80.35784912109375,159.3834228515625,74.49957275390625,159.44207763671875,68.35076904296875,157.555419921875" style="fill: none; stroke-width: 0.920531; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1283" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1295"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1295"><path d="M84.38262939453125,185.3543701171875C84.38262939453125,184.903076171875,84.7509765625,184.53753662109375,85.2052001953125,184.53753662109375L93.93670654296875,184.53753662109375C94.39111328125,184.53753662109375,94.7606201171875,184.903076171875,94.7606201171875,185.3543701171875L94.7606201171875,193.4219970703125C94.7606201171875,193.874755859375,94.39111328125,194.24029541015625,93.93670654296875,194.24029541015625L85.2052001953125,194.24029541015625C84.7509765625,194.24029541015625,84.38262939453125,193.874755859375,84.38262939453125,193.4219970703125L84.38262939453125,185.3543701171875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205); fill-opacity: 0.043;"/></g><g stroke-miterlimit="10" id="strokes-b1c71a4d-4b13-809d-8008-28cd9469ca7a-8af6a589-27c7-808d-8007-67bdbb1d1295" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M84.38262939453125,185.3543701171875C84.38262939453125,184.903076171875,84.7509765625,184.53753662109375,85.2052001953125,184.53753662109375L93.93670654296875,184.53753662109375C94.39111328125,184.53753662109375,94.7606201171875,184.903076171875,94.7606201171875,185.3543701171875L94.7606201171875,193.4219970703125C94.7606201171875,193.874755859375,94.39111328125,194.24029541015625,93.93670654296875,194.24029541015625L85.2052001953125,194.24029541015625C84.7509765625,194.24029541015625,84.38262939453125,193.874755859375,84.38262939453125,193.4219970703125L84.38262939453125,185.3543701171875Z" style="fill: none; stroke-width: 0.429485; stroke: rgb(83, 9, 205); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1296"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1296"><path d="M96.7076416015625,196.1141357421875C96.7076416015625,195.66278076171875,97.075927734375,195.29718017578125,97.5316162109375,195.29718017578125L106.26171875,195.29718017578125C106.71746826171875,195.29718017578125,107.08563232421875,195.66278076171875,107.08563232421875,196.1141357421875L107.08563232421875,204.18170166015625C107.08563232421875,204.63446044921875,106.71746826171875,205,106.26171875,205L97.5316162109375,205C97.075927734375,205,96.7076416015625,204.63446044921875,96.7076416015625,204.18170166015625L96.7076416015625,196.1141357421875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(250, 90, 207);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1298"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1298"><path d="M61.3880615234375,196.1141357421875C61.3880615234375,195.66278076171875,61.7576904296875,195.29718017578125,62.2119140625,195.29718017578125L70.9420166015625,195.29718017578125C71.39794921875,195.29718017578125,71.7659912109375,195.66278076171875,71.7659912109375,196.1141357421875L71.7659912109375,204.18170166015625C71.7659912109375,204.63446044921875,71.39794921875,205,70.9420166015625,205L62.2119140625,205C61.7576904296875,205,61.3880615234375,204.63446044921875,61.3880615234375,204.18170166015625L61.3880615234375,196.1141357421875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1299"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1299"><path d="M74.15594482421875,196.1141357421875C74.15594482421875,195.66278076171875,74.52545166015625,195.29718017578125,74.9798583984375,195.29718017578125L83.70989990234375,195.29718017578125C84.16558837890625,195.29718017578125,84.5338134765625,195.66278076171875,84.5338134765625,196.1141357421875L84.5338134765625,204.18170166015625C84.5338134765625,204.63446044921875,84.16558837890625,205,83.70989990234375,205L74.9798583984375,205C74.52545166015625,205,74.15594482421875,204.63446044921875,74.15594482421875,204.18170166015625L74.15594482421875,196.1141357421875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d129b"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d129b"><path d="M48.76123046875,182.34246826171875C48.76123046875,181.89111328125,49.1292724609375,181.52410888671875,49.585205078125,181.52410888671875L58.315185546875,181.52410888671875C58.7696533203125,181.52410888671875,59.1390380859375,181.89111328125,59.1390380859375,182.34246826171875L59.1390380859375,190.4100341796875C59.1390380859375,190.861328125,58.7696533203125,191.22833251953125,58.315185546875,191.22833251953125L49.585205078125,191.22833251953125C49.1292724609375,191.22833251953125,48.76123046875,190.861328125,48.76123046875,190.4100341796875L48.76123046875,182.34246826171875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1284"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1284"><path d="M134.5985107421875,162.75823974609375C134.5985107421875,162.75823974609375,120.91754150390625,152.04852294921875,110.62890625,160.798828125C100.3385009765625,169.547607421875,85.04718017578125,182.89794921875,89.9736328125,185.92132568359375C94.8988037109375,188.9461669921875,122.89190673828125,174.279052734375,118.95330810546875,169.00494384765625C115.01458740234375,163.73077392578125,103.4532470703125,177.24822998046875,108.6256103515625,180.82293701171875C113.79669189453125,184.39898681640625,131.0150146484375,182.40814208984375,126.66802978515625,179.3760986328125C122.32098388671875,176.34564208984375,104.756103515625,182.2010498046875,108.02471923828125,186.5340576171875C111.2916259765625,190.86700439453125,121.88238525390625,188.172119140625,121.88238525390625,188.172119140625" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946b6e3b-8af6a589-27c7-808d-8007-67bdbb1d1284" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M134.5985107421875,162.75823974609375C134.5985107421875,162.75823974609375,120.91754150390625,152.04852294921875,110.62890625,160.798828125C100.3385009765625,169.547607421875,85.04718017578125,182.89794921875,89.9736328125,185.92132568359375C94.8988037109375,188.9461669921875,122.89190673828125,174.279052734375,118.95330810546875,169.00494384765625C115.01458740234375,163.73077392578125,103.4532470703125,177.24822998046875,108.6256103515625,180.82293701171875C113.79669189453125,184.39898681640625,131.0150146484375,182.40814208984375,126.66802978515625,179.3760986328125C122.32098388671875,176.34564208984375,104.756103515625,182.2010498046875,108.02471923828125,186.5340576171875C111.2916259765625,190.86700439453125,121.88238525390625,188.172119140625,121.88238525390625,188.172119140625" style="fill: none; stroke-width: 0.920531; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1285"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1285"><path d="M70.569580078125,123.30279541015625C70.569580078125,120.43365478515625,73.00555419921875,118.107177734375,76.00946044921875,118.107177734375C79.013427734375,118.107177734375,81.44793701171875,120.43365478515625,81.44793701171875,123.30279541015625C81.44793701171875,126.17193603515625,79.013427734375,128.49835205078125,76.00946044921875,128.49835205078125C73.00555419921875,128.49835205078125,70.569580078125,126.17193603515625,70.569580078125,123.30279541015625Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946bbe7d-8af6a589-27c7-808d-8007-67bdbb1d1285" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M70.569580078125,123.30279541015625C70.569580078125,120.43365478515625,73.00555419921875,118.107177734375,76.00946044921875,118.107177734375C79.013427734375,118.107177734375,81.44793701171875,120.43365478515625,81.44793701171875,123.30279541015625C81.44793701171875,126.17193603515625,79.013427734375,128.49835205078125,76.00946044921875,128.49835205078125C73.00555419921875,128.49835205078125,70.569580078125,126.17193603515625,70.569580078125,123.30279541015625Z" style="fill: none; stroke-width: 1.8382; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1286"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1286"><path d="M65.738037109375,126.49609375C65.738037109375,126.49609375,62.3544921875,135.00927734375,72.3209228515625,138.86810302734375C82.28753662109375,142.72705078125,86.5152587890625,132.871337890625,86.5152587890625,132.871337890625" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946bcbf6-8af6a589-27c7-808d-8007-67bdbb1d1286" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M65.738037109375,126.49609375C65.738037109375,126.49609375,62.3544921875,135.00927734375,72.3209228515625,138.86810302734375C82.28753662109375,142.72705078125,86.5152587890625,132.871337890625,86.5152587890625,132.871337890625" style="fill: none; stroke-width: 2.41657; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1287"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1287"><path d="M90.34326171875,184.410400390625C89.64300537109375,183.30352783203125,90.7286376953125,181.37554931640625,92.76763916015625,180.10595703125C94.80517578125,178.83489990234375,97.02545166015625,178.70343017578125,97.72576904296875,179.81170654296875C98.42462158203125,180.9185791015625,97.3388671875,182.84649658203125,95.30126953125,184.11614990234375C93.26239013671875,185.38720703125,91.04205322265625,185.51861572265625,90.34326171875,184.410400390625Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1288"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1288"><path d="M26.46826171875,190.0687255859375L44.6529541015625,189.960205078125L44.8685302734375,180.267333984375L36.19482421875,180.35723876953125L36.1846923828125,185.57861328125" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946c69f0-8af6a589-27c7-808d-8007-67bdbb1d1288" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M26.46826171875,190.0687255859375L44.6529541015625,189.960205078125L44.8685302734375,180.267333984375L36.19482421875,180.35723876953125L36.1846923828125,185.57861328125" style="fill: none; stroke-width: 2.32638; stroke: rgb(236, 48, 193); stroke-opacity: 1;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d129c" rx="0" ry="0"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d129d" rx="0" ry="0"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a3" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a4" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a8"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a8"><path d="M342.31243896484375,205.229736328125C342.31201171875,205.01654052734375,342.484130859375,204.84283447265625,342.6961669921875,204.84246826171875L354.8599853515625,204.82098388671875C355.07196044921875,204.82061767578125,355.2447509765625,204.99365234375,355.2451171875,205.2069091796875L355.26470947265625,216.48675537109375C355.26513671875,216.699951171875,355.09295654296875,216.87286376953125,354.8809814453125,216.873291015625L342.7171630859375,216.8948974609375C342.50506591796875,216.895263671875,342.3323974609375,216.7227783203125,342.3321533203125,216.50958251953125L342.31243896484375,205.229736328125Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a9"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a9"><path d="M283.17901611328125,205.334228515625C283.178466796875,205.12103271484375,283.3499755859375,204.9473876953125,283.56256103515625,204.94696044921875L295.7265625,204.92547607421875C295.93853759765625,204.92510986328125,296.11053466796875,205.09820556640625,296.11090087890625,205.3114013671875L296.130615234375,216.59124755859375C296.130859375,216.804443359375,295.95953369140625,216.9774169921875,295.74755859375,216.97784423828125L283.5836181640625,216.99932861328125C283.37103271484375,216.9996337890625,283.198974609375,216.8272705078125,283.19854736328125,216.61407470703125L283.17901611328125,205.334228515625Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946d7f76-8af6a589-27c7-808d-8007-67bdbb1d12a9" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M283.17901611328125,205.334228515625C283.178466796875,205.12103271484375,283.3499755859375,204.9473876953125,283.56256103515625,204.94696044921875L295.7265625,204.92547607421875C295.93853759765625,204.92510986328125,296.11053466796875,205.09820556640625,296.11090087890625,205.3114013671875L296.130615234375,216.59124755859375C296.130859375,216.804443359375,295.95953369140625,216.9774169921875,295.74755859375,216.97784423828125L283.5836181640625,216.99932861328125C283.37103271484375,216.9996337890625,283.198974609375,216.8272705078125,283.19854736328125,216.61407470703125L283.17901611328125,205.334228515625Z" style="fill: none; stroke-width: 2.03153; stroke: rgb(29, 227, 221); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12aa"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12aa"><path d="M298.2991943359375,205.3074951171875C298.2989501953125,205.09429931640625,298.47027587890625,204.92059326171875,298.682861328125,204.9202880859375L310.84674072265625,204.89874267578125C311.0587158203125,204.8983154296875,311.2308349609375,205.07147216796875,311.2310791015625,205.28460693359375L311.2508544921875,216.56451416015625C311.2513427734375,216.77764892578125,311.07989501953125,216.9508056640625,310.8677978515625,216.9510498046875L298.7041015625,216.97259521484375C298.49127197265625,216.97296142578125,298.3193359375,216.80059814453125,298.31890869140625,216.58740234375L298.2991943359375,205.3074951171875Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(47, 34, 108); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12ab"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12ab"><path d="M314.2098388671875,205.2794189453125C314.2093505859375,205.06622314453125,314.38092041015625,204.89251708984375,314.593505859375,204.89208984375L326.75738525390625,204.87060546875C326.9693603515625,204.8702392578125,327.14129638671875,205.0433349609375,327.1417236328125,205.25653076171875L327.16143798828125,216.536376953125C327.161865234375,216.7496337890625,326.9903564453125,216.92254638671875,326.7784423828125,216.9229736328125L314.61456298828125,216.94451904296875C314.4019775390625,216.94488525390625,314.2298583984375,216.7724609375,314.2296142578125,216.55926513671875L314.2098388671875,205.2794189453125Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12ac"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12ac"><path d="M298.15301513671875,191.94378662109375C298.15277099609375,191.72998046875,298.3240966796875,191.556884765625,298.53607177734375,191.55645751953125L310.7000732421875,191.5350341796875C310.91265869140625,191.53466796875,311.084716796875,191.70703125,311.0849609375,191.9208984375L311.10479736328125,203.2001953125C311.105224609375,203.41339111328125,310.9337158203125,203.5870361328125,310.72113037109375,203.58740234375L298.55712890625,203.60894775390625C298.34515380859375,203.60931396484375,298.17315673828125,203.43621826171875,298.17279052734375,203.2230224609375L298.15301513671875,191.94378662109375Z" style="fill: rgb(255, 30, 189); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12ad"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12ad"><path d="M364.451416015625,202.89886474609375C364.4510498046875,202.6856689453125,364.62249755859375,202.5126953125,364.83526611328125,202.51226806640625L376.99908447265625,202.4908447265625C377.2110595703125,202.49041748046875,377.383056640625,202.662841796875,377.3834228515625,202.8759765625L377.4031982421875,214.15594482421875C377.403564453125,214.36907958984375,377.23211669921875,214.5421142578125,377.0201416015625,214.54248046875L364.85614013671875,214.56390380859375C364.6435546875,214.5643310546875,364.4715576171875,214.39190673828125,364.47113037109375,214.1788330078125L364.451416015625,202.89886474609375Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(163, 120, 243); fill-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a5"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a5"><path d="M332.84033203125,151.59356689453125C332.84033203125,151.59356689453125,297.41229248046875,187.4200439453125,303.88482666015625,193.6351318359375C310.356689453125,199.850341796875,347.00213623046875,166.52276611328125,341.1119384765625,164.1475830078125C335.2216796875,161.77227783203125,317.21844482421875,188.84027099609375,331.14581298828125,187.22552490234375C345.07318115234375,185.61077880859375,359.1728515625,170.0797119140625,354.26373291015625,167.90179443359375C349.35479736328125,165.72314453125,335.9970703125,181.26300048828125,343.50592041015625,187.004638671875C351.015380859375,192.746337890625,356.05010986328125,179.627197265625,365.8538818359375,175.8330078125C375.65716552734375,172.0382080078125,378.0205078125,177.00439453125,394.114501953125,180.15643310546875C410.208984375,183.30889892578125,439.0164794921875,163.5771484375,431.70538330078125,134.36712646484375C424.39508056640625,105.15728759765625,398.0994873046875,102.81805419921875,398.0994873046875,102.81805419921875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946e9968-8af6a589-27c7-808d-8007-67bdbb1d12a5" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M332.84033203125,151.59356689453125C332.84033203125,151.59356689453125,297.41229248046875,187.4200439453125,303.88482666015625,193.6351318359375C310.356689453125,199.850341796875,347.00213623046875,166.52276611328125,341.1119384765625,164.1475830078125C335.2216796875,161.77227783203125,317.21844482421875,188.84027099609375,331.14581298828125,187.22552490234375C345.07318115234375,185.61077880859375,359.1728515625,170.0797119140625,354.26373291015625,167.90179443359375C349.35479736328125,165.72314453125,335.9970703125,181.26300048828125,343.50592041015625,187.004638671875C351.015380859375,192.746337890625,356.05010986328125,179.627197265625,365.8538818359375,175.8330078125C375.65716552734375,172.0382080078125,378.0205078125,177.00439453125,394.114501953125,180.15643310546875C410.208984375,183.30889892578125,439.0164794921875,163.5771484375,431.70538330078125,134.36712646484375C424.39508056640625,105.15728759765625,398.0994873046875,102.81805419921875,398.0994873046875,102.81805419921875" style="fill: none; stroke-width: 2.29814; stroke: rgb(21, 16, 53); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a6"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a6"><path d="M303.4324951171875,183.81005859375C304.822509765625,180.29119873046875,307.126708984375,177.91424560546875,308.58013916015625,178.50140380859375C310.0328369140625,179.0877685546875,310.084228515625,182.41650390625,308.69439697265625,185.93536376953125C307.3045654296875,189.4549560546875,304.99957275390625,191.83184814453125,303.54681396484375,191.2447509765625C302.0941162109375,190.65771484375,302.04266357421875,187.32958984375,303.4324951171875,183.81005859375Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(17, 231, 228); fill-opacity: 1;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d129e" style="display: none;"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d129e"><path d="M326.92987060546875,191.89300537109375C326.9295654296875,191.6790771484375,327.1009521484375,191.50616455078125,327.31365966796875,191.50567626953125L339.4774169921875,191.48419189453125C339.68939208984375,191.48382568359375,339.86151123046875,191.65625,339.86181640625,191.87017822265625L339.88153076171875,203.14923095703125C339.88189697265625,203.362548828125,339.71044921875,203.5361328125,339.49847412109375,203.53656005859375L327.33465576171875,203.55804443359375C327.1220703125,203.55841064453125,326.9500732421875,203.3853759765625,326.9495849609375,203.17218017578125L326.92987060546875,191.89300537109375Z"/></g><g id="strokes-b1c71a4d-4b13-809d-8008-28cd946f7a08-8af6a589-27c7-808d-8007-67bdbb1d129e" class="strokes"><g class="stroke-shape"><path d="M326.92987060546875,191.89300537109375C326.9295654296875,191.6790771484375,327.1009521484375,191.50616455078125,327.31365966796875,191.50567626953125L339.4774169921875,191.48419189453125C339.68939208984375,191.48382568359375,339.86151123046875,191.65625,339.86181640625,191.87017822265625L339.88153076171875,203.14923095703125C339.88189697265625,203.362548828125,339.71044921875,203.5361328125,339.49847412109375,203.53656005859375L327.33465576171875,203.55804443359375C327.1220703125,203.55841064453125,326.9500732421875,203.3853759765625,326.9495849609375,203.17218017578125L326.92987060546875,191.89300537109375Z" style="fill: none; stroke-width: 1.43571; stroke: rgb(105, 17, 212); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d129f"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d129f"><path d="M365.3521728515625,64.6060791015625C356.12310791015625,62.179443359375,326.76898193359375,66.68792724609375,339.8148193359375,94.19793701171875C352.8607177734375,121.70794677734375,349.33160400390625,134.919189453125,368.90057373046875,140.257080078125C388.469482421875,145.5948486328125,403.0921630859375,116.3414306640625,398.89874267578125,103.20220947265625C394.70550537109375,90.06317138671875,381.765380859375,68.9215087890625,365.3521728515625,64.6060791015625" style="fill: rgb(255, 154, 232); fill-opacity: 1;"/></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a0"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a0"><path d="M358.07080078125,108.58062744140625C358.07080078125,108.58062744140625,364.62591552734375,116.04632568359375,373.362060546875,108.42401123046875C382.09722900390625,100.80096435546875,374.6639404296875,91.85980224609375,374.6639404296875,91.85980224609375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd946ffa5c-8af6a589-27c7-808d-8007-67bdbb1d12a0" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M358.07080078125,108.58062744140625C358.07080078125,108.58062744140625,364.62591552734375,116.04632568359375,373.362060546875,108.42401123046875C382.09722900390625,100.80096435546875,374.6639404296875,91.85980224609375,374.6639404296875,91.85980224609375" style="fill: none; stroke-width: 2.11121; stroke: rgb(21, 16, 53); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a1"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a1"><path d="M361.4681396484375,101.75250244140625C358.94049072265625,100.47314453125,358.0009765625,97.34442138671875,359.3695068359375,94.763427734375C360.73748779296875,92.1829833984375,363.89556884765625,91.1279296875,366.4232177734375,92.40728759765625C368.9508056640625,93.68603515625,369.890869140625,96.81536865234375,368.5223388671875,99.39581298828125C367.15386962890625,101.9761962890625,363.99560546875,103.03131103515625,361.4681396484375,101.75250244140625Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-b1c71a4d-4b13-809d-8008-28cd94707dfd-8af6a589-27c7-808d-8007-67bdbb1d12a1" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M361.4681396484375,101.75250244140625C358.94049072265625,100.47314453125,358.0009765625,97.34442138671875,359.3695068359375,94.763427734375C360.73748779296875,92.1829833984375,363.89556884765625,91.1279296875,366.4232177734375,92.40728759765625C368.9508056640625,93.68603515625,369.890869140625,96.81536865234375,368.5223388671875,99.39581298828125C367.15386962890625,101.9761962890625,363.99560546875,103.03131103515625,361.4681396484375,101.75250244140625Z" style="fill: none; stroke-width: 2.11121; stroke: rgb(21, 16, 53); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d12a2"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d12a2"><path d="M380.5565185546875,79.30389404296875C379.76116943359375,76.61212158203125,359.5081787109375,52.31103515625,348.883544921875,47.16387939453125C333.857666015625,39.88470458984375,343.15093994140625,71.81658935546875,348.817626953125,65.11077880859375C351.99566650390625,61.349853515625,330.74993896484375,45.42510986328125,324.209228515625,49.3746337890625C321.13897705078125,51.22869873046875,321.6807861328125,56.222412109375,325.23406982421875,61.137451171875C333.34716796875,72.35992431640625,340.74920654296875,78.8851318359375,342.30523681640625,74.671142578125C344.3359375,69.17169189453125,315.83050537109375,56.59197998046875,316.83563232421875,74.1900634765625C317.39501953125,83.98260498046875,334.74395751953125,83.84161376953125,334.74395751953125,83.84161376953125"/></g><g id="strokes-b1c71a4d-4b13-809d-8008-28cd9470ae25-8af6a589-27c7-808d-8007-67bdbb1d12a2" class="strokes"><g class="stroke-shape"><path d="M380.5565185546875,79.30389404296875C379.76116943359375,76.61212158203125,359.5081787109375,52.31103515625,348.883544921875,47.16387939453125C333.857666015625,39.88470458984375,343.15093994140625,71.81658935546875,348.817626953125,65.11077880859375C351.99566650390625,61.349853515625,330.74993896484375,45.42510986328125,324.209228515625,49.3746337890625C321.13897705078125,51.22869873046875,321.6807861328125,56.222412109375,325.23406982421875,61.137451171875C333.34716796875,72.35992431640625,340.74920654296875,78.8851318359375,342.30523681640625,74.671142578125C344.3359375,69.17169189453125,315.83050537109375,56.59197998046875,316.83563232421875,74.1900634765625C317.39501953125,83.98260498046875,334.74395751953125,83.84161376953125,334.74395751953125,83.84161376953125" style="fill: none; stroke-width: 2.29814; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67be72b3102f"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67be72b3102f"><path d="M157.5,101C157.5,101,158.07183837890625,85.81707763671875,153.69775390625,78.6922607421875C149.3223876953125,71.56744384765625,140,72.500732421875,140,72.500732421875C140,72.500732421875,149.3223876953125,73.43255615234375,153.69775390625,66.3077392578125C158.07183837890625,59.18292236328125,157.5,44,157.5,44C157.5,44,156.92694091796875,59.18292236328125,161.30224609375,66.3077392578125C165.677490234375,73.43255615234375,175,72.500732421875,175,72.500732421875C175,72.500732421875,165.677490234375,71.56744384765625,161.30224609375,78.6922607421875C156.92694091796875,85.81707763671875,157.5,101,157.5,101L157.5,101"/></g><g id="strokes-b1c71a4d-4b13-809d-8008-28cd9470fc2c-8af6a589-27c7-808d-8007-67be72b3102f" class="strokes"><g class="stroke-shape"><path d="M157.5,101C157.5,101,158.07183837890625,85.81707763671875,153.69775390625,78.6922607421875C149.3223876953125,71.56744384765625,140,72.500732421875,140,72.500732421875C140,72.500732421875,149.3223876953125,73.43255615234375,153.69775390625,66.3077392578125C158.07183837890625,59.18292236328125,157.5,44,157.5,44C157.5,44,156.92694091796875,59.18292236328125,161.30224609375,66.3077392578125C165.677490234375,73.43255615234375,175,72.500732421875,175,72.500732421875C175,72.500732421875,165.677490234375,71.56744384765625,161.30224609375,78.6922607421875C156.92694091796875,85.81707763671875,157.5,101,157.5,101L157.5,101" style="fill: none; stroke-width: 1.3882; stroke: rgb(242, 58, 229); stroke-opacity: 1;"/></g></g></g><g id="shape-8af6a589-27c7-808d-8007-67bdbb1d1272"><g class="fills" id="fills-8af6a589-27c7-808d-8007-67bdbb1d1272"><path d="M409.5,93C409.5,93,410.07183837890625,77.81707763671875,405.69775390625,70.6922607421875C401.3223876953125,63.56744384765625,392,64.500732421875,392,64.500732421875C392,64.500732421875,401.3223876953125,65.43255615234375,405.69775390625,58.3077392578125C410.07183837890625,51.18292236328125,409.5,36,409.5,36C409.5,36,408.92694091796875,51.18292236328125,413.30224609375,58.3077392578125C417.677490234375,65.43255615234375,427,64.500732421875,427,64.500732421875C427,64.500732421875,417.677490234375,63.56744384765625,413.30224609375,70.6922607421875C408.92694091796875,77.81707763671875,409.5,93,409.5,93L409.5,93"/></g><g id="strokes-b1c71a4d-4b13-809d-8008-28cd94712913-8af6a589-27c7-808d-8007-67bdbb1d1272" class="strokes"><g class="stroke-shape"><path d="M409.5,93C409.5,93,410.07183837890625,77.81707763671875,405.69775390625,70.6922607421875C401.3223876953125,63.56744384765625,392,64.500732421875,392,64.500732421875C392,64.500732421875,401.3223876953125,65.43255615234375,405.69775390625,58.3077392578125C410.07183837890625,51.18292236328125,409.5,36,409.5,36C409.5,36,408.92694091796875,51.18292236328125,413.30224609375,58.3077392578125C417.677490234375,65.43255615234375,427,64.500732421875,427,64.500732421875C427,64.500732421875,417.677490234375,63.56744384765625,413.30224609375,70.6922607421875C408.92694091796875,77.81707763671875,409.5,93,409.5,93L409.5,93" style="fill: none; stroke-width: 1.3882; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-10ab256c-db3d-80c3-8007-67c21aa60d58"><g class="fills" id="fills-10ab256c-db3d-80c3-8007-67c21aa60d58"><path d="M274,114C275.00115966796875,114.99993896484375,314.04656982421875,114,328.0628662109375,119C342.07916259765625,124,344.08148193359375,135.99993896484375,337.07330322265625,145"/></g><g id="strokes-b1c71a4d-4b13-809d-8008-28cd94716edd-10ab256c-db3d-80c3-8007-67c21aa60d58" class="strokes"><g class="stroke-shape"><path d="M274,114C275.00115966796875,114.99993896484375,314.04656982421875,114,328.0628662109375,119C342.07916259765625,124,344.08148193359375,135.99993896484375,337.07330322265625,145" style="fill: none; stroke-width: 1.99785; stroke: rgb(20, 206, 202); stroke-opacity: 1;"/></g></g></g></g></g></g></g></g></g></svg>
\ No newline at end of file
+<svg width="463" xmlns="http://www.w3.org/2000/svg" height="229" id="screenshot-e32531b0-8f0e-8085-8008-26334089cb02" viewBox="0 0 463 229" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb02"><defs><clipPath id="frame-clip-e32531b0-8f0e-8085-8008-26334089cb02-render-1" class="frame-clip frame-clip-def"><rect rx="0" ry="0" x="0" y="0" width="462.99973754749135" height="228.9999398724458" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)"/></clipPath></defs><g class="frame-container-wrapper"><g class="frame-container-blur"><g class="frame-container-shadows"><g clip-path="url(#frame-clip-e32531b0-8f0e-8085-8008-26334089cb02-render-1)" fill="none"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb02"><rect rx="0" ry="0" x="0" y="0" width="462.99973754749135" height="228.9999398724458" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" class="frame-background"/></g><g class="frame-children"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb03" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb09" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0a"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0a"><path d="M196.24061584472656,78.86276245117188C197.27137756347656,79.40719604492188,197.66835021972656,80.68795776367188,197.12586975097656,81.72384643554688C196.58363342285156,82.75949096679688,195.30702209472656,83.15756225585938,194.27503967285156,82.61215209960938C193.24305725097656,82.06796264648438,192.84706115722656,80.78707885742188,193.38929748535156,79.75241088867188C193.93226623535156,78.71688842773438,195.20814514160156,78.31857299804688,196.24061584472656,78.86276245117188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(74, 207, 203);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0b"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0b"><path d="M167.81239318847656,133.70590209960938C167.78260803222656,133.76449584960938,169.45594787597656,130.53866577148438,169.45594787597656,130.53866577148438L177.49745178222656,115.03439331054688C177.49745178222656,115.03439331054688,192.75062561035156,85.62643432617188,194.55384826660156,82.15048217773438" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06ca9f3a6-e32531b0-8f0e-8085-8008-26334089cb0b" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M167.81239318847656,133.70590209960938C167.78260803222656,133.76449584960938,169.45594787597656,130.53866577148438,169.45594787597656,130.53866577148438L177.49745178222656,115.03439331054688C177.49745178222656,115.03439331054688,192.75062561035156,85.62643432617188,194.55384826660156,82.15048217773438" style="fill: none; stroke-width: 0.60359; stroke: rgb(74, 207, 203); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0c"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0c"><path d="M209.26258850097656,162.66159057617188C188.10633850097656,161.17269897460938,167.56971740722656,136.42843627929688,181.53309631347656,111.23141479492188C197.15882873535156,83.03256225585938,221.11341857910156,98.94552612304688,221.11341857910156,98.94552612304688C221.11341857910156,98.94552612304688,256.9129943847656,123.34054565429688,262.8150939941406,90.62533569335938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06caa8654-e32531b0-8f0e-8085-8008-26334089cb0c" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M209.26258850097656,162.66159057617188C188.10633850097656,161.17269897460938,167.56971740722656,136.42843627929688,181.53309631347656,111.23141479492188C197.15882873535156,83.03256225585938,221.11341857910156,98.94552612304688,221.11341857910156,98.94552612304688C221.11341857910156,98.94552612304688,256.9129943847656,123.34054565429688,262.8150939941406,90.62533569335938" style="fill: none; stroke-width: 3.02094; stroke: rgb(74, 207, 203); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0d" style="opacity: 1;"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0d"><path d="M201.34632873535156,180.76791381835938L223.14662170410156,180.27767944335938C223.14662170410156,180.27767944335938,251.78309631347656,206.59201049804688,282.8590393066406,194.33322143554688C313.9339904785156,182.07589721679688,302.7079162597656,148.57272338867188,287.9032287597656,142.03524780273438C273.0970764160156,135.49801635742188,264.6371154785156,134.68038940429688,264.7994689941406,125.20150756835938C264.9610900878906,115.72116088867188,298.9076232910156,111.54464721679688,281.4190979003906,80.42941284179688C277.3443908691406,73.18038940429688,276.0094299316406,75.47970581054688,272.7098693847656,65.56613159179688C268.1210021972656,51.779632568359375,253.89857482910156,48.223114013671875,253.89857482910156,48.223114013671875C253.89857482910156,48.223114013671875,259.4291076660156,33.187347412109375,248.85487365722656,30.408784866333008C238.27894592285156,27.630220413208008,237.92323303222656,34.713348388671875,237.92323303222656,34.713348388671875C237.92323303222656,34.713348388671875,238.44105529785156,27.302949905395508,231.28285217285156,27.793184280395508C224.12464904785156,28.284883499145508,220.81678771972656,37.246673583984375,220.81678771972656,37.246673583984375C220.81678771972656,37.246673583984375,219.24256896972656,31.552217483520508,214.03651428222656,33.187347412109375C208.83021545410156,34.820770263671875,192.88587951660156,48.713348388671875,210.62049865722656,74.04562377929688C228.35462951660156,99.37777709960938,240.44203186035156,106.53659057617188,233.31044006347656,119.94979858398438C226.17713928222656,133.36459350585938,197.95204162597656,129.85861206054688,198.10462951660156,156.38168334960938C198.25575256347656,182.90463256835938,201.34632873535156,180.76791381835938,201.34632873535156,180.76791381835938Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(163, 120, 243); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0e"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0e"><path d="M392.0960998535156,45.843841552734375C392.0960998535156,45.843841552734375,392.4642639160156,36.061737060546875,389.6498107910156,31.471284866333008C386.8348693847656,26.880830764770508,380.8368225097656,27.482149124145508,380.8368225097656,27.482149124145508C380.8368225097656,27.482149124145508,386.8348693847656,28.082490921020508,389.6498107910156,23.491914749145508C392.4642639160156,18.901704788208008,392.0960998535156,9.119478225708008,392.0960998535156,9.119478225708008C392.0960998535156,9.119478225708008,391.7276916503906,18.901704788208008,394.5428771972656,23.491914749145508C397.3575744628906,28.082490921020508,403.3558654785156,27.482149124145508,403.3558654785156,27.482149124145508C403.3558654785156,27.482149124145508,397.3575744628906,26.880830764770508,394.5428771972656,31.471284866333008C391.7276916503906,36.061737060546875,392.0960998535156,45.843841552734375,392.0960998535156,45.843841552734375Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232); fill-opacity: 1;"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cab7a72-e32531b0-8f0e-8085-8008-26334089cb0e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M392.0960998535156,45.843841552734375C392.0960998535156,45.843841552734375,392.4642639160156,36.061737060546875,389.6498107910156,31.471284866333008C386.8348693847656,26.880830764770508,380.8368225097656,27.482149124145508,380.8368225097656,27.482149124145508C380.8368225097656,27.482149124145508,386.8348693847656,28.082490921020508,389.6498107910156,23.491914749145508C392.4642639160156,18.901704788208008,392.0960998535156,9.119478225708008,392.0960998535156,9.119478225708008C392.0960998535156,9.119478225708008,391.7276916503906,18.901704788208008,394.5428771972656,23.491914749145508C397.3575744628906,28.082490921020508,403.3558654785156,27.482149124145508,403.3558654785156,27.482149124145508C403.3558654785156,27.482149124145508,397.3575744628906,26.880830764770508,394.5428771972656,31.471284866333008C391.7276916503906,36.061737060546875,392.0960998535156,45.843841552734375,392.0960998535156,45.843841552734375Z" style="fill: none; stroke-width: 1.40237; stroke: rgb(255, 154, 232); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb0f"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb0f"><path d="M237.77919006347656,32.678070068359375C237.71888732910156,35.309661865234375,241.00135803222656,45.569671630859375,237.60267639160156,44.358489990234375C234.20448303222656,43.147186279296875,238.11537170410156,33.041839599609375,238.11537170410156,33.041839599609375" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cabc2af-e32531b0-8f0e-8085-8008-26334089cb0f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M237.77919006347656,32.678070068359375C237.71888732910156,35.309661865234375,241.00135803222656,45.569671630859375,237.60267639160156,44.358489990234375C234.20448303222656,43.147186279296875,238.11537170410156,33.041839599609375,238.11537170410156,33.041839599609375" style="fill: none; stroke-width: 0.527993; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb10"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb10"><path d="M220.05409240722656,35.622772216796875C220.05409240722656,35.622772216796875,223.40394592285156,48.560516357421875,220.10145568847656,47.318084716796875C216.79798889160156,46.075408935546875,220.07191467285156,36.325164794921875,220.07191467285156,36.325164794921875" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cac654c-e32531b0-8f0e-8085-8008-26334089cb10" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M220.05409240722656,35.622772216796875C220.05409240722656,35.622772216796875,223.40394592285156,48.560516357421875,220.10145568847656,47.318084716796875C216.79798889160156,46.075408935546875,220.07191467285156,36.325164794921875,220.07191467285156,36.325164794921875" style="fill: none; stroke-width: 0.527993; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb11" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb17"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb17"><path d="M281.0863342285156,159.98593139648438C281.2552795410156,159.67684936523438,281.1424865722656,159.28890991210938,280.8356018066406,159.11886596679688L210.17469787597656,120.11947631835938C209.86610412597656,119.95053100585938,209.48060607910156,120.06417846679688,209.31117248535156,120.37326049804688L206.83168029785156,124.92306518554688C206.66224670410156,125.23214721679688,206.77528381347656,125.62167358398438,207.08216857910156,125.79037475585938L277.7425842285156,164.78976440429688C278.0516662597656,164.96005249023438,278.4371643066406,164.84640502929688,278.6065979003906,164.53732299804688L281.0863342285156,159.98593139648438Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cacf662-e32531b0-8f0e-8085-8008-26334089cb17" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M281.0863342285156,159.98593139648438C281.2552795410156,159.67684936523438,281.1424865722656,159.28890991210938,280.8356018066406,159.11886596679688L210.17469787597656,120.11947631835938C209.86610412597656,119.95053100585938,209.48060607910156,120.06417846679688,209.31117248535156,120.37326049804688L206.83168029785156,124.92306518554688C206.66224670410156,125.23214721679688,206.77528381347656,125.62167358398438,207.08216857910156,125.79037475585938L277.7425842285156,164.78976440429688C278.0516662597656,164.96005249023438,278.4371643066406,164.84640502929688,278.6065979003906,164.53732299804688L281.0863342285156,159.98593139648438Z" style="fill: none; stroke-width: 1.33017; stroke: rgb(255, 255, 255); stroke-opacity: 0.002; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb18"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb18"><path d="M277.4071350097656,167.03829956054688C277.5765686035156,166.72921752929688,277.4637756347656,166.34127807617188,277.1564025878906,166.17111206054688L206.49598693847656,127.17184448242188C206.18910217285156,127.00155639648438,205.80189514160156,127.11495971679688,205.63270568847656,127.42562866210938L203.15296936035156,131.97518920898438C202.98353576660156,132.28451538085938,203.09657287597656,132.67245483398438,203.40370178222656,132.84274291992188L274.0641174316406,171.84213256835938C274.3729553222656,172.01083374023438,274.7584533691406,171.89877319335938,274.9273986816406,171.58810424804688L277.4071350097656,167.03829956054688Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cad086c-e32531b0-8f0e-8085-8008-26334089cb18" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M277.4071350097656,167.03829956054688C277.5765686035156,166.72921752929688,277.4637756347656,166.34127807617188,277.1564025878906,166.17111206054688L206.49598693847656,127.17184448242188C206.18910217285156,127.00155639648438,205.80189514160156,127.11495971679688,205.63270568847656,127.42562866210938L203.15296936035156,131.97518920898438C202.98353576660156,132.28451538085938,203.09657287597656,132.67245483398438,203.40370178222656,132.84274291992188L274.0641174316406,171.84213256835938C274.3729553222656,172.01083374023438,274.7584533691406,171.89877319335938,274.9273986816406,171.58810424804688L277.4071350097656,167.03829956054688Z" style="fill: none; stroke-width: 1.33017; stroke: rgb(255, 255, 255); stroke-opacity: 0.002; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb19"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb19"><path d="M273.4151916503906,174.05624389648438C273.5846252441406,173.74716186523438,273.4718322753906,173.35751342773438,273.1644592285156,173.18881225585938L202.50404357910156,134.18954467773438C202.19520568847656,134.01925659179688,201.80946350097656,134.13265991210938,201.64027404785156,134.44174194335938L199.16053771972656,138.99288940429688C198.99159240722656,139.30209350585938,199.10414123535156,139.68991088867188,199.41151428222656,139.86044311523438L270.0719299316406,178.85971069335938C270.3805236816406,179.02828979492188,270.7660217285156,178.91488647460938,270.9354553222656,178.60580444335938L273.4151916503906,174.05624389648438Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cadb2e0-e32531b0-8f0e-8085-8008-26334089cb19" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M273.4151916503906,174.05624389648438C273.5846252441406,173.74716186523438,273.4718322753906,173.35751342773438,273.1644592285156,173.18881225585938L202.50404357910156,134.18954467773438C202.19520568847656,134.01925659179688,201.80946350097656,134.13265991210938,201.64027404785156,134.44174194335938L199.16053771972656,138.99288940429688C198.99159240722656,139.30209350585938,199.10414123535156,139.68991088867188,199.41151428222656,139.86044311523438L270.0719299316406,178.85971069335938C270.3805236816406,179.02828979492188,270.7660217285156,178.91488647460938,270.9354553222656,178.60580444335938L273.4151916503906,174.05624389648438Z" style="fill: none; stroke-width: 1.33017; stroke: rgb(255, 255, 255); stroke-opacity: 0.002; stroke-linecap: round;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb12"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb12"><path d="M255.75843811035156,180.77743530273438C255.75843811035156,180.77743530273438,254.26942443847656,150.48873901367188,244.52137756347656,153.99191284179688C234.77308654785156,157.49325561523438,241.01991271972656,188.43234252929688,243.05506896972656,179.18246459960938C245.09095764160156,169.93270874023438,242.41761779785156,151.29904174804688,233.79579162597656,151.77682495117188C225.17420959472656,152.25314331054688,228.83851623535156,184.91329956054688,231.67201232910156,176.51535034179688C234.50672912597656,168.11898803710938,231.55580139160156,147.95736694335938,221.82020568847656,151.97665405273438C212.08485412597656,155.99594116210938,222.43983459472656,180.06771850585938,222.43983459472656,180.06771850585938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cadda5f-e32531b0-8f0e-8085-8008-26334089cb12" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M255.75843811035156,180.77743530273438C255.75843811035156,180.77743530273438,254.26942443847656,150.48873901367188,244.52137756347656,153.99191284179688C234.77308654785156,157.49325561523438,241.01991271972656,188.43234252929688,243.05506896972656,179.18246459960938C245.09095764160156,169.93270874023438,242.41761779785156,151.29904174804688,233.79579162597656,151.77682495117188C225.17420959472656,152.25314331054688,228.83851623535156,184.91329956054688,231.67201232910156,176.51535034179688C234.50672912597656,168.11898803710938,231.55580139160156,147.95736694335938,221.82020568847656,151.97665405273438C212.08485412597656,155.99594116210938,222.43983459472656,180.06771850585938,222.43983459472656,180.06771850585938" style="fill: none; stroke-width: 0.794339; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb13"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb13"><path d="M267.4845275878906,84.58126831054688C267.4845275878906,84.58126831054688,266.2699279785156,94.88583374023438,254.61146545410156,93.38925170898438C242.95472717285156,91.89279174804688,244.05995178222656,79.79513549804688,244.05995178222656,79.79513549804688" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cae3449-e32531b0-8f0e-8085-8008-26334089cb13" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M267.4845275878906,84.58126831054688C267.4845275878906,84.58126831054688,266.2699279785156,94.88583374023438,254.61146545410156,93.38925170898438C242.95472717285156,91.89279174804688,244.05995178222656,79.79513549804688,244.05995178222656,79.79513549804688" style="fill: none; stroke-width: 2.64466; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb14"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb14"><path d="M264.8663635253906,78.75753784179688C266.3607482910156,75.92343139648438,265.2462463378906,72.33383178710938,262.3749084472656,70.73788452148438C259.5033264160156,69.14193725585938,255.96253967285156,70.14584350585938,254.46864318847656,72.98019409179688C252.97254943847656,75.81417846679688,254.08705139160156,79.40536499023438,256.9586486816406,80.99984741210938C259.8299865722656,82.59579467773438,263.3702697753906,81.59176635742188,264.8663635253906,78.75753784179688Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06caeb801-e32531b0-8f0e-8085-8008-26334089cb14" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M264.8663635253906,78.75753784179688C266.3607482910156,75.92343139648438,265.2462463378906,72.33383178710938,262.3749084472656,70.73788452148438C259.5033264160156,69.14193725585938,255.96253967285156,70.14584350585938,254.46864318847656,72.98019409179688C252.97254943847656,75.81417846679688,254.08705139160156,79.40536499023438,256.9586486816406,80.99984741210938C259.8299865722656,82.59579467773438,263.3702697753906,81.59176635742188,264.8663635253906,78.75753784179688Z" style="fill: none; stroke-width: 2.0117; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb15"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb15"><path d="M177.86195373535156,105.41317749023438C180.19007873535156,102.81845092773438,184.19325256347656,102.63095092773438,186.80506896972656,104.99496459960938C189.41566467285156,107.35910034179688,189.64588928222656,111.37936401367188,187.31898498535156,113.97396850585938C184.99208068847656,116.56893920898438,180.98768615722656,116.75643920898438,178.37709045410156,114.39328002929688C175.76576232910156,112.02926635742188,175.53504943847656,108.00900268554688,177.86195373535156,105.41317749023438Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 255, 255);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06caec027-e32531b0-8f0e-8085-8008-26334089cb15" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M177.86195373535156,105.41317749023438C180.19007873535156,102.81845092773438,184.19325256347656,102.63095092773438,186.80506896972656,104.99496459960938C189.41566467285156,107.35910034179688,189.64588928222656,111.37936401367188,187.31898498535156,113.97396850585938C184.99208068847656,116.56893920898438,180.98768615722656,116.75643920898438,178.37709045410156,114.39328002929688C175.76576232910156,112.02926635742188,175.53504943847656,108.00900268554688,177.86195373535156,105.41317749023438Z" style="fill: none; stroke-width: 3.02094; stroke: rgb(74, 207, 203); stroke-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb16"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb16"><path d="M193.61976623535156,119.43234252929688C194.08216857910156,119.47177124023438,194.34388732910156,119.97018432617188,194.10707092285156,120.36178588867188L188.54505920410156,129.55404663085938C188.32875061035156,129.91232299804688,187.81922912597656,129.96249389648438,187.53407287597656,129.65475463867188L177.74964904785156,119.11068725585938C177.36341857910156,118.69479370117188,177.69984436035156,118.03048706054688,178.27333068847656,118.08078002929688L193.61976623535156,119.43234252929688Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06caf3624-e32531b0-8f0e-8085-8008-26334089cb16" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M193.61976623535156,119.43234252929688C194.08216857910156,119.47177124023438,194.34388732910156,119.97018432617188,194.10707092285156,120.36178588867188L188.54505920410156,129.55404663085938C188.32875061035156,129.91232299804688,187.81922912597656,129.96249389648438,187.53407287597656,129.65475463867188L177.74964904785156,119.11068725585938C177.36341857910156,118.69479370117188,177.69984436035156,118.03048706054688,178.27333068847656,118.08078002929688L193.61976623535156,119.43234252929688Z" style="fill: none; stroke-width: 1.33017; stroke: rgb(255, 255, 255); stroke-opacity: 0.002; stroke-linecap: round;"/></g></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb04" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1a" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb24" style="opacity: 1;"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb24"><path d="M101.77308654785156,104.67416381835938C101.77308654785156,103.07516479492188,103.07557678222656,101.77999877929688,104.68031311035156,101.77999877929688L168.94862365722656,101.77999877929688C170.55506896972656,101.77999877929688,171.85585021972656,103.07516479492188,171.85585021972656,104.67416381835938L171.85585021972656,141.03988647460938C171.85585021972656,142.63754272460938,170.55506896972656,143.93417358398438,168.94862365722656,143.93417358398438L104.68031311035156,143.93417358398438C103.07557678222656,143.93417358398438,101.77308654785156,142.63754272460938,101.77308654785156,141.03988647460938L101.77308654785156,104.67416381835938L101.77308654785156,104.67416381835938" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cafc8c8-e32531b0-8f0e-8085-8008-26334089cb24" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M101.77308654785156,104.67416381835938C101.77308654785156,103.07516479492188,103.07557678222656,101.77999877929688,104.68031311035156,101.77999877929688L168.94862365722656,101.77999877929688C170.55506896972656,101.77999877929688,171.85585021972656,103.07516479492188,171.85585021972656,104.67416381835938L171.85585021972656,141.03988647460938C171.85585021972656,142.63754272460938,170.55506896972656,143.93417358398438,168.94862365722656,143.93417358398438L104.68031311035156,143.93417358398438C103.07557678222656,143.93417358398438,101.77308654785156,142.63754272460938,101.77308654785156,141.03988647460938L101.77308654785156,104.67416381835938L101.77308654785156,104.67416381835938" style="fill: none; stroke-width: 0.0144623; stroke: rgb(231, 68, 188); stroke-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb25"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb25"><path d="M106.87513732910156,131.63815307617188L153.56898498535156,131.46725463867188" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb011c0-e32531b0-8f0e-8085-8008-26334089cb25" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M106.87513732910156,131.63815307617188L153.56898498535156,131.46725463867188" style="fill: none; stroke-width: 2.35013; stroke: rgb(255, 154, 232); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb26"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb26"><path d="M107.74891662597656,136.66964721679688L127.61488342285156,136.90975952148438" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb0a53b-e32531b0-8f0e-8085-8008-26334089cb26" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M107.74891662597656,136.66964721679688L127.61488342285156,136.90975952148438" style="fill: none; stroke-width: 4.37919; stroke: rgb(62, 229, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb27"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb27"><path d="M115.42005920410156,108.61325073242188L111.54017639160156,113.07736206054688L115.24867248535156,117.58676147460938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb0dda6-e32531b0-8f0e-8085-8008-26334089cb27" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M115.42005920410156,108.61325073242188L111.54017639160156,113.07736206054688L115.24867248535156,117.58676147460938" style="fill: none; stroke-width: 1.88589; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb28"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb28"><path d="M128.41883850097656,117.58810424804688L132.18666076660156,113.03854370117188L128.36805725097656,108.61325073242188" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb139d7-e32531b0-8f0e-8085-8008-26334089cb28" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M128.41883850097656,117.58810424804688L132.18666076660156,113.03854370117188L128.36805725097656,108.61325073242188" style="fill: none; stroke-width: 1.88589; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb29"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb29"><path d="M119.37269592285156,117.58676147460938L124.72474670410156,109.52621459960938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb139d8-e32531b0-8f0e-8085-8008-26334089cb29" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M119.37269592285156,117.58676147460938L124.72474670410156,109.52621459960938" style="fill: none; stroke-width: 1.88589; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2a"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2a"><path d="M136.81532287597656,115.36386108398438C136.82093811035156,113.87203979492188,138.01869201660156,112.66659545898438,139.49134826660156,112.67233276367188C140.96400451660156,112.67672729492188,142.15467834472656,113.89083862304688,142.14857482910156,115.38278198242188C142.14295959472656,116.87619018554688,140.94374084472656,118.08163452148438,139.47108459472656,118.07589721679688C137.99842834472656,118.07003784179688,136.80921936035156,116.85592651367188,136.81532287597656,115.36386108398438Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(80, 15, 185);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2b"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2b"><path d="M157.25819396972656,115.57247924804688C157.26380920410156,114.07882690429688,158.46205139160156,112.87496948242188,159.93421936035156,112.87936401367188C161.40687561035156,112.88510131835938,162.59754943847656,114.09921264648438,162.59169006347656,115.59115600585938C162.58583068847656,117.08322143554688,161.38685607910156,118.28854370117188,159.91371154785156,118.28280639648438C158.44154357910156,118.27841186523438,157.25233459472656,117.06430053710938,157.25819396972656,115.57247924804688Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(62, 229, 255);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2c"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2c"><path d="M146.97792053222656,115.57247924804688C146.98353576660156,114.07882690429688,148.18275451660156,112.87496948242188,149.65541076660156,112.87936401367188C151.12806701660156,112.88510131835938,152.31727600097656,114.09921264648438,152.31166076660156,115.59115600585938C152.30531311035156,117.08322143554688,151.10780334472656,118.28854370117188,149.63514709472656,118.28280639648438C148.16249084472656,118.27841186523438,146.97206115722656,117.06430053710938,146.97792053222656,115.57247924804688Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 255, 255);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2d"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2d"><path d="M134.20741271972656,136.87228393554688L165.08216857910156,137.07492065429688" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb23321-e32531b0-8f0e-8085-8008-26334089cb2d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M134.20741271972656,136.87228393554688L165.08216857910156,137.07492065429688" style="fill: none; stroke-width: 3.28584; stroke: rgb(231, 68, 188); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1b" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2e"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2e"><path d="M141.43910217285156,124.95529174804688C89.40956115722656,124.79330444335938,104.77015686035156,127.54989624023438,67.60731506347656,155.28231811523438C49.56849670410156,168.74337768554688,18.196670532226562,154.17831420898438,18.196670532226562,181.92941284179688C18.196670532226562,189.74386596679688,23.421279907226562,192.47140502929688,27.453750610351562,192.63217163085938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb2a740-e32531b0-8f0e-8085-8008-26334089cb2e" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M141.43910217285156,124.95529174804688C89.40956115722656,124.79330444335938,104.77015686035156,127.54989624023438,67.60731506347656,155.28231811523438C49.56849670410156,168.74337768554688,18.196670532226562,154.17831420898438,18.196670532226562,181.92941284179688C18.196670532226562,189.74386596679688,23.421279907226562,192.47140502929688,27.453750610351562,192.63217163085938" style="fill: none; stroke-width: 2.35013; stroke: rgb(236, 48, 193); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1c" style="opacity: 1;"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb1c"><path d="M94.16419982910156,57.805877685546875C93.87953186035156,57.660491943359375,93.53041076660156,57.852996826171875,93.48280334472656,58.167694091796875C93.43885803222656,58.458831787109375,93.30238342285156,58.965667724609375,93.02919006347656,59.659881591796875C92.56825256347656,60.826873779296875,91.89955139160156,62.005706787109375,90.93861389160156,63.096893310546875C89.75843811035156,64.43746948242188,88.24183654785156,65.59213256835938,86.35072326660156,66.44320678710938C85.04554748535156,67.03073120117188,83.88417053222656,67.14877319335938,82.62538146972656,66.94088745117188C82.08558654785156,66.85165405273438,81.53773498535156,66.68173217773438,80.80799865722656,66.44320678710938C80.44593811035156,66.32443237304688,79.03749084472656,65.87167358398438,78.71888732910156,65.76498413085938C73.34364318847656,63.967620849609375,68.25257873535156,63.760833740234375,59.82118225097656,66.12680053710938C44.22206115722656,70.50387573242188,38.79115295410156,87.14987182617188,39.78822326660156,110.12838745117188C40.05873107910156,116.36825561523438,40.94349670410156,122.13925170898438,42.19544982910156,127.31259155273438C42.73475646972656,129.54281616210938,43.29750061035156,131.49618530273438,43.87586975097656,133.19088745117188C44.07972717285156,133.78561401367188,44.25062561035156,134.33541870117188,44.42127990722656,134.77401733398438C44.52430725097656,135.03878784179688,44.60829162597656,135.22262573242188,44.64759826660156,135.31674194335938C46.04774475097656,138.72457885742188,47.61488342285156,141.74325561523438,49.37220764160156,144.54183959960938C52.00941467285156,148.73849487304688,59.60731506347656,157.53854370117188,60.32142639160156,158.83212280273438C61.00599670410156,160.07516479492188,61.29383850097656,161.20529174804688,61.27479553222656,162.44992065429688C61.17616271972656,168.85775756835938,56.22352600097656,172.33651733398438,39.69667053222656,177.55343627929688C33.24647521972656,179.59091186523438,29.179336547851562,184.23739624023438,27.068496704101562,190.66842651367188C25.597549438476562,195.14730834960938,25.257217407226562,199.81259155273438,25.523330688476562,203.87338256835938C25.550674438476562,204.28842163085938,25.549453735351562,204.57357788085938,25.568252563476562,204.73300170898438C25.594375610351562,204.95578002929688,25.797744750976562,205.16989135742188,26.023086547851562,205.18441772460938C26.217910766601562,205.19747924804688,42.84388732910156,206.14535522460938,44.37586975097656,206.22482299804688C51.24037170410156,206.58065795898438,56.51136779785156,206.80807495117188,59.63954162597656,206.81246948242188C59.91395568847656,206.81246948242188,69.87196350097656,206.49984741210938,69.99696350097656,206.49545288085938C72.16883850097656,206.42465209960938,79.70179748535156,206.18417358398438,79.85462951660156,206.18002319335938C79.90638732910156,206.19015502929688,80.11903381347656,206.19308471679688,80.44471740722656,206.22482299804688C80.98841857910156,206.27841186523438,86.61976623535156,206.77755737304688,89.03163146972656,206.94845581054688C95.43055725097656,207.39987182617188,101.79310607910156,207.67929077148438,107.74769592285156,207.71688842773438C116.57557678222656,207.77182006835938,123.71766662597656,207.25949096679688,128.64418029785156,206.08883666992188C138.55360412597656,203.73300170898438,147.77870178222656,198.54660034179688,152.71986389160156,191.66268920898438C158.84437561035156,183.13339233398438,158.24232482910156,172.65487670898438,149.63099670410156,160.86679077148438C143.87562561035156,152.98873901367188,136.58998107910156,149.61264038085938,128.05238342285156,149.96871948242188C121.31019592285156,150.24923706054688,114.31532287597656,152.75424194335938,106.33900451660156,157.06808471679688C105.14979553222656,157.71054077148438,94.92323303222656,163.76242065429688,93.75575256347656,164.03292846679688C91.08094787597656,164.64938354492188,89.07630920410156,163.95187377929688,87.62269592285156,162.40487670898438C87.23890686035156,161.99691772460938,86.91761779785156,161.57577514648438,86.66932678222656,161.13864135742188C86.52088928222656,160.87973022460938,86.43641662597656,160.65414428710938,86.39588928222656,160.54977416992188C86.36708068847656,160.47604370117188,86.27113342285156,160.50936889648438,86.21424865722656,160.46017456054688C88.02406311035156,159.70602416992188,89.76087951660156,158.72640991210938,91.39393615722656,157.56588745117188C97.09803771972656,153.51254272460938,100.95863342285156,147.41867065429688,101.29579162597656,142.09909057617188C101.57337951660156,137.72763061523438,100.48963928222656,135.12704467773438,97.75331115722656,131.56283569335938C97.68544006347656,131.47457885742188,97.06312561035156,130.70455932617188,96.89027404785156,130.47750854492188C94.92884826660156,127.90316772460938,94.25306701660156,126.18832397460938,94.43641662597656,123.60385131835938C94.70643615722656,119.82821655273438,94.48866271972656,116.31332397460938,94.02772521972656,113.20333862304688C93.92030334472656,112.47274780273438,93.82704162597656,111.81845092773438,93.70936584472656,111.25839233398438C93.70106506347656,111.21078491210938,93.67445373535156,111.21224975585938,93.66444396972656,111.16744995117188C94.75282287597656,111.19918823242188,96.09339904785156,111.16879272460938,97.66200256347656,110.98641967773438C100.15199279785156,110.69833374023438,102.65834045410156,110.11227416992188,105.11170959472656,109.17770385742188C107.48426818847656,108.27462768554688,109.83778381347656,106.55099487304688,112.10853576660156,104.29367065429688C113.31947326660156,103.08969116210938,114.43421936035156,101.82919311523438,115.42420959472656,100.54135131835938C115.77064514160156,100.08981323242188,116.06849670410156,99.65133666992188,116.33290100097656,99.27499389648438C116.49110412597656,99.04623413085938,116.59315490722656,98.86703491210938,116.65150451660156,98.77719116210938C116.72840881347656,98.65841674804688,116.73988342285156,98.54867553710938,116.69618225097656,98.41537475585938L114.15223693847656,90.68197631835938C114.02455139160156,90.29562377929688,113.48524475097656,90.23495483398438,113.28895568847656,90.59237670898438C113.23646545410156,90.68637084960938,113.12196350097656,90.87887573242188,112.97084045410156,91.13497924804688C112.71766662597656,91.56185913085938,112.44178771972656,92.02206420898438,112.10853576660156,92.53573608398438C111.15345764160156,94.00619506835938,110.09364318847656,95.46334838867188,108.92762756347656,96.83236694335938C106.64393615722656,99.51669311523438,104.29627990722656,101.50802612304688,101.97816467285156,102.43978881835938C98.35682678222656,103.89559936523438,94.92323303222656,104.05343627929688,92.02870178222656,103.48019409179688C91.48377990722656,103.37179565429688,91.08534240722656,103.27621459960938,90.89369201660156,103.20822143554688L87.84950256347656,100.81185913085938C88.60389709472656,100.80453491210938,89.30043029785156,100.82199096679688,90.25672912597656,100.76693725585938C92.39686584472656,100.64254760742188,94.50184631347656,100.38778686523438,96.48158264160156,99.99862670898438C99.25526428222656,99.45285034179688,101.58973693847656,98.65573120117188,103.33973693847656,97.55575561523438C105.92445373535156,95.93368530273438,108.31727600097656,93.46774291992188,110.47328186035156,90.54598999023438C111.16810607910156,89.60409545898438,111.80043029785156,88.69943237304688,112.33509826660156,87.83273315429688C112.65663146972656,87.31185913085938,112.89930725097656,86.91976928710938,113.01722717285156,86.70260620117188C113.09095764160156,86.56369018554688,113.09266662597656,86.38864135742188,113.01722717285156,86.25094604492188L109.10975646972656,79.19589233398438C108.91761779785156,78.85006713867188,108.38978576660156,78.87313842773438,108.24623107910156,79.24105834960938C108.19398498535156,79.37484741210938,108.07020568847656,79.62948608398438,107.88294982910156,80.00985717773438C107.56849670410156,80.65084838867188,107.19203186035156,81.38168334960938,106.70228576660156,82.18038940429688C105.29652404785156,84.47250366210938,103.43885803222656,86.87911987304688,101.06947326660156,89.27975463867188C96.75184631347656,93.65451049804688,89.69862365722656,93.90487670898438,79.17274475097656,91.90353393554688C75.89906311035156,91.27975463867188,73.73744201660156,91.73715209960938,72.49598693847656,92.89755249023438C72.10487365722656,93.26376342773438,71.98866271972656,93.57333374023438,71.85951232910156,93.89315795898438L66.54481506347656,93.44039916992188C66.51136779785156,93.35787963867188,66.49232482910156,93.29269409179688,66.45301818847656,93.16976928710938C66.17982482910156,92.28695678710938,66.17543029785156,91.36080932617188,66.58949279785156,90.50119018554688C66.87757873535156,89.90646362304688,67.36878967285156,89.38265991210938,68.08827209472656,88.91818237304688C69.37660217285156,88.08883666992188,70.12782287597656,88.17721557617188,76.81044006347656,89.46078491210938C81.82533264160156,90.42465209960938,85.48451232910156,90.75302124023438,89.71180725097656,90.32015991210938C94.41297912597656,89.83981323242188,98.65150451660156,86.81979370117188,102.34144592285156,82.13558959960938C103.74549865722656,80.35153198242188,104.97206115722656,78.43673706054688,106.02088928222656,76.52792358398438C106.38807678222656,75.85958862304688,106.70668029785156,75.23153686523438,106.97425842285156,74.67367553710938C107.13685607910156,74.33724975585938,107.23597717285156,74.12704467773438,107.29286193847656,73.99545288085938C107.35072326660156,73.86203002929688,107.36537170410156,73.71469116210938,107.29286193847656,73.58822631835938L103.29481506347656,66.57907104492188C103.11488342285156,66.26242065429688,102.65541076660156,66.26083374023438,102.47767639160156,66.57907104492188C102.41273498535156,66.69467163085938,102.29896545410156,66.90194702148438,102.11439514160156,67.21212768554688C101.80360412597656,67.73056030273438,101.43104553222656,68.30722045898438,101.02406311035156,68.93051147460938C99.85975646972656,70.71090698242188,98.56752014160156,72.47140502929688,97.16200256347656,74.13107299804688C93.79969787597656,78.10189819335938,90.36463928222656,80.75631713867188,87.12294006347656,81.45675659179688C85.69837951660156,81.76510620117188,84.20082092285156,81.83444213867188,82.53529357910156,81.68258666992188C80.80482482910156,81.52474975585938,79.34535217285156,81.23117065429688,76.35682678222656,80.50753784179688C69.42738342285156,78.83065795898438,66.60975646972656,78.64767456054688,63.27381896972656,80.50753784179688C60.76478576660156,81.90682983398438,59.12635803222656,84.17306518554688,58.18592834472656,87.06430053710938C57.36732482910156,89.58090209960938,57.16810607910156,92.19430541992188,57.32240295410156,94.48080444335938C57.32850646972656,94.56185913085938,57.31654357910156,94.59652709960938,57.32240295410156,94.66159057617188L52.68959045410156,96.24484252929688C52.47572326660156,92.85275268554688,52.93983459472656,88.83700561523438,54.59657287597656,84.98495483398438C56.00257873535156,81.71725463867188,58.11878967285156,78.99508666992188,61.13832092285156,76.98019409179688C66.20765686035156,73.59652709960938,69.92860412597656,73.34371948242188,76.44667053222656,74.80941772460938C76.70301818847656,74.86679077148438,76.83119201660156,74.87033081054688,77.35585021972656,74.99020385742188C81.66981506347656,75.97714233398438,83.73158264160156,76.27023315429688,86.48768615722656,75.98532104492188C90.43714904785156,75.57711791992188,93.92030334472656,72.91891479492188,96.89027404785156,68.79476928710938C98.01332092285156,67.23410034179688,98.97450256347656,65.58041381835938,99.79750061035156,63.910736083984375C100.08534240722656,63.326507568359375,100.35975646972656,62.770965576171875,100.56922912597656,62.282806396484375C100.69544982910156,61.988250732421875,100.75257873535156,61.810760498046875,100.79603576660156,61.695037841796875C100.88050842285156,61.473724365234375,100.78138732910156,61.215179443359375,100.56922912597656,61.107025146484375L94.16419982910156,57.805877685546875L94.16419982910156,57.805877685546875" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 217, 212);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1d"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb1d"><path d="M86.26185607910156,160.06784057617188C81.23548889160156,161.49911499023438,75.31312561035156,161.55856323242188,69.09730529785156,159.64682006835938" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb38170-e32531b0-8f0e-8085-8008-26334089cb1d" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M86.26185607910156,160.06784057617188C81.23548889160156,161.49911499023438,75.31312561035156,161.55856323242188,69.09730529785156,159.64682006835938" style="fill: none; stroke-width: 0.929927; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1e" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb2f"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb2f"><path d="M85.30409240722656,187.81478881835938C85.30409240722656,187.35739135742188,85.67640686035156,186.98703002929688,86.13539123535156,186.98703002929688L94.96253967285156,186.98703002929688C95.42201232910156,186.98703002929688,95.79505920410156,187.35739135742188,95.79505920410156,187.81478881835938L95.79505920410156,195.98947143554688C95.79505920410156,196.44821166992188,95.42201232910156,196.81857299804688,94.96253967285156,196.81857299804688L86.13539123535156,196.81857299804688C85.67640686035156,196.81857299804688,85.30409240722656,196.44821166992188,85.30409240722656,195.98947143554688L85.30409240722656,187.81478881835938Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205); fill-opacity: 0.043;"/></g><g stroke-miterlimit="10" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb41ccc-e32531b0-8f0e-8085-8008-26334089cb2f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M85.30409240722656,187.81478881835938C85.30409240722656,187.35739135742188,85.67640686035156,186.98703002929688,86.13539123535156,186.98703002929688L94.96253967285156,186.98703002929688C95.42201232910156,186.98703002929688,95.79505920410156,187.35739135742188,95.79505920410156,187.81478881835938L95.79505920410156,195.98947143554688C95.79505920410156,196.44821166992188,95.42201232910156,196.81857299804688,94.96253967285156,196.81857299804688L86.13539123535156,196.81857299804688C85.67640686035156,196.81857299804688,85.30409240722656,196.44821166992188,85.30409240722656,195.98947143554688L85.30409240722656,187.81478881835938Z" style="fill: none; stroke-width: 0.43387; stroke: rgb(83, 9, 205); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb30"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb30"><path d="M97.76356506347656,198.71725463867188C97.76356506347656,198.25985717773438,98.13587951660156,197.88961791992188,98.59657287597656,197.88961791992188L107.42201232910156,197.88961791992188C107.88294982910156,197.88961791992188,108.25502014160156,198.25985717773438,108.25502014160156,198.71725463867188L108.25502014160156,206.89193725585938C108.25502014160156,207.35067749023438,107.88294982910156,207.72103881835938,107.42201232910156,207.72103881835938L98.59657287597656,207.72103881835938C98.13587951660156,207.72103881835938,97.76356506347656,207.35067749023438,97.76356506347656,206.89193725585938L97.76356506347656,198.71725463867188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(250, 90, 207);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb31"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb31"><path d="M62.05848693847656,198.71725463867188C62.05848693847656,198.25985717773438,62.43226623535156,197.88961791992188,62.89149475097656,197.88961791992188L71.71669006347656,197.88961791992188C72.17762756347656,197.88961791992188,72.54945373535156,198.25985717773438,72.54945373535156,198.71725463867188L72.54945373535156,206.89193725585938C72.54945373535156,207.35067749023438,72.17762756347656,207.72103881835938,71.71669006347656,207.72103881835938L62.89149475097656,207.72103881835938C62.43226623535156,207.72103881835938,62.05848693847656,207.35067749023438,62.05848693847656,206.89193725585938L62.05848693847656,198.71725463867188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb32"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb32"><path d="M74.96571350097656,198.71725463867188C74.96571350097656,198.25985717773438,75.33949279785156,197.88961791992188,75.79872131347656,197.88961791992188L84.62391662597656,197.88961791992188C85.08485412597656,197.88961791992188,85.45668029785156,198.25985717773438,85.45668029785156,198.71725463867188L85.45668029785156,206.89193725585938C85.45668029785156,207.35067749023438,85.08485412597656,207.72103881835938,84.62391662597656,207.72103881835938L75.79872131347656,207.72103881835938C75.33949279785156,207.72103881835938,74.96571350097656,207.35067749023438,74.96571350097656,206.89193725585938L74.96571350097656,198.71725463867188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb33"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb33"><path d="M49.29359436035156,184.76278686523438C49.29359436035156,184.30551147460938,49.66566467285156,183.93368530273438,50.12660217285156,183.93368530273438L58.95228576660156,183.93368530273438C59.41151428222656,183.93368530273438,59.78480529785156,184.30551147460938,59.78480529785156,184.76278686523438L59.78480529785156,192.93746948242188C59.78480529785156,193.39486694335938,59.41151428222656,193.76657104492188,58.95228576660156,193.76657104492188L50.12660217285156,193.76657104492188C49.66566467285156,193.76657104492188,49.29359436035156,193.39486694335938,49.29359436035156,192.93746948242188L49.29359436035156,184.76278686523438Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb1f"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb1f"><path d="M136.06800842285156,164.91854858398438C136.06800842285156,164.91854858398438,122.23793029785156,154.06686401367188,111.83680725097656,162.93319702148438C101.43397521972656,171.79806518554688,85.97596740722656,185.32565307617188,90.95594787597656,188.38912963867188C95.93470764160156,191.45419311523438,124.23353576660156,176.59249877929688,120.25233459472656,171.24826049804688C116.27040100097656,165.90414428710938,104.58265686035156,179.60104370117188,109.81166076660156,183.22311401367188C115.03919982910156,186.84664916992188,132.44520568847656,184.82943725585938,128.05116271972656,181.75704956054688C123.65663146972656,178.68649291992188,105.89979553222656,184.61947631835938,109.20399475097656,189.01010131835938C112.50672912597656,193.40060424804688,123.21302795410156,190.66989135742188,123.21302795410156,190.66989135742188" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb51105-e32531b0-8f0e-8085-8008-26334089cb1f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M136.06800842285156,164.91854858398438C136.06800842285156,164.91854858398438,122.23793029785156,154.06686401367188,111.83680725097656,162.93319702148438C101.43397521972656,171.79806518554688,85.97596740722656,185.32565307617188,90.95594787597656,188.38912963867188C95.93470764160156,191.45419311523438,124.23353576660156,176.59249877929688,120.25233459472656,171.24826049804688C116.27040100097656,165.90414428710938,104.58265686035156,179.60104370117188,109.81166076660156,183.22311401367188C115.03919982910156,186.84664916992188,132.44520568847656,184.82943725585938,128.05116271972656,181.75704956054688C123.65663146972656,178.68649291992188,105.89979553222656,184.61947631835938,109.20399475097656,189.01010131835938C112.50672912597656,193.40060424804688,123.21302795410156,190.66989135742188,123.21302795410156,190.66989135742188" style="fill: none; stroke-width: 0.929927; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb20"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb20"><path d="M71.34022521972656,124.93942260742188C71.34022521972656,122.03219604492188,73.80287170410156,119.67501831054688,76.83949279785156,119.67501831054688C79.87635803222656,119.67501831054688,82.33729553222656,122.03219604492188,82.33729553222656,124.93942260742188C82.33729553222656,127.84664916992188,79.87635803222656,130.20394897460938,76.83949279785156,130.20394897460938C73.80287170410156,130.20394897460938,71.34022521972656,127.84664916992188,71.34022521972656,124.93942260742188Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb578b3-e32531b0-8f0e-8085-8008-26334089cb20" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M71.34022521972656,124.93942260742188C71.34022521972656,122.03219604492188,73.80287170410156,119.67501831054688,76.83949279785156,119.67501831054688C79.87635803222656,119.67501831054688,82.33729553222656,122.03219604492188,82.33729553222656,124.93942260742188C82.33729553222656,127.84664916992188,79.87635803222656,130.20394897460938,76.83949279785156,130.20394897460938C73.80287170410156,130.20394897460938,71.34022521972656,127.84664916992188,71.34022521972656,124.93942260742188Z" style="fill: none; stroke-width: 1.85696; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb21"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb21"><path d="M66.45594787597656,128.17526245117188C66.45594787597656,128.17526245117188,63.03529357910156,136.80136108398438,73.11048889160156,140.71127319335938C83.18617248535156,144.62155151367188,87.45985412597656,134.63497924804688,87.45985412597656,134.63497924804688" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb58717-e32531b0-8f0e-8085-8008-26334089cb21" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M66.45594787597656,128.17526245117188C66.45594787597656,128.17526245117188,63.03529357910156,136.80136108398438,73.11048889160156,140.71127319335938C83.18617248535156,144.62155151367188,87.45985412597656,134.63497924804688,87.45985412597656,134.63497924804688" style="fill: none; stroke-width: 2.44124; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb22"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb22"><path d="M91.32997131347656,186.85824584960938C90.62196350097656,185.73666381835938,91.71913146972656,183.78305053710938,93.78065490722656,182.49655151367188C95.84022521972656,181.20870971679688,98.08485412597656,181.07540893554688,98.79286193847656,182.19857788085938C99.49916076660156,183.32015991210938,98.40174865722656,185.27352905273438,96.34217834472656,186.56002807617188C94.28089904785156,187.84811401367188,92.03602600097656,187.98117065429688,91.32997131347656,186.85824584960938Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(83, 9, 205);"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb23"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb23"><path d="M26.757705688476562,192.59176635742188L45.14076232910156,192.48178100585938L45.35829162597656,182.66012573242188L36.59022521972656,182.75131225585938L36.57997131347656,188.04196166992188" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb62edd-e32531b0-8f0e-8085-8008-26334089cb23" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M26.757705688476562,192.59176635742188L45.14076232910156,192.48178100585938L45.35829162597656,182.66012573242188L36.59022521972656,182.75131225585938L36.57997131347656,188.04196166992188" style="fill: none; stroke-width: 2.35013; stroke: rgb(236, 48, 193); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb05" rx="0" ry="0"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb34" rx="0" ry="0"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3a" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3b" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3e"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb3e"><path d="M346.0494689941406,207.95407104492188C346.0492248535156,207.73788452148438,346.2232971191406,207.56185913085938,346.4374084472656,207.56149291992188L358.7340393066406,207.53964233398438C358.9483947753906,207.53952026367188,359.1229553222656,207.71469116210938,359.1234436035156,207.93087768554688L359.1432189941406,219.36032104492188C359.1437072753906,219.57638549804688,358.9696350097656,219.75167846679688,358.7552795410156,219.75204467773438L346.4584045410156,219.77389526367188C346.2442932128906,219.77426147460938,346.0697326660156,219.59957885742188,346.0694885253906,219.38351440429688L346.0494689941406,207.95407104492188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(255, 154, 232); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3f"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb3f"><path d="M286.2704162597656,208.05990600585938C286.2701721191406,207.84384155273438,286.4432678222656,207.66769409179688,286.6583557128906,207.66732788085938L298.9552307128906,207.64559936523438C299.1693420410156,207.64535522460938,299.3434143066406,207.82064819335938,299.3434143066406,208.03671264648438L299.3636779785156,219.46640014648438C299.3636779785156,219.68222045898438,299.1908264160156,219.85751342773438,298.9762268066406,219.85787963867188L286.6793518066406,219.87973022460938C286.4647521972656,219.88009643554688,286.2906799316406,219.70541381835938,286.2901916503906,219.48934936523438L286.2704162597656,208.05990600585938Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb73d70-e32531b0-8f0e-8085-8008-26334089cb3f" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M286.2704162597656,208.05990600585938C286.2701721191406,207.84384155273438,286.4432678222656,207.66769409179688,286.6583557128906,207.66732788085938L298.9552307128906,207.64559936523438C299.1693420410156,207.64535522460938,299.3434143066406,207.82064819335938,299.3434143066406,208.03671264648438L299.3636779785156,219.46640014648438C299.3636779785156,219.68222045898438,299.1908264160156,219.85751342773438,298.9762268066406,219.85787963867188L286.6793518066406,219.87973022460938C286.4647521972656,219.88009643554688,286.2906799316406,219.70541381835938,286.2901916503906,219.48934936523438L286.2704162597656,208.05990600585938Z" style="fill: none; stroke-width: 2.05227; stroke: rgb(29, 227, 221); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb40"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb40"><path d="M301.5558166503906,208.03268432617188C301.5553283691406,207.81661987304688,301.7286682128906,207.64083862304688,301.9437561035156,207.64035034179688L314.2401428222656,207.61862182617188C314.4547424316406,207.61813354492188,314.6285705566406,207.79367065429688,314.6288146972656,208.00949096679688L314.6485900878906,219.43917846679688C314.6490783691406,219.65512084960938,314.4762268066406,219.83053588867188,314.2616271972656,219.83078002929688L301.9652404785156,219.85275268554688C301.7496643066406,219.85299682617188,301.5760803222656,219.67831420898438,301.5755920410156,219.46237182617188L301.5558166503906,208.03268432617188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(47, 34, 108); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb41"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb41"><path d="M317.6400451660156,208.00424194335938C317.6395568847656,207.78829956054688,317.8128967285156,207.61227416992188,318.0279846191406,207.61178588867188L330.3248596191406,207.59005737304688C330.5389709472656,207.58969116210938,330.7130432128906,207.76510620117188,330.7130432128906,207.98104858398438L330.7333068847656,219.41061401367188C330.7335510253906,219.62680053710938,330.5599670410156,219.80197143554688,330.3458557128906,219.80245971679688L318.0492248535156,219.82418823242188C317.8343811035156,219.82455444335938,317.6603088378906,219.64999389648438,317.6603088378906,219.43380737304688L317.6400451660156,208.00424194335938Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(20, 206, 202); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb42"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb42"><path d="M301.4083557128906,194.49166870117188C301.4078674316406,194.27499389648438,301.5807189941406,194.09945678710938,301.7953186035156,194.09909057617188L314.0919494628906,194.07748413085938C314.3067932128906,194.07711791992188,314.4808654785156,194.25180053710938,314.4813537597656,194.46847534179688L314.5011291503906,205.89755249023438C314.5016174316406,206.11337280273438,314.3282775878906,206.28952026367188,314.1136779785156,206.28988647460938L301.8163146972656,206.31161499023438C301.6022033691406,206.31210327148438,301.4286193847656,206.13656616210938,301.4281311035156,205.92050170898438L301.4083557128906,194.49166870117188Z" style="fill: rgb(255, 30, 189); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb43"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb43"><path d="M368.4300842285156,205.59225463867188C368.4298400878906,205.37606811523438,368.6029357910156,205.20089721679688,368.8180236816406,205.20040893554688L381.1148986816406,205.17868041992188C381.3290100097656,205.17819213867188,381.5030822753906,205.35287475585938,381.5030822753906,205.56906127929688L381.5233459472656,216.99862670898438C381.5238342285156,217.21456909179688,381.3504943847656,217.38998413085938,381.1358947753906,217.39022827148438L368.8395080566406,217.41207885742188C368.6244201660156,217.41244506835938,368.4503479003906,217.23776245117188,368.4503479003906,217.02182006835938L368.4300842285156,205.59225463867188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(163, 120, 243); fill-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3c"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb3c"><path d="M336.4740295410156,153.60568237304688C336.4740295410156,153.60568237304688,300.6595764160156,189.90780639648438,307.2025451660156,196.20541381835938C313.7447814941406,202.50314331054688,350.7904357910156,168.73324584960938,344.8358459472656,166.32638549804688C338.8815002441406,163.91952514648438,320.6817932128906,191.34689331054688,334.7608947753906,189.71066284179688C348.8407287597656,188.07455444335938,363.0939025878906,172.33737182617188,358.1315002441406,170.13058471679688C353.1688537597656,167.92294311523438,339.6651916503906,183.66903686523438,347.2560119628906,189.48690795898438C354.8473205566406,195.30490112304688,359.9371643066406,182.01168823242188,369.8480529785156,178.16708374023438C379.7584533691406,174.32186889648438,382.1473693847656,179.35397338867188,398.4171447753906,182.54769897460938C414.6871643066406,185.74215698242188,443.8092346191406,165.74850463867188,436.4181213378906,136.15060424804688C429.0282287597656,106.55319213867188,402.4454650878906,104.18283081054688,402.4454650878906,104.18283081054688" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb849a6-e32531b0-8f0e-8085-8008-26334089cb3c" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M336.4740295410156,153.60568237304688C336.4740295410156,153.60568237304688,300.6595764160156,189.90780639648438,307.2025451660156,196.20541381835938C313.7447814941406,202.50314331054688,350.7904357910156,168.73324584960938,344.8358459472656,166.32638549804688C338.8815002441406,163.91952514648438,320.6817932128906,191.34689331054688,334.7608947753906,189.71066284179688C348.8407287597656,188.07455444335938,363.0939025878906,172.33737182617188,358.1315002441406,170.13058471679688C353.1688537597656,167.92294311523438,339.6651916503906,183.66903686523438,347.2560119628906,189.48690795898438C354.8473205566406,195.30490112304688,359.9371643066406,182.01168823242188,369.8480529785156,178.16708374023438C379.7584533691406,174.32186889648438,382.1473693847656,179.35397338867188,398.4171447753906,182.54769897460938C414.6871643066406,185.74215698242188,443.8092346191406,165.74850463867188,436.4181213378906,136.15060424804688C429.0282287597656,106.55319213867188,402.4454650878906,104.18283081054688,402.4454650878906,104.18283081054688" style="fill: none; stroke-width: 2.3216; stroke: rgb(255, 154, 232); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb3d"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb3d"><path d="M306.7452697753906,186.24996948242188C308.1505432128906,182.68429565429688,310.4798889160156,180.27584838867188,311.9488830566406,180.87081909179688C313.4176330566406,181.46505737304688,313.4696350097656,184.83798217773438,312.0643615722656,188.40341186523438C310.6595764160156,191.96981811523438,308.3292541503906,194.37826538085938,306.8607482910156,193.78329467773438C305.3919982910156,193.18856811523438,305.3404846191406,189.81613159179688,306.7452697753906,186.24996948242188Z" stroke-miterlimit="10" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: rgb(17, 231, 228); fill-opacity: 1;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb35" style="display: none;"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb35"><path d="M330.4991760253906,194.44015502929688C330.4984436035156,194.22335815429688,330.6717834472656,194.04818725585938,330.8871154785156,194.04769897460938L343.1835021972656,194.02597045898438C343.3978576660156,194.02560424804688,343.5719299316406,194.20016479492188,343.5721740722656,194.41708374023438L343.5921936035156,205.84579467773438C343.5924377441406,206.06185913085938,343.4190979003906,206.23788452148438,343.2049865722656,206.23837280273438L330.9081115722656,206.26010131835938C330.6932678222656,206.26046752929688,330.5194396972656,206.08505249023438,330.5187072753906,205.86911010742188L330.4991760253906,194.44015502929688Z"/></g><g id="strokes-dc8a1b63-55c2-8062-8008-5db06cb8fa2b-e32531b0-8f0e-8085-8008-26334089cb35" class="strokes"><g class="stroke-shape"><path d="M330.4991760253906,194.44015502929688C330.4984436035156,194.22335815429688,330.6717834472656,194.04818725585938,330.8871154785156,194.04769897460938L343.1835021972656,194.02597045898438C343.3978576660156,194.02560424804688,343.5719299316406,194.20016479492188,343.5721740722656,194.41708374023438L343.5921936035156,205.84579467773438C343.5924377441406,206.06185913085938,343.4190979003906,206.23788452148438,343.2049865722656,206.23837280273438L330.9081115722656,206.26010131835938C330.6932678222656,206.26046752929688,330.5194396972656,206.08505249023438,330.5187072753906,205.86911010742188L330.4991760253906,194.44015502929688Z" style="fill: none; stroke-width: 1.45037; stroke: rgb(105, 17, 212); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb36"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb36"><path d="M369.3407287597656,65.46371459960938C360.0111389160156,63.004730224609375,330.3365783691406,67.57308959960938,343.5248107910156,95.44833374023438C356.7127990722656,123.32345581054688,353.1451721191406,136.71017456054688,372.9281311035156,142.11874389648438C392.7103576660156,147.52743530273438,407.4925842285156,117.88571166992188,403.2535705566406,104.57199096679688C399.0148010253906,91.25851440429688,385.9330139160156,69.83639526367188,369.3407287597656,65.46371459960938" style="fill: rgb(255, 154, 232); fill-opacity: 1;"/></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb37"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb37"><path d="M361.9798889160156,110.02194213867188C361.9798889160156,110.02194213867188,368.6065979003906,117.58676147460938,377.4381408691406,109.86325073242188C386.2684631347656,102.13900756835938,378.7540588378906,93.07919311523438,378.7540588378906,93.07919311523438" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb9403f-e32531b0-8f0e-8085-8008-26334089cb37" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M361.9798889160156,110.02194213867188C361.9798889160156,110.02194213867188,368.6065979003906,117.58676147460938,377.4381408691406,109.86325073242188C386.2684631347656,102.13900756835938,378.7540588378906,93.07919311523438,378.7540588378906,93.07919311523438" style="fill: none; stroke-width: 2.13276; stroke: rgb(255, 255, 255); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb38"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb38"><path d="M365.4142150878906,103.10311889648438C362.8592834472656,101.80673217773438,361.9093322753906,98.63644409179688,363.2926330566406,96.02120971679688C364.6756896972656,93.40670776367188,367.8680725097656,92.33749389648438,370.4234924316406,93.63388061523438C372.9786682128906,94.92965698242188,373.9288635253906,98.10031127929688,372.5455627441406,100.71517944335938C371.1620178222656,103.32980346679688,367.9691467285156,104.39901733398438,365.4142150878906,103.10311889648438Z" stroke-miterlimit="10" fill="none" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round; fill: none;"/></g><g stroke-miterlimit="10" fill="none" id="strokes-dc8a1b63-55c2-8062-8008-5db06cb9be94-e32531b0-8f0e-8085-8008-26334089cb38" class="strokes" style="fill-rule: nonzero; clip-rule: evenodd; stroke-linejoin: round;"><g class="stroke-shape"><path d="M365.4142150878906,103.10311889648438C362.8592834472656,101.80673217773438,361.9093322753906,98.63644409179688,363.2926330566406,96.02120971679688C364.6756896972656,93.40670776367188,367.8680725097656,92.33749389648438,370.4234924316406,93.63388061523438C372.9786682128906,94.92965698242188,373.9288635253906,98.10031127929688,372.5455627441406,100.71517944335938C371.1620178222656,103.32980346679688,367.9691467285156,104.39901733398438,365.4142150878906,103.10311889648438Z" style="fill: none; stroke-width: 2.13276; stroke: rgb(255, 255, 255); stroke-opacity: 1;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb39"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb39"><path d="M384.7110900878906,80.35641479492188C383.9071350097656,77.62899780273438,363.4330139160156,53.005462646484375,352.6925354003906,47.789886474609375C337.5023498535156,40.414031982421875,346.8971252441406,72.76974487304688,352.6258850097656,65.97494506835938C355.8385314941406,62.164031982421875,334.3607482910156,46.028045654296875,327.7486877441406,50.029998779296875C324.6446838378906,51.908660888671875,325.1925354003906,56.968597412109375,328.7845764160156,61.948944091796875C336.9864807128906,73.32040405273438,344.4693908691406,79.93222045898438,346.0421447753906,75.66232299804688C348.0953674316406,70.08981323242188,319.2784729003906,57.343109130859375,320.2945861816406,75.17477416992188C320.8602600097656,85.09738159179688,338.3983459472656,84.95443725585938,338.3983459472656,84.95443725585938"/></g><g id="strokes-dc8a1b63-55c2-8062-8008-5db06cba0f45-e32531b0-8f0e-8085-8008-26334089cb39" class="strokes"><g class="stroke-shape"><path d="M384.7110900878906,80.35641479492188C383.9071350097656,77.62899780273438,363.4330139160156,53.005462646484375,352.6925354003906,47.789886474609375C337.5023498535156,40.414031982421875,346.8971252441406,72.76974487304688,352.6258850097656,65.97494506835938C355.8385314941406,62.164031982421875,334.3607482910156,46.028045654296875,327.7486877441406,50.029998779296875C324.6446838378906,51.908660888671875,325.1925354003906,56.968597412109375,328.7845764160156,61.948944091796875C336.9864807128906,73.32040405273438,344.4693908691406,79.93222045898438,346.0421447753906,75.66232299804688C348.0953674316406,70.08981323242188,319.2784729003906,57.343109130859375,320.2945861816406,75.17477416992188C320.8602600097656,85.09738159179688,338.3983459472656,84.95443725585938,338.3983459472656,84.95443725585938" style="fill: none; stroke-width: 2.3216; stroke: rgb(20, 206, 202); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb06"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb06"><path d="M159.21961975097656,102.34066772460938C159.21961975097656,102.34066772460938,159.79750061035156,86.95614624023438,155.37586975097656,79.73666381835938C150.95252990722656,72.51742553710938,141.52870178222656,73.46310424804688,141.52870178222656,73.46310424804688C141.52870178222656,73.46310424804688,150.95252990722656,74.40719604492188,155.37586975097656,67.18783569335938C159.79750061035156,59.968353271484375,159.21961975097656,44.583953857421875,159.21961975097656,44.583953857421875C159.21961975097656,44.583953857421875,158.64051818847656,59.968353271484375,163.06336975097656,67.18783569335938C167.48646545410156,74.40719604492188,176.91053771972656,73.46310424804688,176.91053771972656,73.46310424804688C176.91053771972656,73.46310424804688,167.48646545410156,72.51742553710938,163.06336975097656,79.73666381835938C158.64051818847656,86.95614624023438,159.21961975097656,102.34066772460938,159.21961975097656,102.34066772460938L159.21961975097656,102.34066772460938"/></g><g id="strokes-dc8a1b63-55c2-8062-8008-5db06cba61d5-e32531b0-8f0e-8085-8008-26334089cb06" class="strokes"><g class="stroke-shape"><path d="M159.21961975097656,102.34066772460938C159.21961975097656,102.34066772460938,159.79750061035156,86.95614624023438,155.37586975097656,79.73666381835938C150.95252990722656,72.51742553710938,141.52870178222656,73.46310424804688,141.52870178222656,73.46310424804688C141.52870178222656,73.46310424804688,150.95252990722656,74.40719604492188,155.37586975097656,67.18783569335938C159.79750061035156,59.968353271484375,159.21961975097656,44.583953857421875,159.21961975097656,44.583953857421875C159.21961975097656,44.583953857421875,158.64051818847656,59.968353271484375,163.06336975097656,67.18783569335938C167.48646545410156,74.40719604492188,176.91053771972656,73.46310424804688,176.91053771972656,73.46310424804688C176.91053771972656,73.46310424804688,167.48646545410156,72.51742553710938,163.06336975097656,79.73666381835938C158.64051818847656,86.95614624023438,159.21961975097656,102.34066772460938,159.21961975097656,102.34066772460938L159.21961975097656,102.34066772460938" style="fill: none; stroke-width: 1.40237; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb07"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb07"><path d="M413.9706115722656,94.23434448242188C413.9706115722656,94.23434448242188,414.5484924316406,78.84994506835938,410.1268615722656,71.63058471679688C405.7032775878906,64.41110229492188,396.2796936035156,65.35678100585938,396.2796936035156,65.35678100585938C396.2796936035156,65.35678100585938,405.7032775878906,66.30111694335938,410.1268615722656,59.081634521484375C414.5484924316406,51.862274169921875,413.9706115722656,36.477874755859375,413.9706115722656,36.477874755859375C413.9706115722656,36.477874755859375,413.3915100097656,51.862274169921875,417.8141174316406,59.081634521484375C422.2372131347656,66.30111694335938,431.6615295410156,65.35678100585938,431.6615295410156,65.35678100585938C431.6615295410156,65.35678100585938,422.2372131347656,64.41110229492188,417.8141174316406,71.63058471679688C413.3915100097656,78.84994506835938,413.9706115722656,94.23434448242188,413.9706115722656,94.23434448242188L413.9706115722656,94.23434448242188"/></g><g id="strokes-dc8a1b63-55c2-8062-8008-5db06cbaae45-e32531b0-8f0e-8085-8008-26334089cb07" class="strokes"><g class="stroke-shape"><path d="M413.9706115722656,94.23434448242188C413.9706115722656,94.23434448242188,414.5484924316406,78.84994506835938,410.1268615722656,71.63058471679688C405.7032775878906,64.41110229492188,396.2796936035156,65.35678100585938,396.2796936035156,65.35678100585938C396.2796936035156,65.35678100585938,405.7032775878906,66.30111694335938,410.1268615722656,59.081634521484375C414.5484924316406,51.862274169921875,413.9706115722656,36.477874755859375,413.9706115722656,36.477874755859375C413.9706115722656,36.477874755859375,413.3915100097656,51.862274169921875,417.8141174316406,59.081634521484375C422.2372131347656,66.30111694335938,431.6615295410156,65.35678100585938,431.6615295410156,65.35678100585938C431.6615295410156,65.35678100585938,422.2372131347656,64.41110229492188,417.8141174316406,71.63058471679688C413.3915100097656,78.84994506835938,413.9706115722656,94.23434448242188,413.9706115722656,94.23434448242188L413.9706115722656,94.23434448242188" style="fill: none; stroke-width: 1.40237; stroke: rgb(242, 58, 229); stroke-opacity: 1; stroke-linecap: round;"/></g></g></g><g id="shape-e32531b0-8f0e-8085-8008-26334089cb08"><g class="fills" id="fills-e32531b0-8f0e-8085-8008-26334089cb08"><path d="M276.9916076660156,115.51315307617188C278.0035705566406,116.52645874023438,317.4750061035156,115.51315307617188,331.6441955566406,120.57968139648438C345.8136291503906,125.64584350585938,347.8380432128906,137.80514526367188,340.7530822753906,146.92465209960938"/></g><g id="strokes-dc8a1b63-55c2-8062-8008-5db06cbac6d5-e32531b0-8f0e-8085-8008-26334089cb08" class="strokes"><g class="stroke-shape"><path d="M276.9916076660156,115.51315307617188C278.0035705566406,116.52645874023438,317.4750061035156,115.51315307617188,331.6441955566406,120.57968139648438C345.8136291503906,125.64584350585938,347.8380432128906,137.80514526367188,340.7530822753906,146.92465209960938" style="fill: none; stroke-width: 2.01824; stroke: rgb(20, 206, 202); stroke-opacity: 1;"/></g></g></g></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/frontend/resources/images/icons/logo-files.svg b/frontend/resources/images/icons/logo-files.svg
deleted file mode 100644
index 55b707b557..0000000000
--- a/frontend/resources/images/icons/logo-files.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" xmlns="http://www.w3.org/2000/svg" height="24" id="screenshot-5de0120c-6b0f-8021-8008-386c29a8479c" viewBox="0 0 24 24" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-5de0120c-6b0f-8021-8008-386c29a8479c" width="21" height="21" rx="0" ry="0" style="fill: rgb(0, 0, 0);"><g id="shape-5de0120c-6b0f-8021-8008-386c29a8479d" style="display: none;"><g class="fills" id="fills-5de0120c-6b0f-8021-8008-386c29a8479d"><rect width="24" height="24" x="0" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" style="fill: rgb(143, 157, 163); fill-opacity: 1;" ry="0" fill="none" rx="0" y="0"/></g></g><g id="shape-5de0120c-6b0f-8021-8008-386c29a8479e" rx="0" ry="0"><g id="shape-5de0120c-6b0f-8021-8008-386c29a8479f"><g class="fills" id="fills-5de0120c-6b0f-8021-8008-386c29a8479f"><path d="M15.999859809875488,16.287622451782227L15.999859809875488,3.8000736236572266L14.559430122375488,3.8000736236572266L14.559430122375488,15.740259170532227L12.529156684875488,15.740259170532227L12.529156684875488,3.8000736236572266L11.484967231750488,3.8000736236572266L11.484967231750488,15.740259170532227L9.440289497375488,15.740259170532227L9.440289497375488,3.8000736236572266L7.99985933303833,3.8000736236572266L7.99985933303833,16.287622451782227L11.999859809875488,22.000024795532227L15.999859809875488,16.287622451782227L15.999859809875488,16.287622451782227M11.307476997375488,18.838403701782227L9.845562934875488,16.784692764282227L14.154889106750488,16.784692764282227L12.677838325500488,18.838403701782227L11.307476997375488,18.838403701782227L11.307476997375488,18.838403701782227" style="fill: rgb(143, 157, 163); fill-opacity: 1;"/></g></g><g id="shape-5de0120c-6b0f-8021-8008-386c29a847a0"><g class="fills" id="fills-5de0120c-6b0f-8021-8008-386c29a847a0"><rect rx="0.9999999999995453" ry="0.9999999999995453" x="7.998480615604876" y="2.800000000000182" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="8" height="1.9999999999990905" style="fill: rgb(143, 157, 163); fill-opacity: 1;"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/frontend/resources/images/icons/stroke-bottom.svg b/frontend/resources/images/icons/stroke-bottom.svg
new file mode 100644
index 0000000000..3a6e044748
--- /dev/null
+++ b/frontend/resources/images/icons/stroke-bottom.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-linecap="round">
+  <rect x="3.69" y="1.34" width="9" height="9" rx=".9"/>
+  <path d="M1.09 10.94C1.09 12.34 2.09 13.34 3.49 13.34H12.69C14.09 13.34 15.09 12.34 15.09 10.94"/>
+</svg>
diff --git a/frontend/resources/images/icons/stroke-extended.svg b/frontend/resources/images/icons/stroke-extended.svg
new file mode 100644
index 0000000000..1326c5718c
--- /dev/null
+++ b/frontend/resources/images/icons/stroke-extended.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-linecap="round">
+  <rect x="3.59" y="3.84" width="9" height="9" rx=".9"/>
+  <rect x="1.09" y="1.34" width="14" height="14" rx="2.4"/>
+</svg>
diff --git a/frontend/resources/images/icons/stroke-left.svg b/frontend/resources/images/icons/stroke-left.svg
new file mode 100644
index 0000000000..24c05ddf03
--- /dev/null
+++ b/frontend/resources/images/icons/stroke-left.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-linecap="round">
+  <rect x="5.09" y="3.5" width="9" height="9" rx=".9"/>
+  <path d="M4.49 1C3.09 1 2.09 2 2.09 3.4V12.6C2.09 14 3.09 15 4.49 15"/>
+</svg>
diff --git a/frontend/resources/images/icons/stroke-right.svg b/frontend/resources/images/icons/stroke-right.svg
new file mode 100644
index 0000000000..248417c737
--- /dev/null
+++ b/frontend/resources/images/icons/stroke-right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-linecap="round">
+  <rect x="2.09" y="3.5" width="9" height="9" rx=".9"/>
+  <path d="M11.69 15C13.09 15 14.09 14 14.09 12.6V3.4C14.09 2 13.09 1 11.69 1"/>
+</svg>
diff --git a/frontend/resources/images/icons/stroke-top.svg b/frontend/resources/images/icons/stroke-top.svg
new file mode 100644
index 0000000000..170ac1e2ab
--- /dev/null
+++ b/frontend/resources/images/icons/stroke-top.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-linecap="round">
+  <rect x="3.5" y="4.34" width="9" height="9" rx=".9"/>
+  <path d="M15.09 3.74C15.09 2.34 14.09 1.34 12.69 1.34H3.49C2.09 1.34 1.09 2.34 1.09 3.74"/>
+</svg>
diff --git a/frontend/resources/styles/common/refactor/basic-rules.scss b/frontend/resources/styles/common/refactor/basic-rules.scss
index bbbb16adb7..35d74a25e8 100644
--- a/frontend/resources/styles/common/refactor/basic-rules.scss
+++ b/frontend/resources/styles/common/refactor/basic-rules.scss
@@ -976,7 +976,7 @@
   margin: 0;
   margin-top: $s-1;
   border-radius: $br-8;
-  z-index: $z-index-4;
+  z-index: var(--z-index-dropdown);
   overflow: hidden auto;
   background-color: var(--menu-background-color);
   color: var(--menu-foreground-color);
diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache
index 289d6f9e84..453197068e 100644
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -18,6 +18,7 @@
     <meta name="twitter:creator" content="@penpotapp">
     <meta name="theme-color" content="#FFFFFF" media="(prefers-color-scheme: light)">
     <link id="theme" href="css/main.css?version={{& version_tag}}" rel="stylesheet" type="text/css" />
+    <link href="css/ui.css?version={{& version_tag}}" rel="stylesheet" type="text/css" />
     {{#isDebug}}
     <link href="css/debug.css?version={{& version_tag}}" rel="stylesheet" type="text/css" />
     {{/isDebug}}
diff --git a/frontend/resources/templates/preview-head.mustache b/frontend/resources/templates/preview-head.mustache
index 962b214f3b..a27a7bed95 100644
--- a/frontend/resources/templates/preview-head.mustache
+++ b/frontend/resources/templates/preview-head.mustache
@@ -1,4 +1,5 @@
 <link href="./css/ds.css?version={{& version}}" rel="stylesheet" type="text/css" />
+<link href="./css/ui.css?version={{& version}}" rel="stylesheet" type="text/css" />
 
 <style>
   body {
diff --git a/frontend/scripts/build b/frontend/scripts/build
index 2cc812e228..fe40d223bc 100755
--- a/frontend/scripts/build
+++ b/frontend/scripts/build
@@ -30,7 +30,7 @@ mkdir -p target/dist;
 
 # Build render wasm binary
 pushd ../render-wasm;
-./build
+./build frontend
 popd
 
 pushd ../mcp;
diff --git a/frontend/scripts/build-fonts-preview.js b/frontend/scripts/build-fonts-preview.js
index b1aa7c839c..6c609252b4 100644
--- a/frontend/scripts/build-fonts-preview.js
+++ b/frontend/scripts/build-fonts-preview.js
@@ -68,7 +68,7 @@ function slug(value) {
 }
 
 async function findGfontsJson() {
-  const dir = "resources/fonts";
+  const dir = "../common/resources/fonts";
   const entries = await fs.readdir(dir);
   const matches = entries.filter((f) => /^gfonts\..*\.json$/.test(f)).sort();
   if (matches.length === 0) {
diff --git a/frontend/scripts/build-libs.js b/frontend/scripts/build-libs.js
index a1aff27f2b..c446913f5b 100644
--- a/frontend/scripts/build-libs.js
+++ b/frontend/scripts/build-libs.js
@@ -1,5 +1,8 @@
 import * as esbuild from "esbuild";
 import { readFile } from "node:fs/promises";
+import { execSync } from "node:child_process";
+
+execSync("pnpm run build", { cwd: "packages/ui", stdio: "inherit" });
 
 /**
  * esbuild plugin to watch a directory recursively
diff --git a/frontend/scripts/setup b/frontend/scripts/setup
index 24f626ccef..bf54c0440c 100755
--- a/frontend/scripts/setup
+++ b/frontend/scripts/setup
@@ -3,4 +3,4 @@
 corepack enable;
 corepack install;
 pnpm install;
-pnpx playwright install chromium;
+pnpm exec playwright install chromium;
diff --git a/frontend/src/app/main/data/changes.cljs b/frontend/src/app/main/data/changes.cljs
index ef18c15554..74a2d97659 100644
--- a/frontend/src/app/main/data/changes.cljs
+++ b/frontend/src/app/main/data/changes.cljs
@@ -20,7 +20,6 @@
    [app.main.worker :as mw]
    [app.render-wasm.api :as wasm.api]
    [app.render-wasm.shape :as wasm.shape]
-   [app.render-wasm.wasm :as wasm]
    [beicon.v2.core :as rx]
    [potok.v2.core :as ptk]))
 
@@ -90,8 +89,7 @@
   (ptk/reify ::sync-wasm-structural-changes
     ptk/EffectEvent
     (effect [_ state _]
-      (when (and wasm/context-initialized?
-                 (not @wasm/context-lost?))
+      (when (wasm.api/initialized?)
         (let [objects (dsh/lookup-page-objects state)
               shapes
               (into []
diff --git a/frontend/src/app/main/data/common.cljs b/frontend/src/app/main/data/common.cljs
index d636d82601..f74874d297 100644
--- a/frontend/src/app/main/data/common.cljs
+++ b/frontend/src/app/main/data/common.cljs
@@ -11,7 +11,9 @@
    [app.common.data.macros :as dm]
    [app.common.schema :as sm]
    [app.common.time :as ct]
+   [app.common.types.organization :as cto]
    [app.common.types.team :as ctt]
+   [app.config :as cf]
    [app.main.data.helpers :as dsh]
    [app.main.data.modal :as modal]
    [app.main.data.notifications :as ntf]
@@ -232,6 +234,63 @@
                 ;; Delay so the navigation can finish
                 (rx/delay 250))))))))
 
+(defn- check-team-sso
+  [team-id]
+  (let [url (rt/get-current-href)]
+    (->> (rp/cmd! :check-nitrate-sso {:team-id team-id :url url})
+         (rx/mapcat (fn [{:keys [authorized redirect-uri]}]
+                      (if authorized
+                        (rx/empty)
+                        (if redirect-uri
+                          (rx/of (rt/nav-raw :uri (str redirect-uri)))
+                          (rx/empty))))))))
+
+(defn handle-change-team-organization
+  "Handle :team-organization-change websocket messages on dashboard and workspace.
+  Updates local team organization data and redirects to SSO when required."
+  [{:keys [team notification]}]
+  (ptk/reify ::handle-change-team-organization
+    ptk/WatchEvent
+    (watch [_ state _]
+      (let [current-team-id (:current-team-id state)
+            organization    (:organization team)
+            current-team?   (= (:id team) current-team-id)]
+        (when (and (contains? cf/flags :admin-console)
+                   current-team?)
+          (rx/concat
+           (when notification
+             (rx/of (ntf/show {:content (tr notification (:name organization))
+                               :type :toast
+                               :level :info
+                               :timeout nil})))
+           (when (:id organization)
+             (check-team-sso current-team-id))))))
+    ptk/UpdateEvent
+    (update [_ state]
+      (if (contains? cf/flags :admin-console)
+        (let [team-id      (:id team)
+              team-name    (:name team)
+              organization (:organization team)]
+          (d/update-in-when state [:teams team-id]
+                            (fn [team]
+                              (cond-> (cto/apply-organization team organization)
+                                team-name (assoc :name team-name)))))
+        state))))
+
+(defn handle-organization-change-sso
+  "Handle :organization-change-sso websocket messages on dashboard and workspace.
+  Redirects to the organization SSO login when the current team belongs to that organization."
+  [{:keys [organization-id]}]
+  (ptk/reify ::handle-organization-change-sso
+    ptk/WatchEvent
+    (watch [_ state _]
+      (when (contains? cf/flags :admin-console)
+        (let [team-id (:current-team-id state)
+              team    (dm/get-in state [:teams team-id])
+              team-organization-id (dm/get-in team [:organization :id])]
+          (when (= organization-id team-organization-id)
+            (check-team-sso team-id)))))))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; PROGRESS EVENTS
diff --git a/frontend/src/app/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs
index 009ad4fe67..95b9f06039 100644
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -13,7 +13,6 @@
    [app.common.logging :as log]
    [app.common.schema :as sm]
    [app.common.time :as ct]
-   [app.common.types.organization :as co]
    [app.common.types.project :refer [valid-project?]]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -27,7 +26,6 @@
    [app.main.data.team :as dtm]
    [app.main.data.websocket :as dws]
    [app.main.repo :as rp]
-   [app.main.router :as rt]
    [app.main.store :as st]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.sse :as sse]
@@ -687,38 +685,12 @@
       (rx/of (dcm/change-team-role params)
              (modal/hide)))))
 
-(defn handle-change-team-org
-  [{:keys [team notification]}]
-  (ptk/reify ::handle-change-team-org
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [current-team-id (:current-team-id state)
-            organization (:organization team)]
-        (when (and (contains? cf/flags :nitrate)
-                   notification
-                   (= (:id team) current-team-id))
-          (rx/of (ntf/show {:content (tr notification (:name organization))
-                            :type :toast
-                            :level :info
-                            :timeout nil})))))
-    ptk/UpdateEvent
-    (update [_ state]
-      (if (contains? cf/flags :nitrate)
-        (let [team-id      (:id team)
-              team-name    (:name team)
-              organization (:organization team)]
-          (d/update-in-when state [:teams team-id]
-                            (fn [team]
-                              (cond-> (co/apply-organization team organization)
-                                team-name (assoc :name team-name)))))
-        state))))
-
-(defn- handle-user-org-change
+(defn- handle-user-organization-change
   [{:keys [organization-id organization-name notification]}]
-  (ptk/reify ::handle-user-org-change
+  (ptk/reify ::handle-user-organization-change
     ptk/WatchEvent
     (watch [_ state _]
-      (when (and notification (contains? cf/flags :nitrate))
+      (when (and notification (contains? cf/flags :admin-console))
         (let [team-id (:current-team-id state)
               team    (dm/get-in state [:teams team-id])]
           (rx/of (ntf/show {:content (tr notification organization-name)
@@ -726,7 +698,7 @@
                             :level :info
                             :timeout nil})
                  (dtm/fetch-teams)
-                 ;; When the user is currently on a team of the org
+                 ;; When the user is currently on a team of the organization
                  (when (= organization-id (dm/get-in team [:organization :id]))
                    (dcm/go-to-dashboard-recent {:team-id :default}))))))))
 
@@ -736,56 +708,37 @@
   (ptk/reify ::handle-organization-deleted
     ptk/WatchEvent
     (watch [_ state _]
-      (when (contains? cf/flags :nitrate)
+      (when (contains? cf/flags :admin-console)
         (let [team-id        (:current-team-id state)
               current-team   (dm/get-in state [:teams team-id])
-              current-org-id (dm/get-in current-team [:organization :id])
+              current-organization-id (dm/get-in current-team [:organization :id])
               teams-set      (set teams)
               notify?        (contains? teams-set team-id)
               fetch?         (some (:teams state) teams)
               go-to-default? (or (some #{team-id} deleted-teams)
-                                 (= organization-id current-org-id))]
+                                 (= organization-id current-organization-id))]
           (rx/concat
            (when go-to-default? ;; If the user is currently on one of the deleted teams
              (rx/of (dcm/go-to-dashboard-recent {:team-id :default})))
 
-           (when notify? ;; If the user is currently on one of the org teams
-             (rx/of (ntf/show {:content (tr "dashboard.org-deleted" organization-name)
+           (when notify? ;; If the user is currently on one of the organization teams
+             (rx/of (ntf/show {:content (tr "dashboard.organization-deleted" organization-name)
                                :type :toast
                                :level :info
                                :timeout nil})))
-           (when fetch? ;; If the user belonged to the org
+           (when fetch? ;; If the user belonged to the organization
              (rx/of (dtm/fetch-teams)))))))))
 
-(defn- handle-nitrate-change-sso
-  [{:keys [organization-id]}]
-  (ptk/reify ::handle-nitrate-change-sso
-    ptk/WatchEvent
-    (watch [_ state _]
-      (when (contains? cf/flags :nitrate)
-        (let [team-id (:current-team-id state)
-              team    (dm/get-in state [:teams team-id])
-              org-id  (dm/get-in team [:organization :id])]
-          (when (= organization-id org-id)
-            (let [url (rt/get-current-href)]
-              (->> (rp/cmd! :check-nitrate-sso {:team-id team-id :url url})
-                   (rx/mapcat (fn [{:keys [authorized redirect-uri]}]
-                                (if authorized
-                                  (rx/empty)
-                                  (if redirect-uri
-                                    (rx/of (rt/nav-raw :uri (str redirect-uri)))
-                                    (rx/empty)))))))))))))
-
 (defn- process-message
   [{:keys [type] :as msg}]
   (case type
     :notification            (dcm/handle-notification msg)
     :team-role-change        (handle-change-team-role msg)
     :team-membership-change  (dcm/team-membership-change msg)
-    :team-org-change         (handle-change-team-org msg)
-    :user-org-change         (handle-user-org-change msg)
+    :team-organization-change         (dcm/handle-change-team-organization msg)
+    :user-organization-change         (handle-user-organization-change msg)
     :organization-deleted    (handle-organization-deleted msg)
-    :organization-change-sso (handle-nitrate-change-sso msg)
+    :organization-change-sso (dcm/handle-organization-change-sso msg)
     nil))
 
 
diff --git a/frontend/src/app/main/data/dashboard/shortcuts.cljs b/frontend/src/app/main/data/dashboard/shortcuts.cljs
index ccc0e87a64..2e737a660a 100644
--- a/frontend/src/app/main/data/dashboard/shortcuts.cljs
+++ b/frontend/src/app/main/data/dashboard/shortcuts.cljs
@@ -17,31 +17,36 @@
 (def shortcuts
   {:toggle-theme    {:tooltip (ds/alt "M")
                      :command (ds/a-mod "m")
-                     :subsections [:general-dashboard]
+                     :section [:dashboard]
+                     :subsections [:generic]
                      :fn #(st/emit! (with-meta (du/toggle-theme)
                                       {::ev/origin "dashboard:shortcuts"}))}})
 
 (def shortcuts-sidebar-navigation
   {:go-to-drafts       {:tooltip "G D"
                         :command "g d"
+                        :section [:dashboard]
                         :subsections [:navigation-dashboard]
                         :fn #(st/emit! (dcm/go-to-dashboard-files :project-id :default))}
 
    :go-to-libs         {:tooltip "G L"
                         :command "g l"
+                        :section [:dashboard]
                         :subsections [:navigation-dashboard]
                         :fn #(st/emit! (dcm/go-to-dashboard-libraries))}})
 
 (def shortcut-search
   {:go-to-search       {:tooltip (ds/meta "F")
                         :command (ds/c-mod "f")
+                        :section [:dashboard]
                         :subsections [:navigation-dashboard]
                         :fn #(st/emit! (dcm/go-to-dashboard-search))}})
 
 (def shortcut-create-new-project
   {:create-new-project {:tooltip "+"
                         :command "+"
-                        :subsections [:general-dashboard]
+                        :section [:dashboard]
+                        :subsections [:generic]
                         :fn #(st/emit! (dd/create-element))}})
 
 ;; Shortcuts combinations for files, drafts, libraries and fonts sections
diff --git a/frontend/src/app/main/data/dashboard/shortcuts/customize.cljs b/frontend/src/app/main/data/dashboard/shortcuts/customize.cljs
new file mode 100644
index 0000000000..a9178efb1a
--- /dev/null
+++ b/frontend/src/app/main/data/dashboard/shortcuts/customize.cljs
@@ -0,0 +1,77 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.data.dashboard.shortcuts.customize
+  (:require
+   [app.main.data.event :as ev]
+   [app.main.data.profile :as du]
+   [app.main.data.shortcuts :as ds]
+   [beicon.v2.core :as rx]
+   [potok.v2.core :as ptk]))
+
+(defn set-custom-shortcut
+  [shortcut-key new-command conflicting-key group-key]
+  (ptk/reify ::set-custom-shortcut
+    ptk/WatchEvent
+    (watch [_ state _]
+      (let [current-customs (get-in state [:profile :props :custom-shortcuts] {})
+            group-map       (get current-customs group-key)
+            group-map       (if (map? group-map) group-map {})
+            group-map       (assoc group-map shortcut-key new-command)
+            ;; clear conflicting shortcut in the same group
+            group-map       (if conflicting-key
+                              (assoc group-map conflicting-key "")
+                              group-map)
+            new-customs      (assoc current-customs group-key group-map)]
+        (rx/of
+         (ev/event {::ev/name "set-custom-shortcut"})
+         (du/update-profile-props {:custom-shortcuts new-customs})
+         (ds/rebind-shortcuts))))))
+
+
+(defn reset-custom-shortcut
+  [shortcut-key default-command group-key]
+
+  (ptk/reify ::reset-custom-shortcut
+    ptk/WatchEvent
+    (watch [_ state _]
+      (let [current-customs (get-in state [:profile :props :custom-shortcuts] {})
+            group-map       (get current-customs group-key)
+            group-map       (if (map? group-map) group-map {})
+
+            ;; Find any action that is currently using the default command as its custom shortcut
+            owner-key       (when (and default-command (not= default-command ""))
+                              (some (fn [[k v]]
+                                      (when (if (vector? default-command)
+                                              (some #{v} default-command)
+                                              (= v default-command))
+                                        k))
+                                    group-map))
+
+            ;; Remove the shortcut being reset
+            group-map       (dissoc group-map shortcut-key)
+
+            ;; Disable the owner that was using the default command
+            group-map       (if (and owner-key (not= owner-key shortcut-key))
+                              (assoc group-map owner-key "")
+                              group-map)
+
+            new-customs      (if (empty? group-map)
+                               (dissoc current-customs group-key)
+                               (assoc current-customs group-key group-map))]
+        (rx/of
+         (ev/event {::ev/name "reset-custom-shortcut"})
+         (du/update-profile-props {:custom-shortcuts new-customs})
+         (ds/rebind-shortcuts))))))
+
+(defn reset-all-custom-shortcuts
+  []
+  (ptk/reify ::reset-all-custom-shortcuts
+    ptk/WatchEvent
+    (watch [_ _ _]
+      (rx/of (ev/event {::ev/name "reset-all-custom-shortcuts"})
+             (du/update-profile-props {:custom-shortcuts {}})
+             (ds/rebind-shortcuts)))))
diff --git a/frontend/src/app/main/data/exports/assets.cljs b/frontend/src/app/main/data/exports/assets.cljs
index 83a7cbb5fa..9a22fe25b9 100644
--- a/frontend/src/app/main/data/exports/assets.cljs
+++ b/frontend/src/app/main/data/exports/assets.cljs
@@ -8,7 +8,6 @@
   (:require
    [app.common.time :as ct]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.main.data.event :as ev]
    [app.main.data.exports.wasm :as wasm.exports]
    [app.main.data.helpers :as dsh]
@@ -20,10 +19,27 @@
    [app.util.dom :as dom]
    [app.util.websocket :as ws]
    [beicon.v2.core :as rx]
+   [cuerdas.core :as str]
    [potok.v2.core :as ptk]))
 
 (def default-timeout 5000)
 
+(defn normalize-export
+  [{:keys [object-id name] :as export}]
+  (assoc export :name (if (str/blank? name)
+                        (str object-id)
+                        name)))
+
+(defn- normalize-exports
+  [exports]
+  (mapv normalize-export exports))
+
+(defn- normalize-export-shapes-params
+  [{:keys [exports] :as params}]
+  (cond-> params
+    (seq exports)
+    (assoc :exports (normalize-exports exports))))
+
 (defn toggle-detail-visibililty
   []
   (ptk/reify ::toggle-detail-visibililty
@@ -166,11 +182,11 @@
 (def ^:private wasm-export-types #{:jpeg :webp :png :pdf})
 
 (defn- wasm-export-enabled?
-  "WASM export is available: the flag is set AND render-wasm is active for the
-  current file. When render-wasm is inactive its shape tree isn't loaded, so a
-  client-side WASM render would crash."
+  "WASM export is available when the `wasm-export/v1` feature is active AND
+  render-wasm is active for the current file. When render-wasm is inactive its
+  shape tree isn't loaded, so a client-side WASM render would crash."
   [state]
-  (and (contains? cf/flags :wasm-export)
+  (and (features/active-feature? state "wasm-export/v1")
        (features/active-feature? state "render-wasm/v1")))
 
 (defn- use-wasm-export?
@@ -190,100 +206,102 @@
 
 (defn request-simple-export
   [{:keys [export]}]
-  (ptk/reify ::request-simple-export
-    ptk/UpdateEvent
-    (update [_ state]
-      (cond-> state
-        (not (use-wasm-export? state export))
-        (update :export assoc :in-progress true :id uuid/zero)))
+  (let [export (normalize-export export)]
+    (ptk/reify ::request-simple-export
+      ptk/UpdateEvent
+      (update [_ state]
+        (cond-> state
+          (not (use-wasm-export? state export))
+          (update :export assoc :in-progress true :id uuid/zero)))
 
-    ptk/WatchEvent
-    (watch [_ state _]
-      (if (use-wasm-export? state export)
-        (rx/of (request-simple-export-wasm export))
-        (let [profile-id (:profile-id state)
-              params     {:exports [export]
-                          :profile-id profile-id
-                          :cmd :export-shapes
-                          :wait true
-                          :is-wasm (wasm-export-enabled? state)}]
-          (rx/concat
-           (dwp/force-persist-and-wait 400)
+      ptk/WatchEvent
+      (watch [_ state _]
+        (if (use-wasm-export? state export)
+          (rx/of (request-simple-export-wasm export))
+          (let [profile-id (:profile-id state)
+                params     (normalize-export-shapes-params {:exports [export]
+                                                            :profile-id profile-id
+                                                            :cmd :export-shapes
+                                                            :wait true
+                                                            :is-wasm (wasm-export-enabled? state)})]
+            (rx/concat
+             (dwp/force-persist-and-wait 400)
 
-           (->> (rp/cmd! :export params)
-                (rx/map (fn [{:keys [filename mtype uri]}]
-                          (dom/trigger-download-uri filename mtype uri)
-                          (clear-export-state uuid/zero)))
-                (rx/catch (fn [cause]
-                            (rx/concat
-                             (rx/of (clear-export-state uuid/zero))
-                             (rx/throw cause)))))))))))
+             (->> (rp/cmd! :export params)
+                  (rx/map (fn [{:keys [filename mtype uri]}]
+                            (dom/trigger-download-uri filename mtype uri)
+                            (clear-export-state uuid/zero)))
+                  (rx/catch (fn [cause]
+                              (rx/concat
+                               (rx/of (clear-export-state uuid/zero))
+                               (rx/throw cause))))))))))))
 
 (defn request-multiple-export
   [{:keys [exports cmd name]
     :or {cmd :export-shapes}
     :as params}]
-  (ptk/reify ::request-multiple-export
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [resource-id (volatile! nil)
-            profile-id  (:profile-id state)
-            ws-conn     (:ws-conn state)
-            params      (cond->
-                         {:exports exports
-                          :cmd cmd
-                          :profile-id profile-id
-                          :force-multiple true
-                          :is-wasm (wasm-export-enabled? state)}
-                          (some? name)
-                          (assoc :name name))
+  (let [exports (normalize-exports exports)]
+    (ptk/reify ::request-multiple-export
+      ptk/WatchEvent
+      (watch [_ state _]
+        (let [resource-id (volatile! nil)
+              profile-id  (:profile-id state)
+              ws-conn     (:ws-conn state)
+              params      (cond->
+                           {:exports exports
+                            :cmd cmd
+                            :profile-id profile-id
+                            :force-multiple true
+                            :is-wasm (wasm-export-enabled? state)}
+                            (some? name)
+                            (assoc :name name))
 
-            progress-stream
-            (->> (ws/get-rcv-stream ws-conn)
-                 (rx/filter ws/message-event?)
-                 (rx/map :payload)
-                 (rx/filter #(= :export-update (:type %)))
-                 (rx/filter #(= @resource-id (:resource-id %)))
-                 (rx/share))
+              progress-stream
+              (->> (ws/get-rcv-stream ws-conn)
+                   (rx/filter ws/message-event?)
+                   (rx/map :payload)
+                   (rx/filter #(= :export-update (:type %)))
+                   (rx/filter #(= @resource-id (:resource-id %)))
+                   (rx/share))
 
-            stopper
-            (rx/filter #(or (= "ended" (:status %))
-                            (= "error" (:status %)))
-                       progress-stream)]
+              stopper
+              (rx/filter #(or (= "ended" (:status %))
+                              (= "error" (:status %)))
+                         progress-stream)]
 
-        (swap! st/ongoing-tasks conj :export)
+          (swap! st/ongoing-tasks conj :export)
 
-        (rx/merge
-         ;; Force that all data is persisted; best effort.
-         (rx/of ::dwp/force-persist)
+          (rx/merge
+           ;; Force that all data is persisted; best effort.
+           (rx/of ::dwp/force-persist)
 
-         ;; Launch the exportation process and stores the resource id
-         ;; locally.
-         (->> (rp/cmd! :export params)
-              (rx/map (fn [{:keys [id] :as resource}]
-                        (vreset! resource-id id)
-                        (initialize-export-status exports cmd resource))))
+           ;; Launch the exportation process and stores the resource id
+           ;; locally.
+           (->> (rp/cmd! :export params)
+                (rx/map (fn [{:keys [id] :as resource}]
+                          (vreset! resource-id id)
+                          (initialize-export-status exports cmd resource))))
 
-         ;; We proceed to update the export state with incoming
-         ;; progress updates. We delay the stopper for give some time
-         ;; to update the status with ended or errored status before
-         ;; close the stream.
-         (->> progress-stream
-              (rx/map update-export-status)
-              (rx/take-until (rx/delay 500 stopper))
-              (rx/finalize (fn []
-                             (swap! st/ongoing-tasks disj :export))))
+           ;; We proceed to update the export state with incoming
+           ;; progress updates. We delay the stopper for give some time
+           ;; to update the status with ended or errored status before
+           ;; close the stream.
+           (->> progress-stream
+                (rx/map update-export-status)
+                (rx/take-until (rx/delay 500 stopper))
+                (rx/finalize (fn []
+                               (swap! st/ongoing-tasks disj :export))))
 
-         ;; We hide need to hide the ui elements of the export after
-         ;; some interval. We also delay a little bit more the stopper
-         ;; for ensure that after some security time, the stream is
-         ;; completely closed.
-         (->> progress-stream
-              (rx/filter #(= "ended" (:status %)))
-              (rx/take 1)
-              (rx/delay default-timeout)
-              (rx/map #(clear-export-state @resource-id))
-              (rx/take-until (rx/delay 6000 stopper))))))))
+           ;; We hide need to hide the ui elements of the export after
+           ;; some interval. We also delay a little bit more the stopper
+           ;; for ensure that after some security time, the stream is
+           ;; completely closed.
+           (->> progress-stream
+                (rx/filter #(= "ended" (:status %)))
+                (rx/take 1)
+                (rx/delay default-timeout)
+                (rx/map #(clear-export-state @resource-id))
+                (rx/take-until (rx/delay 6000 stopper)))))))))
 
 (defn request-export
   [{:keys [exports] :as params}]
diff --git a/frontend/src/app/main/data/exports/wasm.cljs b/frontend/src/app/main/data/exports/wasm.cljs
index b91f461795..4cbd5285f8 100644
--- a/frontend/src/app/main/data/exports/wasm.cljs
+++ b/frontend/src/app/main/data/exports/wasm.cljs
@@ -13,7 +13,10 @@
 
 (defn export-image-uri
   [{:keys [type scale object-id]}]
-  (let [bytes (wasm.api/render-shape-pixels object-id scale)
+  ;; The export type doubles as the encoder format, so the bytes always match
+  ;; the mtype we wrap them in. `:svg` never reaches here — it needs vector
+  ;; markup and `exports.assets/wasm-export-types` keeps it off this path.
+  (let [bytes (wasm.api/render-shape-pixels object-id scale type)
         mtype (format->mtype type)
         blob (wapi/create-blob bytes mtype)]
     (wapi/create-uri blob)))
diff --git a/frontend/src/app/main/data/helpers.cljs b/frontend/src/app/main/data/helpers.cljs
index 1a3cd54509..3681e821de 100644
--- a/frontend/src/app/main/data/helpers.cljs
+++ b/frontend/src/app/main/data/helpers.cljs
@@ -212,7 +212,7 @@
 (defn lookup-team
   "The team identified by `team-id`, looked up first in the membership
   `:teams` map and falling back to the directly-opened `:current-team`.
-  The fallback covers org-owner access to teams the profile is not a
+  The fallback covers organization-owner access to teams the profile is not a
   member of, which are kept out of `:teams` so they don't leak into the
   teams listing."
   ([state]
diff --git a/frontend/src/app/main/data/nitrate.cljs b/frontend/src/app/main/data/nitrate.cljs
index 279c622934..ff0f48c3e2 100644
--- a/frontend/src/app/main/data/nitrate.cljs
+++ b/frontend/src/app/main/data/nitrate.cljs
@@ -1,12 +1,14 @@
 (ns app.main.data.nitrate
   (:require
    [app.common.data.macros :as dm]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
+   [app.common.types.organization :as cto]
    [app.common.uri :as u]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.main.data.common :as dcm]
+   [app.main.data.event :as ev]
    [app.main.data.modal :as modal]
+   [app.main.data.nitrate-audit :as nitrate-audit]
    [app.main.data.notifications :as ntf]
    [app.main.data.team :as dt]
    [app.main.repo :as rp]
@@ -19,20 +21,17 @@
    [beicon.v2.core :as rx]
    [potok.v2.core :as ptk]))
 
-(def ^:private nitrate-entry-active-key ::nitrate-entry-active)
 (def ^:private nitrate-entry-pending-popup-key ::nitrate-entry-pending-popup)
+(defn account-age-days
+  [profile]
+  (nitrate-audit/age-days (:created-at profile)))
 
 (defn activate-nitrate-entry-popup!
   []
   (binding [storage/*sync* true]
     (swap! storage/storage assoc
-           nitrate-entry-active-key true
            nitrate-entry-pending-popup-key true)))
 
-(defn nitrate-entry-active?
-  []
-  (true? (get storage/storage nitrate-entry-active-key)))
-
 (defn nitrate-entry-popup-pending?
   []
   (true? (get storage/storage nitrate-entry-pending-popup-key)))
@@ -41,7 +40,6 @@
   []
   (binding [storage/*sync* true]
     (swap! storage/storage dissoc
-           nitrate-entry-active-key
            nitrate-entry-pending-popup-key)))
 
 (defn show-nitrate-popup
@@ -54,38 +52,51 @@
             (rx/map (fn [connectivity]
                       (modal/show popup-type (merge (or connectivity {}) extra-props)))))))))
 
+(defn build-admin-console-url
+  ([path]
+   (build-admin-console-url cf/public-uri path nil))
+  ([path query-params]
+   (build-admin-console-url cf/public-uri path query-params))
+  ([public-uri path query-params]
+   (dm/str
+    (cond-> (u/join public-uri "admin-console/" path)
+      (seq query-params) (assoc :query (u/map->query-string query-params))))))
+
 (defn go-to-nitrate-ac
   ([]
-   (st/emit! (rt/nav-raw :href "/admin-console/")))
+   (st/emit! (rt/nav-raw :href (build-admin-console-url ""))))
   ([{:keys [organization-id organization-slug]}]
    (if (and organization-id organization-slug)
-     (let [href (dm/str "/admin-console/organization/"
+     (let [path (dm/str "organization/"
                         (u/percent-encode organization-slug)
                         "/"
                         (u/percent-encode (str organization-id))
-                        "/people/")]
+                        "/people/")
+           href (build-admin-console-url path)]
        (st/emit! (rt/nav-raw :href href)))
-     (st/emit! (rt/nav-raw :href "/admin-console/")))))
+     (st/emit! (rt/nav-raw :href (build-admin-console-url ""))))))
 
 (defn go-to-nitrate-ac-create-organization
-  []
-  (st/emit! (rt/nav-raw :href "/admin-console/?action=create-organization")))
+  [event-origin]
+  (let [href (build-admin-console-url "" {:action "create-organization"
+                                          :origin event-origin})]
+    (st/emit! (rt/nav-raw :href href))))
 
 (defn can-send-invitations?
   [{:keys [organization profile-id team-permissions]}]
-  (nitrate-perms/can-send-invitations?
-   {:nitrate-enabled? (contains? cf/flags :nitrate)
-    :organization organization
+  (cto/can-send-invitations?
+   {:organization organization
     :profile-id profile-id
     :team-permissions team-permissions}))
 
-(def go-to-subscription-url (u/join cf/public-uri "#/settings/subscriptions"))
+(def go-to-subscription-url (dm/str (u/join cf/public-uri "#/settings/subscriptions")))
 
-(def go-to-ac-url "/admin-console/")
+(def go-to-ac-url (build-admin-console-url ""))
 
 (defn go-to-nitrate-billing
   []
-  (let [href (dm/str "/admin-console/licenses/billing?callback=" (js/encodeURIComponent go-to-subscription-url))]
+  (let [href (build-admin-console-url "licenses/billing"
+                                      {:callback go-to-subscription-url})]
     (st/emit! (rt/nav-raw :href href))))
 
 (def nitrate-checkout-error-token "nitrate-checkout-error")
@@ -93,27 +104,39 @@
 (def nitrate-checkout-cancelled-token "nitrate-checkout-cancelled")
 
 (defn build-nitrate-callback-urls
-  "Build the success/error/cancel callback URLs from a base URL by appending
-  a `subscription` query param identifying the outcome."
-  [base-url]
-  (let [build (fn [token]
-                (dom/append-query-param base-url :subscription token))]
-    {:success-callback      (build "subscribed-to-penpot-nitrate")
-     :error-callback        (build nitrate-checkout-error-token)
-     :finish-error-callback (build nitrate-checkout-finish-error-token)
-     :cancel-callback       (build nitrate-checkout-cancelled-token)}))
+  "Build checkout callback URLs from base URLs by appending a `subscription`
+  query param identifying the outcome."
+  [base-url base-error-url]
+  (let [build (fn [url token]
+                (dom/append-query-param url :subscription token))]
+    {:success-callback      (build base-url "subscribed-to-penpot-nitrate")
+     :error-callback        (build base-error-url nitrate-checkout-error-token)
+     :finish-error-callback (build base-error-url nitrate-checkout-finish-error-token)
+     :cancel-callback       (build base-url nitrate-checkout-cancelled-token)}))
 
 (defn go-to-buy-nitrate-license
-  [subscription base-url]
+  [subscription base-url base-error-url event-origin subscription-mode subscription-start-origin]
   (let [{:keys [success-callback error-callback finish-error-callback cancel-callback]}
-        (build-nitrate-callback-urls base-url)
+        (build-nitrate-callback-urls base-url base-error-url)
         params {:subscription subscription
                 :callback success-callback
                 :error_callback error-callback
                 :finish_error_callback finish-error-callback
                 :cancel_callback cancel-callback}
-        href   (dm/str "/admin-console/licenses/start?" (u/map->query-string params))]
-    (st/emit! (rt/nav-raw :href href))))
+        href   (build-admin-console-url "licenses/start" params)
+        event  (ev/event {::ev/name "start-nitrate-checkout"
+                          ::ev/origin event-origin
+                          :product "nitrate:enterprise"
+                          :billing-period subscription
+                          :subscription-mode subscription-mode
+                          :subscription-start-origin subscription-start-origin})]
+    (->> st/stream
+         (rx/filter (ptk/type? ::ev/chunk-persisted))
+         (rx/take 1)
+         (rx/timeout 2000 (rx/of :timeout))
+         (rx/subs! (fn [_]
+                     (st/emit! (rt/nav-raw :href href)))))
+    (st/emit! event (ptk/data-event ::ev/force-persist {}))))
 
 (defn fetch-connectivity
   []
@@ -125,52 +148,82 @@
 
 (defn is-valid-license?
   [profile]
-  (and (contains? cf/flags :nitrate)
+  (and (contains? cf/flags :admin-console)
        ;; Possible values: "active" "canceled" "incomplete" "incomplete_expired" "past_due" "paused" "trialing" "unpaid"
        (contains? #{"active" "past_due" "trialing"}
                   (dm/get-in profile [:subscription :status]))))
 
-(defn leave-org
-  [{:keys [id name default-team-id teams-to-delete teams-to-leave on-error] :as params}]
+(defn leave-organization
+  [{:keys [id
+           name
+           default-team-id
+           teams-to-delete
+           teams-to-leave
+           member-added-at
+           organization-member-count-before
+           on-error]}]
 
-  (ptk/reify ::leave-org
+  (ptk/reify ::leave-organization
     ptk/WatchEvent
     (watch [_ state _]
-      (let [profile-team-id (dm/get-in state [:profile :default-team-id])]
-        (->> (rp/cmd! ::leave-org {:id id
-                                   :name name
-                                   :default-team-id default-team-id
-                                   :teams-to-delete teams-to-delete
-                                   :teams-to-leave teams-to-leave})
-             (rx/mapcat
-              (fn [_]
-                (rx/of
-                 (dt/fetch-teams)
-                 (dcm/go-to-dashboard-recent :team-id profile-team-id)
-                 (modal/hide)
-                 (ntf/show {:content (tr "dasboard.leave-org.toast" name)
-                            :type :toast
-                            :level :success}))))
-             (rx/catch on-error))))))
+      (let [profile-id         (dm/get-in state [:profile :id])
+            profile-team-id    (dm/get-in state [:profile :default-team-id])
+            subscription-status
+            (if (= "trialing" (dm/get-in state [:profile :subscription :status]))
+              "trial"
+              "active")
+            audit-event
+            (nitrate-audit/delete-organization-member-event
+             {:organization-id id
+              :user-id profile-id
+              :user-who-delete-member profile-id
+              :deleted-by-role "organization-member"
+              :member-added-at member-added-at
+              :organization-member-count-before organization-member-count-before
+              :subscription-status subscription-status})]
+        (rx/concat
+         (rx/of audit-event)
+         (->> (rp/cmd! ::leave-organization {:id id
+                                             :name name
+                                             :default-team-id default-team-id
+                                             :teams-to-delete teams-to-delete
+                                             :teams-to-leave teams-to-leave})
+              (rx/mapcat
+               (fn [_]
+                 (rx/of
+                  (dt/fetch-teams)
+                  (dcm/go-to-dashboard-recent :team-id profile-team-id)
+                  (modal/hide)
+                  (ntf/show {:content (tr "dashboard.leave-organization.toast" name)
+                             :type :toast
+                             :level :success}))))
+              (rx/catch on-error)))))))
 
-(defn show-leave-org-modal
+(defn show-leave-organization-modal
   [{:keys [organization profile default-team-id leave-fn teams-to-transfer on-error]}]
-  (ptk/reify ::show-leave-org-modal
+  (ptk/reify ::show-leave-organization-modal
     ptk/WatchEvent
     (watch [_ _ _]
-      (->> (rp/cmd! ::get-leave-org-summary {:id (:id organization)
-                                             :default-team-id default-team-id})
+      (->> (rp/cmd! ::get-leave-organization-summary {:id (:id organization)
+                                                      :default-team-id default-team-id})
            (rx/mapcat
             (fn [summary]
               (let [num-teams-to-delete (:teams-to-delete summary)
                     num-teams-to-transfer (:teams-to-transfer summary)
                     num-teams-to-exit (:teams-to-exit summary)
-                    num-teams-to-detach (:teams-to-detach summary)]
+                    num-teams-to-detach (:teams-to-detach summary)
+                    leave-fn
+                    (fn [params]
+                      (leave-fn
+                       (assoc params
+                              :member-added-at (:member-added-at summary)
+                              :organization-member-count-before
+                              (:organization-member-count-before summary))))]
                 (cond
                   (pos? num-teams-to-transfer)
                   (rx/of
                    (modal/show
-                    {:type :leave-and-reassign-org
+                    {:type :leave-and-reassign-organization
                      :profile profile
                      :teams-to-transfer teams-to-transfer
                      :num-teams-to-delete num-teams-to-delete
@@ -181,28 +234,28 @@
                       (pos? num-teams-to-detach))
                   (rx/of (modal/show
                           {:type :confirm
-                           :title (tr "modals.before-leave-org.title" (:name organization))
-                           :message (tr "modals.before-leave-org.message")
-                           :accept-label (tr "modals.leave-org-confirm.accept")
+                           :title (tr "modals.before-leave-organization.title" (:name organization))
+                           :message (tr "modals.before-leave-organization.message")
+                           :accept-label (tr "modals.leave-organization-confirm.accept")
                            :on-accept leave-fn
-                           :error-msg (tr "modals.before-leave-org.warning")}))
+                           :error-msg (tr "modals.before-leave-organization.warning")}))
 
                   :else
                   (rx/of (modal/show
                           {:type :confirm
-                           :title (tr "modals.leave-org-confirm.title" (:name organization))
-                           :message (tr "modals.leave-org-confirm.message")
-                           :accept-label (tr "modals.leave-org-confirm.accept")
+                           :title (tr "modals.leave-organization-confirm.title" (:name organization))
+                           :message (tr "modals.leave-organization-confirm.message")
+                           :accept-label (tr "modals.leave-organization-confirm.accept")
                            :on-accept leave-fn}))))))
            (rx/catch on-error)))))
 
 
-(defn remove-team-from-org
+(defn remove-team-from-organization
   [{:keys [team-id organization-id organization-name] :as params}]
-  (ptk/reify ::remove-team-from-org
+  (ptk/reify ::remove-team-from-organization
     ptk/WatchEvent
     (watch [_ _ _]
-      (->> (rp/cmd! ::remove-team-from-org {:team-id team-id :organization-id organization-id :organization-name organization-name})
+      (->> (rp/cmd! ::remove-team-from-organization {:team-id team-id :organization-id organization-id :organization-name organization-name})
            (rx/mapcat
             (fn [_]
               (rx/of (dt/fetch-teams)
@@ -211,40 +264,40 @@
             (fn [cause]
               (let [code (-> cause ex-data :code)]
                 (if (= code :not-allowed)
-                  (rx/of (modal/show :no-permission-modal {:type :no-orgs-change}))
+                  (rx/of (modal/show :no-permission-modal {:type :no-organizations-change}))
                   (rx/throw cause)))))))))
 
-(defn show-remove-team-from-org-modal
-  "Fetches fresh team/org data, then shows the remove-from-org confirmation
+(defn show-remove-team-from-organization-modal
+  "Fetches fresh team/organization data, then shows the remove-from-organization confirmation
   modal or the no-permission modal if the move-team permission blocks it."
   [{:keys [team-id]}]
-  (ptk/reify ::show-remove-team-from-org-modal
+  (ptk/reify ::show-remove-team-from-organization-modal
     ptk/WatchEvent
     (watch [_ state _]
       (let [profile-id (dm/get-in state [:profile :id])]
         (dt/with-refreshed-team team-id
           (fn [team]
-            (let [source-org (:organization team)
-                  can-move?  (nitrate-perms/allowed?
+            (let [source-organization (:organization team)
+                  can-move?  (cto/allowed?
                               :move-team
-                              {:org-perms {:owner-id    (:owner-id source-org)
-                                           :permissions (:permissions source-org)}
+                              {:organization-perms {:owner-id    (:owner-id source-organization)
+                                                    :permissions (:permissions source-organization)}
                                :profile-id profile-id
                                :team-perms (:permissions team)
-                               :target-org-same-owner? false})]
+                               :target-organization-same-owner? false})]
               (rx/of (if can-move?
                        (modal/show
                         {:type :confirm
-                         :title (tr "modals.remove-team-org.title")
-                         :message (tr "modals.remove-team-org.text" (:name team) (:name source-org))
-                         :hint (tr "modals.remove-team-org.info")
+                         :title (tr "modals.remove-team-organization.title")
+                         :message (tr "modals.remove-team-organization.text" (:name team) (:name source-organization))
+                         :hint (tr "modals.remove-team-organization.info")
                          :hint-level :default
-                         :accept-label (tr "modals.remove-team-org.accept")
-                         :on-accept #(st/emit! (remove-team-from-org {:team-id team-id
-                                                                      :organization-id (:id source-org)
-                                                                      :organization-name (:name source-org)}))
+                         :accept-label (tr "modals.remove-team-organization.accept")
+                         :on-accept #(st/emit! (remove-team-from-organization {:team-id team-id
+                                                                               :organization-id (:id source-organization)
+                                                                               :organization-name (:name source-organization)}))
                          :accept-style :danger})
-                       (modal/show :no-permission-modal {:type :no-orgs-change}))))))))))
+                       (modal/show :no-permission-modal {:type :no-organizations-change}))))))))))
 
 
 (defn add-team-to-organization
@@ -252,46 +305,70 @@
   organization requires a fresh Nitrate SSO session. When SSO is required,
   stores the pending action and redirects to the provider so the dashboard
   can resume the operation after the callback."
-  [{:keys [team-id organization-id]}]
+  [{:keys [team-id organization-id skip-audit?]}]
   (ptk/reify ::add-team-to-organization
     ptk/WatchEvent
-    (watch [_ _ _]
-      (let [pending-id   (str (uuid/next))
+    (watch [_ state _]
+      (let [team         (dm/get-in state [:teams team-id])
+            organization-team-count-before
+            (nitrate-audit/organization-team-count
+             (vals (:teams state))
+             organization-id)
+            team-previous-organization-status
+            (if (or (:organization-id team)
+                    (get-in team [:organization :id]))
+              "other-organization"
+              "no-organization")
+            subscription-status
+            (or (dm/get-in state [:profile :subscription :status])
+                "active")
+            audit-event
+            (nitrate-audit/add-team-to-organization-event
+             {:team team
+              :organization-id organization-id
+              :organization-team-count-before organization-team-count-before
+              :team-previous-organization-status team-previous-organization-status
+              :add-method "move-existing-team-to-organization"
+              :subscription-status subscription-status})
+            pending-id   (str (uuid/next))
             callback-url (dom/append-query-param (rt/get-current-href)
                                                  :pending-action-id pending-id)]
-        (->> (rp/cmd! :check-nitrate-sso {:organization-id organization-id :url callback-url})
-             (rx/mapcat
-              (fn [{:keys [authorized redirect-uri]}]
-                (if authorized
-                  (->> (rp/cmd! ::add-team-to-organization {:team-id team-id :organization-id organization-id})
-                       (rx/map (fn [_] (modal/hide))))
-                  (if redirect-uri
-                    (do
-                      (ss/save-pending-action! pending-id {:type            :add-team-to-organization
-                                                           :team-id         team-id
-                                                           :organization-id organization-id})
-                      (rx/of (rt/nav-raw :uri (str redirect-uri))))
-                    (rx/empty))))))))))
+        (rx/concat
+         (when-not skip-audit?
+           (rx/of audit-event))
+         (->> (rp/cmd! :check-nitrate-sso {:organization-id organization-id :url callback-url})
+              (rx/mapcat
+               (fn [{:keys [authorized redirect-uri]}]
+                 (if authorized
+                   (->> (rp/cmd! ::add-team-to-organization {:team-id team-id :organization-id organization-id})
+                        (rx/map (fn [_] (modal/hide))))
+                   (if redirect-uri
+                     (do
+                       (ss/save-pending-action! pending-id {:type            :add-team-to-organization
+                                                            :team-id         team-id
+                                                            :organization-id organization-id})
+                       (rx/of (rt/nav-raw :uri (str redirect-uri))))
+                     (rx/empty)))))))))))
 
 
-(defn- fetch-orgs-allowed
-  "Returns an rx observable of an `orgs-allowed` map (org-id -> boolean).
-   Orgs where :add-anybody-to-team is permitted are pre-approved;
-   the rest are verified via :all-team-members-in-orgs."
-  [team-id orgs]
-  (let [add-anybody-orgs (filterv #(nitrate-perms/allowed? :add-anybody-to-team {:org-perms %}) orgs)
-        orgs-to-check    (filterv #(not (nitrate-perms/allowed? :add-anybody-to-team {:org-perms %})) orgs)
-        org-ids-to-check (mapv :id orgs-to-check)]
-    (if (empty? org-ids-to-check)
-      (rx/of (into {} (map (fn [org] [(:id org) true])) orgs))
-      (->> (rp/cmd! :all-team-members-in-orgs {:team-id team-id :organization-ids org-ids-to-check})
-           (rx/map (fn [checked-orgs]
-                     (merge (into {} (map (fn [org] [(:id org) true])) add-anybody-orgs)
-                            checked-orgs)))))))
+(defn- fetch-organizations-allowed
+  "Returns an rx observable of an `organizations-allowed` map (organization-id -> boolean).
+   Organizations where :add-anybody-to-team is permitted are pre-approved;
+   the rest are verified via :all-team-members-in-organizations."
+  [team-id organizations]
+  (let [add-anybody-organizations (filterv #(cto/allowed? :add-anybody-to-team {:organization-perms %}) organizations)
+        organizations-to-check    (filterv #(not (cto/allowed? :add-anybody-to-team {:organization-perms %})) organizations)
+        organization-ids-to-check (mapv :id organizations-to-check)]
+    (if (empty? organization-ids-to-check)
+      (rx/of (into {} (map (fn [organization] [(:id organization) true])) organizations))
+      (->> (rp/cmd! :all-team-members-in-organizations {:team-id team-id :organization-ids organization-ids-to-check})
+           (rx/map (fn [checked-organizations]
+                     (merge (into {} (map (fn [organization] [(:id organization) true])) add-anybody-organizations)
+                            checked-organizations)))))))
 
 (defn show-add-team-to-organization-modal
-  "Fetches fresh team/org data, then shows the add-to-org modal
-  restricted to orgs where the user has permission, or the no-permission
+  "Fetches fresh team/organization data, then shows the add-to-organization modal
+  restricted to organizations where the user has permission, or the no-permission
   modal if none qualify."
   [{:keys [team-id]}]
   (ptk/reify ::show-add-team-to-organization-modal
@@ -301,114 +378,114 @@
         (->> (rp/cmd! :get-teams)
              (rx/mapcat
               (fn [teams]
-                (let [all-orgs (map dt/team->organization
-                                    (filter #(and (:is-default %) (:organization %)) teams))
-                      orgs     (filter (fn [org]
-                                         (let [perm    (dm/get-in org [:permissions :create-teams])
-                                               is-own? (= profile-id (:owner-id org))]
-                                           (or (= perm "any") is-own?))) all-orgs)
+                (let [all-organizations (map dt/team->organization
+                                             (filter #(and (:is-default %) (:organization %)) teams))
+                      organizations     (filter (fn [organization]
+                                                  (let [perm    (dm/get-in organization [:permissions :create-teams])
+                                                        is-own? (= profile-id (:owner-id organization))]
+                                                    (or (= perm "any") is-own?))) all-organizations)
                       team     (first (filter #(= (:id %) team-id) teams))
                       on-confirm (fn [organization-id]
                                    (st/emit! (add-team-to-organization {:team-id team-id
                                                                         :organization-id organization-id})))
                       show-select-modal
-                      (fn [orgs-allowed]
-                        (let [has-filtered? (< (count orgs) (count all-orgs))
+                      (fn [organizations-allowed]
+                        (let [has-filtered? (< (count organizations) (count all-organizations))
                               extra-props   (when has-filtered?
-                                              {:info-message-key "dashboard.select-org-modal.permission-info"})]
+                                              {:info-message-key "dashboard.select-organization-modal.permission-info"})]
                           (modal/show :select-organization-modal
-                                      (merge {:organizations orgs
-                                              :orgs-allowed orgs-allowed
+                                      (merge {:organizations organizations
+                                              :organizations-allowed organizations-allowed
                                               :current-organization-id (dm/get-in team [:organization :id])
                                               :on-confirm on-confirm
                                               :team-id team-id
-                                              :title-key "dashboard.select-org-modal.title"
-                                              :choose-key "dashboard.select-org-modal.choose"
-                                              :placeholder-key "dashboard.select-org-modal.select"
-                                              :accept-key "dashboard.select-org-modal.accept"
+                                              :title-key "dashboard.select-organization-modal.title"
+                                              :choose-key "dashboard.select-organization-modal.choose"
+                                              :placeholder-key "dashboard.select-organization-modal.select"
+                                              :accept-key "dashboard.select-organization-modal.accept"
                                               :cancel-key "labels.cancel"}
                                              extra-props))))]
-                  (if (empty? orgs)
+                  (if (empty? organizations)
                     (rx/of (dt/teams-fetched teams)
-                           (modal/show :no-permission-modal {:type :no-orgs-create}))
-                    (->> (fetch-orgs-allowed team-id orgs)
+                           (modal/show :no-permission-modal {:type :no-organizations-create}))
+                    (->> (fetch-organizations-allowed team-id organizations)
                          (rx/mapcat
-                          (fn [orgs-allowed]
-                            (let [valid-orgs (filterv #(true? (get orgs-allowed (:id %))) orgs)]
+                          (fn [organizations-allowed]
+                            (let [valid-organizations (filterv #(true? (get organizations-allowed (:id %))) organizations)]
                               (rx/of
                                (dt/teams-fetched teams)
-                               (if (empty? valid-orgs)
+                               (if (empty? valid-organizations)
                                  (modal/show
                                   {:type :alert
                                    :hide-actions? true
-                                   :message (tr "dashboard.team-organization.add.no-valid-orgs")
-                                   :title (tr "dashboard.select-org-modal.title")})
-                                 (show-select-modal orgs-allowed))))))))))))))))
+                                   :message (tr "dashboard.team-organization.add.no-valid-organizations")
+                                   :title (tr "dashboard.select-organization-modal.title")})
+                                 (show-select-modal organizations-allowed))))))))))))))))
 
-(defn show-change-team-org-modal
-  "Fetches fresh team/org data, then shows the change-org modal
-  restricted to orgs where the user has permission, or the no-permission
+(defn show-change-team-organization-modal
+  "Fetches fresh team/organization data, then shows the change-organization modal
+  restricted to organizations where the user has permission, or the no-permission
   modal if none qualify."
   [{:keys [team-id]}]
-  (ptk/reify ::show-change-team-org-modal
+  (ptk/reify ::show-change-team-organization-modal
     ptk/WatchEvent
     (watch [_ state _]
       (let [profile-id (dm/get-in state [:profile :id])]
         (->> (rp/cmd! :get-teams)
              (rx/mapcat
               (fn [teams]
-                (let [all-orgs     (map dt/team->organization
-                                        (filter #(and (:is-default %) (:organization %)) teams))
+                (let [all-organizations     (map dt/team->organization
+                                                 (filter #(and (:is-default %) (:organization %)) teams))
                       team         (first (filter #(= (:id %) team-id) teams))
-                      source-org   (:organization team)
-                      current-org-id (:id source-org)
-                      move-perm    (dm/get-in source-org [:permissions :move-teams])
-                      source-owner-id (:owner-id source-org)
-                      can-create?  (fn [org]
-                                     (let [perm    (dm/get-in org [:permissions :create-teams])
-                                           is-own? (= profile-id (:owner-id org))]
+                      source-organization   (:organization team)
+                      current-organization-id (:id source-organization)
+                      move-perm    (dm/get-in source-organization [:permissions :move-teams])
+                      source-owner-id (:owner-id source-organization)
+                      can-create?  (fn [organization]
+                                     (let [perm    (dm/get-in organization [:permissions :create-teams])
+                                           is-own? (= profile-id (:owner-id organization))]
                                        (or (= perm "any") is-own?)))
-                      orgs-by-move (case move-perm
-                                     "never"
-                                     []
+                      organizations-by-move (case move-perm
+                                              "never"
+                                              []
 
-                                     "myOrganizations"
-                                     (filter #(= source-owner-id (:owner-id %)) all-orgs)
+                                              "myOrganizations"
+                                              (filter #(= source-owner-id (:owner-id %)) all-organizations)
 
-                                     ;; Default to always-allowed behavior.
-                                     all-orgs)
-                      orgs         (filter can-create? orgs-by-move)
-                      selectable-orgs (remove #(= current-org-id (:id %)) orgs)
+                                              ;; Default to always-allowed behavior.
+                                              all-organizations)
+                      organizations         (filter can-create? organizations-by-move)
+                      selectable-organizations (remove #(= current-organization-id (:id %)) organizations)
                       on-confirm (fn [organization-id]
                                    (st/emit! (add-team-to-organization {:team-id team-id
                                                                         :organization-id organization-id})))]
-                  (if (empty? selectable-orgs)
+                  (if (empty? selectable-organizations)
                     (rx/of (dt/teams-fetched teams)
-                           (modal/show :no-permission-modal {:type :no-orgs-change}))
-                    (->> (fetch-orgs-allowed team-id selectable-orgs)
+                           (modal/show :no-permission-modal {:type :no-organizations-change}))
+                    (->> (fetch-organizations-allowed team-id selectable-organizations)
                          (rx/mapcat
-                          (fn [orgs-allowed]
-                            (let [valid-orgs    (filterv #(true? (get orgs-allowed (:id %))) selectable-orgs)
-                                  has-filtered? (< (count orgs) (count all-orgs))
+                          (fn [organizations-allowed]
+                            (let [valid-organizations    (filterv #(true? (get organizations-allowed (:id %))) selectable-organizations)
+                                  has-filtered? (< (count organizations) (count all-organizations))
                                   extra-props   (when has-filtered?
-                                                  {:info-message-key "dashboard.select-org-modal.permission-info"})]
+                                                  {:info-message-key "dashboard.select-organization-modal.permission-info"})]
                               (rx/of
                                (dt/teams-fetched teams)
-                               (if (empty? valid-orgs)
+                               (if (empty? valid-organizations)
                                  (modal/show
                                   {:type :alert
                                    :hide-actions? true
-                                   :message (tr "dashboard.team-organization.add.no-valid-orgs")
-                                   :title (tr "dashboard.change-org-modal.title")})
+                                   :message (tr "dashboard.team-organization.add.no-valid-organizations")
+                                   :title (tr "dashboard.change-organization-modal.title")})
                                  (modal/show :select-organization-modal
-                                             (merge {:organizations           selectable-orgs
-                                                     :orgs-allowed            orgs-allowed
-                                                     :current-organization-id current-org-id
+                                             (merge {:organizations           selectable-organizations
+                                                     :organizations-allowed            organizations-allowed
+                                                     :current-organization-id current-organization-id
                                                      :on-confirm              on-confirm
                                                      :team-id                 team-id
-                                                     :title-key               "dashboard.change-org-modal.title"
-                                                     :choose-key              "dashboard.change-org-modal.choose"
-                                                     :placeholder-key         "dashboard.change-org-modal.select"
-                                                     :accept-key              "dashboard.change-org-modal.accept"
+                                                     :title-key               "dashboard.change-organization-modal.title"
+                                                     :choose-key              "dashboard.change-organization-modal.choose"
+                                                     :placeholder-key         "dashboard.change-organization-modal.select"
+                                                     :accept-key              "dashboard.change-organization-modal.accept"
                                                      :cancel-key              "labels.cancel"}
                                                     extra-props)))))))))))))))))
diff --git a/frontend/src/app/main/data/nitrate_audit.cljs b/frontend/src/app/main/data/nitrate_audit.cljs
new file mode 100644
index 0000000000..619f56d3ec
--- /dev/null
+++ b/frontend/src/app/main/data/nitrate_audit.cljs
@@ -0,0 +1,80 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.main.data.nitrate-audit
+  (:require
+   [app.common.math :as mth]
+   [app.common.time :as ct]
+   [app.main.data.event :as ev]))
+
+(def ^:private milliseconds-per-day (* 24 60 60 1000))
+
+(defn age-days
+  [created-at]
+  (when (ct/inst? created-at)
+    (-> (ct/diff-ms created-at (ct/now))
+        (/ milliseconds-per-day)
+        (mth/floor)
+        (mth/max 0))))
+
+(defn organization-team-count
+  [teams organization-id]
+  (->> teams
+       (filter #(and (not (:is-default %))
+                     (= organization-id
+                        (or (:organization-id %)
+                            (get-in % [:organization :id])))))
+       (count)))
+
+(defn add-team-to-organization-event
+  [{:keys [team
+           organization-id
+           organization-team-count-before
+           team-previous-organization-status
+           add-method
+           subscription-status]}]
+  (let [team-created-at (:created-at team)
+        event-origin (case add-method
+                       "create-team-in-organization"
+                       "dashboard:create-team-in-organization"
+
+                       "move-existing-team-to-organization"
+                       "dashboard:move-team-to-organization")
+        props (cond-> {:is-your-penpot false
+                       :add-method add-method
+                       :organization-id organization-id
+                       :organization-team-count-before organization-team-count-before
+                       :team-previous-organization-status team-previous-organization-status
+                       :is-first-team-in-organization (zero? organization-team-count-before)
+                       :subscription-status subscription-status}
+                (:id team)
+                (assoc :team-id (:id team))
+
+                (ct/inst? team-created-at)
+                (assoc :team-created-at (.toISOString team-created-at)
+                       :team-age-days (age-days team-created-at)))]
+    (ev/event
+     (assoc props
+            ::ev/name "add-team-to-organization"
+            ::ev/origin event-origin))))
+
+(defn delete-organization-member-event
+  [{:keys [organization-id
+           user-id
+           user-who-delete-member
+           deleted-by-role
+           member-added-at
+           organization-member-count-before
+           subscription-status]}]
+  (ev/event
+   {::ev/name "delete-organization-member"
+    :organization-id organization-id
+    :user-id user-id
+    :user-who-delete-member user-who-delete-member
+    :deleted-by-role deleted-by-role
+    :days-since-member-added (age-days member-added-at)
+    :organization-member-count-before organization-member-count-before
+    :subscription-status subscription-status}))
diff --git a/frontend/src/app/main/data/profile.cljs b/frontend/src/app/main/data/profile.cljs
index e37dc08e45..93a948c119 100644
--- a/frontend/src/app/main/data/profile.cljs
+++ b/frontend/src/app/main/data/profile.cljs
@@ -462,11 +462,14 @@
       ptk/WatchEvent
       (watch [_ _ _]
         (let [{:keys [on-error on-success]
-               :or {on-error rx/throw
+               :or {on-error identity
                     on-success identity}} (meta data)]
           (->> (rp/cmd! :recover-profile data)
                (rx/tap on-success)
-               (rx/catch on-error)))))))
+               (rx/catch (fn [err]
+                           (on-error err)
+                           (rx/empty)))
+               (rx/ignore)))))))
 
 ;; --- EVENT: fetch-team-webhooks
 
diff --git a/frontend/src/app/main/data/shortcuts.cljs b/frontend/src/app/main/data/shortcuts.cljs
index 7d263da514..19a473ae54 100644
--- a/frontend/src/app/main/data/shortcuts.cljs
+++ b/frontend/src/app/main/data/shortcuts.cljs
@@ -121,6 +121,62 @@
       [sc]
       (str/split sc #"\+| "))))
 
+(defn command->tooltip
+  "Converts a Mousetrap command string (e.g. \"command+shift+z\") to
+  a human-readable display string in the same format used by :tooltip
+  fields (e.g. \"⌘⇧Z\" on macOS or \"Ctrl+Shift+Z\" on Windows).
+  Returns nil for empty or unbound commands."
+  [command]
+  (when (and command (not= command ""))
+    (let [is-macos?    (cf/check-platform? :macos)
+          parts        (str/split command #"\+")
+          display-part (fn [p]
+                         (case p
+                           "ctrl"      (if is-macos? mac-control "Ctrl+")
+                           "command"   (if is-macos? mac-command "Ctrl+")
+                           "alt"       (if is-macos? mac-option "Alt+")
+                           "shift"     (if is-macos? mac-shift "Shift+")
+                           "up"        up-arrow
+                           "down"      down-arrow
+                           "left"      left-arrow
+                           "right"     right-arrow
+                           "del"       (if is-macos? mac-delete "Del")
+                           "backspace" (if is-macos? mac-delete "Backspace")
+                           "escape"    (if is-macos? mac-esc "Escape")
+                           "enter"     (if is-macos? mac-enter "Enter")
+                           "space"     "Space"
+                           "tab"       tab
+                           (str/upper p)))]
+      (str/join "" (map display-part parts)))))
+
+(defn apply-custom-overrides
+  [shortcuts custom-overrides group-key]
+  (let [group-overrides (get custom-overrides group-key)]
+    (if (empty? group-overrides)
+      shortcuts
+      (reduce-kv
+       (fn [acc sc-key new-command]
+         (if (and (contains? acc sc-key)
+                  (not (:disabled (get acc sc-key))))
+           (-> acc
+               (assoc-in [sc-key :original-command] (get-in acc [sc-key :command]))
+               (assoc-in [sc-key :command] new-command)
+               (update sc-key dissoc :show-command))
+           acc))
+       shortcuts
+       group-overrides))))
+
+(defn build-command-index
+  [shortcuts]
+  (reduce-kv
+   (fn [acc sc-key sc-def]
+     (let [commands (:command sc-def)]
+       (if (vector? commands)
+         (reduce #(assoc %1 %2 sc-key) acc commands)
+         (assoc acc commands sc-key))))
+   {}
+   shortcuts))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Events
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -152,13 +208,16 @@
        (remove #(:disabled (second %)))
        (run! (fn [[key {:keys [command fn type overwrite]}]]
                (let [callback  (wrap-cb key fn)
-                     undefined (js* "(void 0)")
                      commands  (if (vector? command)
                                  (into-array command)
                                  #js [command])]
-                 (if type
-                   (mousetrap/bind commands callback type overwrite)
-                   (mousetrap/bind commands callback undefined overwrite)))))))
+                 (if (vector? type)
+                   (do (mousetrap/bind commands callback (nth type 0) overwrite)
+                       (mousetrap/bind commands callback (nth type 1) overwrite))
+                   (let [undefined (js* "(void 0)")]
+                     (if type
+                       (mousetrap/bind commands callback type overwrite)
+                       (mousetrap/bind commands callback undefined overwrite)))))))))
 
 (defn- reset!
   ([]
@@ -171,17 +230,34 @@
   (fnil conj (d/ordered-map)))
 
 (defn push-shortcuts
-  [key shortcuts]
+  [key shortcuts group-key & {:keys [merge-shortcuts]}]
   (assert (keyword? key) "expected a keyword for `key`")
   (let [shortcuts (check-shortcuts shortcuts)]
     (ptk/reify ::push-shortcuts
       ptk/UpdateEvent
       (update [_ state]
-        (update state :shortcuts conj* [key shortcuts]))
+        (let [custom-overrides (get-in state [:profile :props :custom-shortcuts])
+              group-key        (or group-key (:shortcuts-group-key state))
+              merge-sc         (cond
+                                 (= merge-shortcuts :auto)
+                                 (let [[_ sc] (last (:shortcuts state))]
+                                   sc)
+
+                                 (map? merge-shortcuts)
+                                 merge-shortcuts)
+
+              effective        (if merge-sc
+                                 (merge merge-sc shortcuts)
+                                 shortcuts)
+              effective        (apply-custom-overrides effective custom-overrides group-key)]
+          (-> state
+              (update :shortcuts conj* [key effective])
+              (assoc :shortcuts-group-key group-key))))
 
       ptk/EffectEvent
-      (effect [_ _ _]
-        (reset! shortcuts)))))
+      (effect [_ state _]
+        (let [[_ stored] (last (:shortcuts state))]
+          (reset! stored))))))
 
 (defn pop-shortcuts
   [key]
@@ -193,5 +269,19 @@
 
     ptk/EffectEvent
     (effect [_ state _]
-      (let [[_key shortcuts] (last (:shortcuts state))]
-        (reset! shortcuts)))))
+      (let [[_key shortcuts] (last (:shortcuts state))
+            custom-overrides (get-in state [:profile :props :custom-shortcuts])
+            group-key        (:shortcuts-group-key state)
+            effective        (apply-custom-overrides shortcuts custom-overrides group-key)]
+        (reset! effective)))))
+
+(defn rebind-shortcuts
+  []
+  (ptk/reify ::rebind-shortcuts
+    ptk/EffectEvent
+    (effect [_ state _]
+      (let [custom-overrides (get-in state [:profile :props :custom-shortcuts])
+            group-key        (:shortcuts-group-key state)
+            merged           (reduce merge (map val (:shortcuts state)))
+            effective        (apply-custom-overrides merged custom-overrides group-key)]
+        (reset! effective)))))
diff --git a/frontend/src/app/main/data/team.cljs b/frontend/src/app/main/data/team.cljs
index ede9ca26ce..74b9a97bc9 100644
--- a/frontend/src/app/main/data/team.cljs
+++ b/frontend/src/app/main/data/team.cljs
@@ -10,7 +10,7 @@
    [app.common.data.macros :as dm]
    [app.common.logging :as log]
    [app.common.schema :as sm]
-   [app.common.types.nitrate-permissions :as nitrate-perms]
+   [app.common.types.organization :as cto]
    [app.common.types.team :as ctt]
    [app.common.uri :as u]
    [app.config :as cf]
@@ -18,6 +18,7 @@
    [app.main.data.helpers :as dsh]
    [app.main.data.media :as di]
    [app.main.data.modal :as modal]
+   [app.main.data.nitrate-audit :as nitrate-audit]
    [app.main.data.profile :as dp]
    [app.main.features :as features]
    [app.main.repo :as rp]
@@ -41,7 +42,7 @@
   default team when the candidate requires SSO and the user has no
   valid SSO session for it."
   [{:keys [team-id default-team-id]}]
-  (if (or (not (contains? cf/flags :nitrate))
+  (if (or (not (contains? cf/flags :admin-console))
           (= team-id default-team-id))
     (rx/of team-id)
     (->> (rp/cmd! :check-nitrate-sso {:team-id team-id :url (rt/get-current-href)})
@@ -92,7 +93,7 @@
     state))
 
 (defn with-refreshed-team
-  "Fetches fresh team data from the server to ensure up-to-date org
+  "Fetches fresh team data from the server to ensure up-to-date organization
   permissions, updates the app state, and calls f with the fresh team data.
   Returns an observable of events."
   [team-id f]
@@ -105,7 +106,7 @@
              (f team)))))))
 
 (defn check-and-create-team
-  "Fetches fresh team data from the server to ensure up-to-date org
+  "Fetches fresh team data from the server to ensure up-to-date organization
   permissions, then shows the team-form modal or a no-permission modal."
   [team-id]
   (ptk/reify ::check-and-create-team
@@ -115,23 +116,23 @@
         (with-refreshed-team team-id
           (fn [team]
             (let [organization (:organization team)
-                  in-org?      (and (contains? cf/flags :nitrate) organization)
-                  can-create?  (if in-org?
-                                 (nitrate-perms/allowed? :create-team
-                                                         {:org-perms {:owner-id    (:owner-id organization)
-                                                                      :permissions (:permissions organization)}
-                                                          :profile-id profile-id
-                                                          :team-perms (:permissions team)})
+                  in-organization?      (and (contains? cf/flags :admin-console) organization)
+                  can-create?  (if in-organization?
+                                 (cto/allowed? :create-team
+                                               {:organization-perms {:owner-id    (:owner-id organization)
+                                                                     :permissions (:permissions organization)}
+                                                :profile-id profile-id
+                                                :team-perms (:permissions team)})
                                  true)]
               (rx/of (if can-create?
-                       (modal/show :team-form (if in-org?
+                       (modal/show :team-form (if in-organization?
                                                 {:organization-id   (:id organization)
                                                  :organization-name (:name organization)}
                                                 {}))
                        (modal/show :no-permission-modal {:type :create-team}))))))))))
 
 (defn check-and-delete-team
-  "Fetches fresh team data from the server to ensure up-to-date org
+  "Fetches fresh team data from the server to ensure up-to-date organization
   permissions, then shows the confirmation modal or a no-permission modal."
   [{:keys [team-id delete-fn]}]
   (ptk/reify ::check-and-delete-team
@@ -140,17 +141,17 @@
       (let [profile-id (dm/get-in state [:profile :id])]
         (with-refreshed-team team-id
           (fn [team]
-            (let [org         (:organization team)
-                  in-org?     (and (contains? cf/flags :nitrate) org)
-                  can-delete? (if in-org?
-                                (nitrate-perms/allowed? :delete-team
-                                                        {:org-perms {:owner-id    (:owner-id org)
-                                                                     :permissions (:permissions org)}
-                                                         :profile-id profile-id
-                                                         :team-perms (:permissions team)})
+            (let [organization         (:organization team)
+                  in-organization?     (and (contains? cf/flags :admin-console) organization)
+                  can-delete? (if in-organization?
+                                (cto/allowed? :delete-team
+                                              {:organization-perms {:owner-id    (:owner-id organization)
+                                                                    :permissions (:permissions organization)}
+                                               :profile-id profile-id
+                                               :team-perms (:permissions team)})
                                 (boolean (dm/get-in team [:permissions :is-owner])))
-                  message     (if in-org?
-                                (tr "modals.delete-org-team-confirm.message" (:name org))
+                  message     (if in-organization?
+                                (tr "modals.delete-organization-team-confirm.message" (:name organization))
                                 (tr "modals.delete-team-confirm.message"))]
               (rx/of (if can-delete?
                        (modal/show
@@ -162,7 +163,7 @@
                        (modal/show :no-permission-modal {:type :delete-team}))))))))))
 
 (defn- check-new-team-members-permission-and-show-invite-members
-  "Receives refreshed team data with up-to-date org
+  "Receives refreshed team data with up-to-date organization
   permissions, then shows the invite members modal or an appropriate alert."
   [{:keys [team invite-email origin]}]
   (ptk/reify ::check-new-team-members-permission-and-show-invite-members
@@ -172,18 +173,18 @@
                                             :team team
                                             :origin (or origin :team)
                                             :invite-email invite-email}))]
-        (if (and (contains? cf/flags :nitrate)
-                 (not (nitrate-perms/allowed? :add-anybody-to-team
-                                              {:org-perms (:organization team)})))
-          (->> (rp/cmd! :all-org-members-in-team
+        (if (and (contains? cf/flags :admin-console)
+                 (not (cto/allowed? :add-anybody-to-team
+                                    {:organization-perms (:organization team)})))
+          (->> (rp/cmd! :all-organization-members-in-team
                         {:team-id (:id team)
                          :organization-id (get-in team [:organization :id])})
                (rx/mapcat
-                (fn [all-org-members-in-team?]
-                  (if all-org-members-in-team?
+                (fn [all-organization-members-in-team?]
+                  (if all-organization-members-in-team?
                     (rx/of (modal/show
                             {:type :alert
-                             :message (tr "modals.invite-restricted-members.all-org-members-in-team" (get-in team [:organization :name]))
+                             :message (tr "modals.invite-restricted-members.all-organization-members-in-team" (get-in team [:organization :name]))
                              :accept-label (tr "labels.accept")
                              :accept-style :primary
                              :title (tr "modals.invite-team-member.title")}))
@@ -191,7 +192,7 @@
           show-invite)))))
 
 (defn check-and-invite-members
-  "Fetches fresh team data from the server to ensure up-to-date org
+  "Fetches fresh team data from the server to ensure up-to-date organization
   permissions, then shows invite-members modal or a permission error."
   [{:keys [team-id origin invite-email]
     :or {origin :team}}]
@@ -201,10 +202,9 @@
       (let [profile-id (dm/get-in state [:profile :id])]
         (with-refreshed-team team-id
           (fn [team]
-            (let [org         (:organization team)
-                  can-invite? (nitrate-perms/can-send-invitations?
-                               {:nitrate-enabled? (contains? cf/flags :nitrate)
-                                :organization org
+            (let [organization         (:organization team)
+                  can-invite? (cto/can-send-invitations?
+                               {:organization organization
                                 :profile-id profile-id
                                 :team-permissions (:permissions team)})]
               (rx/of (if can-invite?
@@ -438,17 +438,36 @@
   (dm/assert! (string? name))
   (ptk/reify ::create-team
     ptk/WatchEvent
-    (watch [it _ _]
+    (watch [it state _]
       (let [{:keys [on-success on-error]
              :or {on-success identity
                   on-error rx/throw}} (meta params)
             features features/global-enabled-features
+            organization-team-count-before
+            (when organization-id
+              (nitrate-audit/organization-team-count
+               (vals (:teams state))
+               organization-id))
+            subscription-status
+            (or (dm/get-in state [:profile :subscription :status])
+                "active")
+            audit-event
+            (when organization-id
+              (nitrate-audit/add-team-to-organization-event
+               {:organization-id organization-id
+                :organization-team-count-before organization-team-count-before
+                :team-previous-organization-status "no-organization"
+                :add-method "create-team-in-organization"
+                :subscription-status subscription-status}))
             params   (cond-> {:name name :features features}
                        organization-id (assoc :organization-id organization-id))]
-        (->> (rp/cmd! :create-team (with-meta params (meta it)))
-             (rx/tap on-success)
-             (rx/map team-created)
-             (rx/catch on-error))))))
+        (rx/concat
+         (when audit-event
+           (rx/of audit-event))
+         (->> (rp/cmd! :create-team (with-meta params (meta it)))
+              (rx/tap on-success)
+              (rx/map team-created)
+              (rx/catch on-error)))))))
 
 ;; --- EVENT: create-team-with-invitations
 
@@ -589,19 +608,19 @@
              (rx/catch on-error))))))
 
 (defn check-and-submit-invite-members
-  "Fetches fresh team data from the server to ensure up-to-date org
+  "Fetches fresh team data from the server to ensure up-to-date organization
   permissions, then submits member invitations or shows a restriction modal."
   [{:keys [team-id] :as params} origin do-invite-members]
   (ptk/reify ::check-and-submit-invite-members
     ptk/WatchEvent
     (watch [_ _ _]
-      (if (contains? cf/flags :nitrate)
+      (if (contains? cf/flags :admin-console)
         (with-refreshed-team team-id
           (fn [team]
-            (if (not (nitrate-perms/allowed? :add-anybody-to-team
-                                             {:org-perms (:organization team)}))
-              (->> (rp/cmd! :check-org-members {:organization-id (get-in team [:organization :id])
-                                                :emails (vec (:emails params))})
+            (if (not (cto/allowed? :add-anybody-to-team
+                                   {:organization-perms (:organization team)}))
+              (->> (rp/cmd! :check-organization-members {:organization-id (get-in team [:organization :id])
+                                                         :emails (vec (:emails params))})
                    (rx/mapcat
                     (fn [result]
                       (let [blocked (into [] (comp (filter (fn [[_ v]] (not v)))
@@ -810,5 +829,5 @@
 
 
 (defn team->organization [team]
-  (when-let [org (:organization team)]
-    (assoc org :default-team-id (:id team))))
+  (when-let [organization (:organization team)]
+    (assoc organization :default-team-id (:id team))))
diff --git a/frontend/src/app/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs
index 87b9c1007b..1d9c49f9d3 100644
--- a/frontend/src/app/main/data/viewer.cljs
+++ b/frontend/src/app/main/data/viewer.cljs
@@ -222,7 +222,12 @@
     (watch [_ state _]
       (if (and (features/active-feature? state "render-wasm/v1")
                (contains? cf/flags :available-viewer-wasm))
-        (let [objects (dsh/lookup-page-objects state file-id page-id)
+        ;; Fallback matches the viewer UI when the URL omits page-id.
+        (let [page-id (or page-id
+                          (-> (dsh/lookup-file-data state file-id)
+                              :pages
+                              first))
+              objects (dsh/lookup-page-objects state file-id page-id)
 
               shapes
               (reduce-kv
@@ -233,13 +238,12 @@
                []
                objects)
 
-              ;; Creates a stream from the async callback. This stream will only
-              ;; emit one single value after the objects have finished loading
-              ;; in the wasm memory.
+              ;; Positive size required: OffscreenCanvas(0, 0) crashes
+              ;; `_set_render_options` on some browsers.
               set-objects-stream
               (rx/create
                (fn [subs]
-                 (wasm.api/init-canvas-context (js/OffscreenCanvas. 0 0))
+                 (wasm.api/init-canvas-context (js/OffscreenCanvas. 64 64))
                  (wasm.api/set-objects-callback shapes #(rx/push! subs :done))
                  nil))]
 
diff --git a/frontend/src/app/main/data/viewer/shortcuts.cljs b/frontend/src/app/main/data/viewer/shortcuts.cljs
index 9d1cf39f46..f16dcb6d3a 100644
--- a/frontend/src/app/main/data/viewer/shortcuts.cljs
+++ b/frontend/src/app/main/data/viewer/shortcuts.cljs
@@ -7,6 +7,8 @@
 (ns app.main.data.viewer.shortcuts
   (:require
    [app.main.data.common :as dcm]
+   [app.main.data.event :as ev]
+   [app.main.data.profile :as du]
    [app.main.data.shortcuts :as ds]
    [app.main.data.viewer :as dv]
    [app.main.store :as st]))
@@ -15,61 +17,80 @@
   {:increase-zoom      {:tooltip "+"
                         :command "+"
                         :subsections [:zoom-viewer]
+                        :section [:viewer]
                         :fn #(st/emit! dv/increase-zoom)}
 
+   :toggle-theme    {:tooltip (ds/alt "M")
+                     :command (ds/a-mod "m")
+                     :section [:viewer]
+                     :subsections [:generic]
+                     :fn #(st/emit! (with-meta (du/toggle-theme)
+                                      {::ev/origin "viewer:shortcuts"}))}
+
    :decrease-zoom      {:tooltip "-"
                         :command "-"
+                        :section [:viewer]
                         :subsections [:zoom-viewer]
                         :fn #(st/emit! dv/decrease-zoom)}
 
    :select-all         {:tooltip (ds/meta "A")
                         :command (ds/c-mod "a")
-                        :subsections [:general-viewer]
+                        :section [:viewer]
+                        :subsections [:generic]
                         :fn #(st/emit! (dv/select-all))}
 
    :reset-zoom         {:tooltip (ds/shift "0")
                         :command "shift+0"
+                        :section [:viewer]
                         :subsections [:zoom-viewer]
                         :fn #(st/emit! dv/reset-zoom)}
 
    :toggle-zoom-style  {:tooltip "F"
                         :command "f"
+                        :section [:viewer]
                         :subsections [:zoom-viewer]
                         :fn #(st/emit! dv/toggle-zoom-style)}
 
    :toggle-fullscreen  {:tooltip (ds/shift "F")
                         :command ["shift+f" "alt+enter"]
+                        :section [:viewer]
                         :subsections [:zoom-viewer]
                         :fn #(st/emit! dv/toggle-fullscreen)}
 
    :prev-frame         {:tooltip ds/left-arrow
                         :command ["left" "up" "shift+enter" "pageup" "shift+space"]
-                        :subsections [:general-viewer]
+                        :subsections [:generic]
+                        :section [:viewer]
                         :fn #(st/emit! dv/select-prev-frame)}
 
    :next-frame         {:tooltip ds/right-arrow
                         :command ["right" "down" "enter" "pagedown" "space"]
-                        :subsections [:general-viewer]
+                        :subsections [:generic]
+                        :section [:viewer]
                         :fn #(st/emit! dv/select-next-frame)}
 
    :open-inspect       {:tooltip "G I"
                         :command "g i"
                         :subsections [:navigation-viewer]
+                        :section [:viewer]
                         :fn #(st/emit! (dv/go-to-section :inspect))}
 
    :open-comments      {:tooltip "G C"
                         :command "g c"
                         :subsections [:navigation-viewer]
+                        :section [:viewer]
                         :fn #(st/emit! (dv/go-to-section :comments))}
 
    :open-interactions  {:tooltip "G V"
                         :command "g v"
                         :subsections [:navigation-viewer]
+                        :section [:viewer]
                         :fn #(st/emit! (dv/go-to-section :interactions))}
 
    :open-workspace     {:tooltip "G W"
                         :command "g w"
                         :subsections [:navigation-viewer]
+                        :section [:viewer]
                         :fn #(st/emit! (dcm/go-to-workspace))}})
 
 (defn get-tooltip [shortcut]
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index fc2404f39b..8917f2e97f 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -18,6 +18,7 @@
    [app.common.geom.shapes :as gsh]
    [app.common.logging :as log]
    [app.common.path-names :as cpn]
+   [app.common.render-wasm.wasm :as wasm-state]
    [app.common.transit :as t]
    [app.common.types.component :as ctc]
    [app.common.types.components-list :as ctkl]
@@ -60,6 +61,7 @@
    [app.main.data.workspace.selection :as dws]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.shapes :as dwsh]
+   [app.main.data.workspace.texts :as dwtxt]
    [app.main.data.workspace.thumbnails :as dwth]
    [app.main.data.workspace.transforms :as dwt]
    [app.main.data.workspace.undo :as dwu]
@@ -76,7 +78,6 @@
    [app.plugins.register :as preg]
    [app.render-wasm :as wasm]
    [app.render-wasm.api :as wasm.api]
-   [app.render-wasm.wasm :as wasm-state]
    [app.util.dom :as dom]
    [app.util.globals :as ug]
    [app.util.http :as http]
@@ -354,8 +355,7 @@
             features     (features/get-enabled-features state team-id)
             render-wasm-enabled? (features/active-feature? state "render-wasm/v1")
             render-wasm-ready?   #(and render-wasm-enabled?
-                                       wasm-state/context-initialized?
-                                       (not @wasm-state/context-lost?))]
+                                       (wasm-state/ready?))]
 
         (log/debug :hint "initialize-workspace"
                    :team-id (dm/str team-id)
@@ -402,6 +402,7 @@
                        (rx/of (dpj/initialize-project (:project-id file))
                               (dwn/initialize team-id file-id)
                               (dwsl/initialize-shape-layout)
+                              (dwtxt/initialize-text-reflow)
                               (fetch-libraries file-id features)
                               (-> (workspace-initialized file-id)
                                   (with-meta {:team-id team-id
@@ -553,6 +554,7 @@
         (rx/of (dwn/finalize file-id)
                (dpj/finalize-project project-id)
                (dwsl/finalize-shape-layout)
+               (dwtxt/finalize-text-reflow)
                (dwcl/stop-picker)
                (dwc/set-workspace-visited)
                (modal/hide)
diff --git a/frontend/src/app/main/data/workspace/clipboard.cljs b/frontend/src/app/main/data/workspace/clipboard.cljs
index 25c51f2257..ac803897d7 100644
--- a/frontend/src/app/main/data/workspace/clipboard.cljs
+++ b/frontend/src/app/main/data/workspace/clipboard.cljs
@@ -34,6 +34,7 @@
    [app.config :as cf]
    [app.main.data.changes :as dch]
    [app.main.data.event :as ev]
+   [app.main.data.exports.assets :as de]
    [app.main.data.exports.wasm :as wasm.exports]
    [app.main.data.helpers :as dsh]
    [app.main.data.notifications :as ntf]
@@ -378,9 +379,11 @@
 
             shapes          (mapv maybe-translate selected)
             svg-formatted   (svg/generate-formatted-markup objects shapes)]
-        (clipboard/to-clipboard-multi
-         {"image/svg+xml" svg-formatted
-          "text/plain"    svg-formatted})))))
+        (-> (clipboard/to-clipboard-multi
+             {"image/svg+xml" svg-formatted
+              "text/plain"    svg-formatted})
+            (p/catch (fn [cause]
+                       (js/console.error "clipboard error:" cause))))))))
 
 (defn copy-selected-css
   []
@@ -701,22 +704,38 @@
       ptk/WatchEvent
       (watch [_ state _]
         (let [features (get state :features)
-              selected (dsh/lookup-selected state)]
+              objects  (dsh/lookup-page-objects state)
+              selected (dsh/lookup-selected state)
+
+              ;; With WASM, pasted props change the text content but not the
+              ;; selrect, so auto-grow text shapes need an explicit relayout.
+              text-ids (into []
+                             (comp (filter #(cfh/text-shape? (get objects %)))
+                                   (filter #(not= :fixed (:grow-type (get objects %)))))
+                             selected)]
 
           (when (paste-data-valid? pdata)
             (cfeat/check-paste-features! features (:features pdata))
             (case (:type pdata)
               :copied-props
-
-              (rx/concat
-               (->> (rx/of pdata)
-                    (rx/mapcat (partial upload-images (:current-file-id state)))
-                    (rx/map
-                     #(dwsh/update-shapes
-                       selected
-                       (fn [shape objects] (cts/patch-props shape (:props pdata) objects))
-                       {:with-objects? true})))
-               (rx/of (ptk/data-event :layout/update {:ids selected})))
+              ;; Wrap in a single undo transaction so the async wasm text
+              ;; resize is bundled with the props change (one undo step).
+              (let [undo-id       (js/Symbol)
+                    resize-texts? (and (features/active-feature? state "render-wasm/v1")
+                                       (seq text-ids))]
+                (rx/concat
+                 (rx/of (dwu/start-undo-transaction undo-id))
+                 (->> (rx/of pdata)
+                      (rx/mapcat (partial upload-images (:current-file-id state)))
+                      (rx/map
+                       #(dwsh/update-shapes
+                         selected
+                         (fn [shape objects] (cts/patch-props shape (:props pdata) objects))
+                         {:with-objects? true})))
+                 (rx/of (ptk/data-event :layout/update {:ids selected}))
+                 (if resize-texts?
+                   (rx/of (dwwt/resize-wasm-text-all text-ids {:undo-id undo-id}))
+                   (rx/of (dwu/commit-undo-transaction undo-id)))))
               ;;
               (rx/empty))))))))
 
@@ -1156,16 +1175,16 @@
             page-id  (:current-page-id state)
             selected (first (dsh/lookup-selected state))
 
-            export {:file-id file-id
-                    :page-id page-id
-                    :object-id selected
-                    ;; webp would be preferrable, but PNG is the most supported image MIME type by clipboard APIs.
-                    :type :png
-                    ;; Always use 2 to ensure good enough quality for wireframes.
-                    :scale 2
-                    :suffix ""
-                    :enabled true
-                    :name ""}
+            export (de/normalize-export {:file-id file-id
+                                         :page-id page-id
+                                         :object-id selected
+                                         ;; webp would be preferrable, but PNG is the most supported image MIME type by clipboard APIs.
+                                         :type :png
+                                         ;; Always use 2 to ensure good enough quality for wireframes.
+                                         :scale 2
+                                         :suffix ""
+                                         :enabled true
+                                         :name ""})
 
             ;; Create a deferred promise immediately, before any async operations.
             ;; Registering the clipboard write NOW preserves the user-gesture security
@@ -1182,7 +1201,7 @@
 
          ;; Call exporter to get image URI, then fetch blob and resolve the deferred.
          (->> (if (and (features/active-feature? state "render-wasm/v1")
-                       (contains? cf/flags :wasm-export))
+                       (features/active-feature? state "wasm-export/v1"))
                 (rx/of {:uri (wasm.exports/export-image-uri export)})
                 (rp/cmd! :export
                          {:exports [export]
@@ -1198,7 +1217,7 @@
               (rx/mapcat (fn [blob]
                            ;; Resolve the deferred with the fetched blob; the browser
                            ;; will now complete the clipboard write it started earlier.
-                           (p/resolve! deferred blob)
+                           (p/resolve deferred blob)
                            (rx/from write-promise)))
               (rx/map (fn [_]
                         (ntf/success (tr "workspace.clipboard.image-copied"))))
@@ -1206,5 +1225,5 @@
                           (js/console.error "clipboard error:" e)
                           ;; Reject the deferred in case the error occurred before the
                           ;; blob was fetched, so the pending clipboard write is cancelled.
-                          (p/reject! deferred e)
+                          (p/reject deferred e)
                           (rx/of (ntf/error (tr "workspace.clipboard.image-copy-failed")))))))))))
diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs
index c145a203b7..a844bb5a40 100644
--- a/frontend/src/app/main/data/workspace/colors.cljs
+++ b/frontend/src/app/main/data/workspace/colors.cljs
@@ -9,6 +9,7 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.files.helpers :as cfh]
+   [app.common.math :as mth]
    [app.common.schema :as sm]
    [app.common.types.color :as clr]
    [app.common.types.fills :as types.fills]
@@ -332,6 +333,11 @@
   [:stroke-style
    :stroke-alignment
    :stroke-width
+   :stroke-per-side
+   :stroke-width-top
+   :stroke-width-right
+   :stroke-width-bottom
+   :stroke-width-left
    :stroke-cap-start
    :stroke-cap-end])
 
@@ -950,7 +956,8 @@
                       (or (not cap-stops?) (< (count stops) types.fills/MAX-GRADIENT-STOPS))]
 
                   (if can-add-stop?
-                    (let [new-stop (-> (clr/interpolate-gradient stops offset)
+                    (let [offset (mth/clamp offset 0 1)
+                          new-stop (-> (clr/interpolate-gradient stops offset)
                                        (split-color-components))
                           stops (conj stops new-stop)
                           stops (into [] (sort-by :offset stops))
@@ -973,7 +980,8 @@
                       stops (mapv split-color-components
                                   (if cap-stops?
                                     (take types.fills/MAX-GRADIENT-STOPS stops)
-                                    stops))]
+                                    stops))
+                      stops (mapv #(update % :offset (fn [o] (mth/clamp o 0 1))) stops)]
                   (-> state
                       (assoc :current-color (get stops stop))
                       (assoc :stops stops))))))))
diff --git a/frontend/src/app/main/data/workspace/drawing/common.cljs b/frontend/src/app/main/data/workspace/drawing/common.cljs
index 0356086dd7..10a0164c9c 100644
--- a/frontend/src/app/main/data/workspace/drawing/common.cljs
+++ b/frontend/src/app/main/data/workspace/drawing/common.cljs
@@ -7,8 +7,11 @@
 (ns app.main.data.workspace.drawing.common
   (:require
    [app.common.files.helpers :as cfh]
+   [app.common.geom.point :as gpt]
+   [app.common.geom.rect :as grc]
    [app.common.geom.shapes :as gsh]
    [app.common.types.modifiers :as ctm]
+   [app.common.types.path :as path]
    [app.common.types.shape :as cts]
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.shapes :as dwsh]
@@ -17,6 +20,31 @@
    [beicon.v2.core :as rx]
    [potok.v2.core :as ptk]))
 
+(defn- click-draw-box
+  [shape width height]
+  (-> shape
+      (assoc :width width)
+      (assoc :height height)
+      (assoc :selrect nil)
+      (assoc :points nil)
+      (cts/setup-shape)
+      (gsh/transform-shape (ctm/move-modifiers (- (/ width 2)) (- (/ height 2))))))
+
+(defn- click-draw-path
+  [shape]
+  (let [start-point (path/get-handler-point (:content shape) 0 nil)
+        center-x    (:x start-point)
+        center-y    (:y start-point)
+        start       (gpt/point (- center-x 50) center-y)
+        end         (gpt/point (+ center-x 50) center-y)
+        content     (path/points->content [start end])
+        selrect     (path/calc-selrect content)]
+    (-> shape
+        (assoc :content content)
+        (assoc :selrect selrect)
+        (assoc :points (grc/rect->points selrect))
+        (assoc :grow-type :fixed))))
+
 (defn clear-drawing
   ([] (clear-drawing nil))
   ([{:keys [preserve-tool?]}]
@@ -60,15 +88,11 @@
                    (not click-draw?)
                    (assoc :grow-type :fixed)
 
-                   (and ^boolean click-draw? (not ^boolean text?))
-                   (-> (assoc :width width)
-                       (assoc :height height)
-                       ;; NOTE: we need to recalculate the selrect and
-                       ;; points, so we assign `nil` to it
-                       (assoc :selrect nil)
-                       (assoc :points nil)
-                       (cts/setup-shape)
-                       (gsh/transform-shape (ctm/move-modifiers (- (/ width 2)) (- (/ height 2)))))
+                   (and ^boolean click-draw? (not ^boolean text?) (not= :path (:type shape)))
+                   (click-draw-box width height)
+
+                   (and ^boolean click-draw? (= :path (:type shape)))
+                   (click-draw-path)
 
                    (and click-draw? text?)
                    (-> (assoc :height 17 :width 4 :grow-type :auto-width)
diff --git a/frontend/src/app/main/data/workspace/drawing/line.cljs b/frontend/src/app/main/data/workspace/drawing/line.cljs
index c942a7543c..8b2995fb43 100644
--- a/frontend/src/app/main/data/workspace/drawing/line.cljs
+++ b/frontend/src/app/main/data/workspace/drawing/line.cljs
@@ -63,7 +63,8 @@
                    (-> object
                        (assoc :content content)
                        (assoc :selrect selrect)
-                       (assoc :points points')))))))
+                       (assoc :points points')
+                       (assoc :click-draw? false)))))))
 
 (defn- setup-frame
   []
@@ -101,9 +102,10 @@
       (update-in state [:workspace-drawing :object]
                  (fn [{:keys [content selrect] :as shape}]
                    (cond-> shape
-                     (or (empty? content)
-                         (nil? selrect)
-                         (<= (count content) 1))
+                     (and (not (:click-draw? shape))
+                          (or (empty? content)
+                              (nil? selrect)
+                              (<= (count content) 1)))
                      (assoc :initialized? false)))))))
 
 (defn- arrow-strokes
@@ -125,11 +127,13 @@
   (let [arrow? (= tool :arrow)]
     (ptk/reify ::handle-drawing
       ptk/WatchEvent
-      (watch [_ _ stream]
+      (watch [_ state stream]
         (let [stopper (mse/drag-stopper stream)
+              zoom    (dm/get-in state [:workspace-local :zoom] 1)
               start   @ms/mouse-position
               shape   (cts/setup-shape {:type :path
                                         :initialized? true
+                                        :click-draw? true
                                         :frame-id uuid/zero
                                         :parent-id uuid/zero
                                         :strokes (arrow-strokes arrow?)
@@ -139,6 +143,7 @@
            (rx/of #(update % :workspace-drawing assoc :object shape))
 
            (->> ms/mouse-position
+                (rx/filter #(> (* (gpt/distance % start) zoom) 10))
                 (rx/with-latest-from ms/mouse-position-shift)
                 (rx/map (fn [[point shift?]]
                           (if shift?
diff --git a/frontend/src/app/main/data/workspace/grid_layout/editor.cljs b/frontend/src/app/main/data/workspace/grid_layout/editor.cljs
index 07fb2c093b..8546b1178a 100644
--- a/frontend/src/app/main/data/workspace/grid_layout/editor.cljs
+++ b/frontend/src/app/main/data/workspace/grid_layout/editor.cljs
@@ -11,6 +11,7 @@
    [app.common.types.shape.layout :as ctl]
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.viewport-wasm :as dwvw]
+   [app.main.streams :as ms]
    [potok.v2.core :as ptk]))
 
 (defn hover-grid-cell
@@ -88,7 +89,11 @@
   (ptk/reify ::stop-grid-layout-editing
     ptk/UpdateEvent
     (update [_ state]
-      (update state :workspace-grid-edition dissoc grid-id))))
+      (update state :workspace-grid-edition dissoc grid-id))
+
+    ptk/EffectEvent
+    (effect [_ _ _]
+      (ms/clear-transform-preview!))))
 
 (defn locate-board
   [grid-id]
diff --git a/frontend/src/app/main/data/workspace/grid_layout/shortcuts.cljs b/frontend/src/app/main/data/workspace/grid_layout/shortcuts.cljs
index a6c468bc8a..326ffe93c3 100644
--- a/frontend/src/app/main/data/workspace/grid_layout/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/grid_layout/shortcuts.cljs
@@ -34,36 +34,44 @@
 (def shortcuts
   {:escape          {:tooltip (ds/esc)
                      :command ["escape" "enter" "v"]
+                     :section [:workspace]
                      :fn #(st/emit! (esc-pressed))}
 
    :undo            {:tooltip (ds/meta "Z")
                      :command (ds/c-mod "z")
+                     :section [:workspace]
                      :fn #(st/emit! dwu/undo)}
 
    :redo            {:tooltip (ds/meta "Y")
                      :command [(ds/c-mod "shift+z") (ds/c-mod "y")]
+                     :section [:workspace]
                      :fn #(st/emit! dwu/redo)}
 
    ;; ZOOM
 
    :increase-zoom   {:tooltip "+"
                      :command "+"
+                     :section [:workspace]
                      :fn #(st/emit! (dw/increase-zoom nil))}
 
    :decrease-zoom   {:tooltip "-"
                      :command "-"
+                     :section [:workspace]
                      :fn #(st/emit! (dw/decrease-zoom nil))}
 
    :reset-zoom      {:tooltip (ds/shift "0")
                      :command "shift+0"
+                     :section [:workspace]
                      :fn #(st/emit! dw/reset-zoom)}
 
    :fit-all         {:tooltip (ds/shift "1")
                      :command "shift+1"
+                     :section [:workspace]
                      :fn #(st/emit! dw/zoom-to-fit-all)}
 
    :zoom-selected   {:tooltip (ds/shift "2")
                      :command "shift+2"
+                     :section [:workspace]
                      :fn #(st/emit! dw/zoom-to-selected-shape)}})
 
 (defn get-tooltip [shortcut]
diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 08f812e45e..d39d839ad7 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -1573,7 +1573,12 @@
                                (as-> libraries-to-load $
                                  (remove loaded-libraries $)
                                  (conj $ library-id)
-                                 (map #(load-library-file file-id %) $))))))
+                                 (map #(load-library-file file-id %) $))))
+               (rx/catch (fn [cause]
+                           (let [error (ex-data cause)]
+                             (if (= (:code error) :circular-library-reference)
+                               (rx/of (ntf/error (tr "errors.circular-library-reference")))
+                               (rx/throw cause)))))))
          (rx/of (ptk/reify ::attach-library-finished))
          (when (pos? variants-count)
            (->> (rp/cmd! :get-library-usage {:file-id library-id})
diff --git a/frontend/src/app/main/data/workspace/modifiers.cljs b/frontend/src/app/main/data/workspace/modifiers.cljs
index 91268a8550..cb8be131cd 100644
--- a/frontend/src/app/main/data/workspace/modifiers.cljs
+++ b/frontend/src/app/main/data/workspace/modifiers.cljs
@@ -683,7 +683,7 @@
         ty (.-f first-matrix)]
     (if-let [base @cache]
       (translate-selrect base tx ty)
-      (let [computed (wasm.api/get-selection-rect ids)]
+      (when-let [computed (wasm.api/get-selection-rect ids)]
         (vreset! cache (translate-selrect computed (- tx) (- ty)))
         computed))))
 
@@ -729,15 +729,27 @@
             (vreset! wasm-structure-modifiers-active? true)))
         (let [geometry-entries (parse-geometry-modifiers modif-tree)
               root-modifiers   (into [] (map (fn [[id data]] [id (:transform data)])) geometry-entries)
+              wasm-ready?      (wasm.api/initialized?)
+              ;; While the GL context is down (lost / mid-reload), keep the
+              ;; root transforms so SVG selection/preview can still move.
+              ;; `propagate-modifiers` returns [] when not ready, do not
+              ;; treat that as "no modifiers".
               modifiers
-              (if (and translation? (not snap-pixel?))
+              (cond
+                (or (not wasm-ready?)
+                    (and translation? (not snap-pixel?)))
                 root-modifiers
-                (wasm.api/propagate-modifiers geometry-entries snap-pixel?))]
-          (wasm.api/set-modifiers modifiers)
+
+                :else
+                (let [propagated (wasm.api/propagate-modifiers geometry-entries snap-pixel?)]
+                  (if (seq propagated) propagated root-modifiers)))]
+          (when wasm-ready?
+            (wasm.api/set-modifiers modifiers))
           (let [ids     (into [] xf:map-key geometry-entries)
-                selrect (if (and translation? (not snap-pixel?) selection-rect-cache (seq modifiers))
-                          (cached-translation-selrect ids (second (first modifiers)) selection-rect-cache)
-                          (wasm.api/get-selection-rect ids))]
+                selrect (when wasm-ready?
+                          (if (and translation? (not snap-pixel?) selection-rect-cache (seq modifiers))
+                            (cached-translation-selrect ids (second (first modifiers)) selection-rect-cache)
+                            (wasm.api/get-selection-rect ids)))]
             (rx/of (set-temporary-selrect selrect)
                    (set-temporary-modifiers modifiers))))))))
 
@@ -770,7 +782,7 @@
                         subtree-ids-by-id]
                  :or {ignore-constraints false ignore-snap-pixel false snap-ignore-axis nil undo-transation? true}
                  :as params}]
-  (ptk/reify ::apply-wasm-modifiesr
+  (ptk/reify ::apply-wasm-modifiers
     ptk/WatchEvent
     (watch [_ state _]
       (let [translation?
@@ -795,7 +807,8 @@
               (and (not ignore-snap-pixel) (contains? (:workspace-layout state) :snap-pixel-grid))
 
               transforms
-              (if (and translation? (not snap-pixel?))
+              (cond
+                (and translation? (not snap-pixel?))
                 ;; Mirror WASM `propagate_modifiers` in CLJS: splat the
                 ;; translation matrix onto every descendant. Without
                 ;; this step the commit would only touch the dragged
@@ -815,6 +828,26 @@
                      (reduce (fn [a sid] (assoc a sid t)) acc subtree-ids)))
                  {}
                  geometry-entries)
+
+                ;; Context lost / mid-reload: do not call into WASM. Use
+                ;; root transforms (and splat translation onto descendants
+                ;; when we can) so the commit still lands in file data.
+                (not (wasm.api/initialized?))
+                (if translation?
+                  (reduce
+                   (fn [acc [id data]]
+                     (let [t (:transform data)
+                           subtree-ids
+                           (or (get subtree-ids-by-id id)
+                               (cfh/get-children-ids-with-self objects id))]
+                       (reduce (fn [a sid] (assoc a sid t)) acc subtree-ids)))
+                   {}
+                   geometry-entries)
+                  (into {}
+                        (map (fn [[id data]] [id (:transform data)]))
+                        geometry-entries))
+
+                :else
                 (into {} (wasm.api/propagate-modifiers geometry-entries snap-pixel?)))
 
               ignore-tree
diff --git a/frontend/src/app/main/data/workspace/notifications.cljs b/frontend/src/app/main/data/workspace/notifications.cljs
index c9b054d881..d2b41889d8 100644
--- a/frontend/src/app/main/data/workspace/notifications.cljs
+++ b/frontend/src/app/main/data/workspace/notifications.cljs
@@ -125,18 +125,20 @@
 (defn- process-message
   [{:keys [type] :as msg}]
   (case type
-    :join-file              (handle-presence msg)
-    :leave-file             (handle-presence msg)
-    :presence               (handle-presence msg)
-    :disconnect             (handle-presence msg)
-    :pointer-update         (handle-pointer-update msg)
-    :file-change            (handle-file-change msg)
-    :file-deleted           (handle-file-deleted msg)
-    :file-restored          (handle-file-restored msg)
-    :library-change         (handle-library-change msg)
-    :notification           (dc/handle-notification msg)
-    :team-role-change       (handle-change-team-role msg)
-    :team-membership-change (dc/team-membership-change msg)
+    :join-file               (handle-presence msg)
+    :leave-file              (handle-presence msg)
+    :presence                (handle-presence msg)
+    :disconnect              (handle-presence msg)
+    :pointer-update          (handle-pointer-update msg)
+    :file-change             (handle-file-change msg)
+    :file-deleted            (handle-file-deleted msg)
+    :file-restored           (handle-file-restored msg)
+    :library-change          (handle-library-change msg)
+    :notification            (dc/handle-notification msg)
+    :team-role-change        (handle-change-team-role msg)
+    :team-membership-change  (dc/team-membership-change msg)
+    :team-organization-change         (dc/handle-change-team-organization msg)
+    :organization-change-sso (dc/handle-organization-change-sso msg)
     nil))
 
 (defn- handle-pointer-send
diff --git a/frontend/src/app/main/data/workspace/pages.cljs b/frontend/src/app/main/data/workspace/pages.cljs
index 0bfa559469..260ebef9e1 100644
--- a/frontend/src/app/main/data/workspace/pages.cljs
+++ b/frontend/src/app/main/data/workspace/pages.cljs
@@ -489,7 +489,7 @@
                              (pcb/del-page page))))
                      (-> (pcb/empty-changes it)
                          (pcb/with-library-data fdata))
-                     del-ids)]
+                     (reverse del-ids))]
 
         (if (empty? del-ids)
           (rx/empty)
diff --git a/frontend/src/app/main/data/workspace/path/shortcuts.cljs b/frontend/src/app/main/data/workspace/path/shortcuts.cljs
index 24444d711d..fe35b33e40 100644
--- a/frontend/src/app/main/data/workspace/path/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/path/shortcuts.cljs
@@ -30,120 +30,146 @@
   {:move-nodes      {:tooltip "M"
                      :command "m"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/change-edit-mode :move))}
 
    :draw-nodes      {:tooltip "P"
                      :command "p"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/change-edit-mode :draw))}
 
    :add-node        {:tooltip (ds/shift "+")
                      :command "shift++"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/add-node))}
 
    :delete-node     {:tooltip (ds/supr)
                      :command ["del" "backspace"]
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/remove-node))}
 
    :merge-nodes     {:tooltip (ds/meta "J")
                      :command (ds/c-mod "j")
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/merge-nodes))}
 
    :join-nodes      {:tooltip "J"
                      :command "j"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/join-nodes))}
 
    :separate-nodes  {:tooltip "K"
                      :command "k"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/separate-nodes))}
 
    :make-corner     {:tooltip "X"
                      :command "x"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/make-corner))}
 
    :make-curve      {:tooltip "C"
                      :command "c"
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/make-curve))}
 
    :snap-nodes      {:tooltip (ds/meta "'")
                      ;;https://github.com/ccampbell/mousetrap/issues/85
                      :command [(ds/c-mod "'") (ds/c-mod "219")]
                      :subsections [:path-editor]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/toggle-snap))}
 
    :escape          {:tooltip (ds/esc)
                      :command ["escape" "enter" "v"]
+                     :section [:workspace]
                      :fn #(st/emit! (esc-pressed))}
 
    :undo            {:tooltip (ds/meta "Z")
                      :command (ds/c-mod "z")
+                     :section [:workspace]
                      :fn #(st/emit! (drp/undo-path))}
 
    :redo            {:tooltip (ds/meta "Y")
                      :command [(ds/c-mod "shift+z") (ds/c-mod "y")]
+                     :section [:workspace]
                      :fn #(st/emit! (drp/redo-path))}
 
    ;; ZOOM
 
    :increase-zoom   {:tooltip "+"
                      :command "+"
+                     :section [:workspace]
                      :fn #(st/emit! (dw/increase-zoom nil))}
 
    :decrease-zoom   {:tooltip "-"
                      :command "-"
+                     :section [:workspace]
                      :fn #(st/emit! (dw/decrease-zoom nil))}
 
    :reset-zoom      {:tooltip (ds/shift "0")
                      :command "shift+0"
+                     :section [:workspace]
                      :fn #(st/emit! dw/reset-zoom)}
 
    :fit-all         {:tooltip (ds/shift "1")
                      :command "shift+1"
+                     :section [:workspace]
                      :fn #(st/emit! dw/zoom-to-fit-all)}
 
    :zoom-selected   {:tooltip (ds/shift "2")
                      :command "shift+2"
+                     :section [:workspace]
                      :fn #(st/emit! dw/zoom-to-selected-shape)}
 
    ;; Arrow movement
 
    :move-fast-up    {:tooltip (ds/shift ds/up-arrow)
                      :command "shift+up"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :up true))}
 
    :move-fast-down  {:tooltip (ds/shift ds/down-arrow)
                      :command "shift+down"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :down true))}
 
    :move-fast-right {:tooltip (ds/shift ds/right-arrow)
                      :command "shift+right"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :right true))}
 
    :move-fast-left  {:tooltip (ds/shift ds/left-arrow)
                      :command "shift+left"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :left true))}
 
    :move-unit-up    {:tooltip ds/up-arrow
                      :command "up"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :up false))}
 
    :move-unit-down  {:tooltip ds/down-arrow
                      :command "down"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :down false))}
 
    :move-unit-left  {:tooltip ds/right-arrow
                      :command "right"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :right false))}
 
    :move-unit-right {:tooltip ds/left-arrow
                      :command "left"
+                     :section [:workspace]
                      :fn #(st/emit! (drp/move-selected :left false))}})
 
 (defn get-tooltip [shortcut]
diff --git a/frontend/src/app/main/data/workspace/reflow.cljs b/frontend/src/app/main/data/workspace/reflow.cljs
new file mode 100644
index 0000000000..3932aa7ca7
--- /dev/null
+++ b/frontend/src/app/main/data/workspace/reflow.cljs
@@ -0,0 +1,194 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.data.workspace.reflow
+  "Tracks the shape ids that have layout/reflow work in flight, broken down by
+  the kind of work so we can tell which type of reflow is blocking each shape.
+
+  Pending work is stored as `{shape-id -> {kind -> #{task-id}}}`. Every producer
+  opens an exact task with `start!` and closes that same task with `finish!`.
+  Tasks belong to a workspace generation, so a delayed completion from a
+  finalized workspace cannot drain work opened after the workspace reloads.
+
+  Observable producers should use `with-pending`; imperative renderer work
+  should use `run-pending!`. Direct task lifecycle calls are reserved for Potok
+  pipelines whose operation has to cross event or batching boundaries.
+
+  Kinds correspond to the pipelines that schedule the work:
+    :layout        flex/grid layout reflow      (shape-layout)
+    :text-resize   text geometry resize         (wasm-text, texts)
+    :text-measure  DOM text measurement         (texts)
+    :text-bridge   change awaiting its pipeline (texts)
+    :font          font change measurement      (texts)"
+  (:require
+   [beicon.v2.core :as rx]
+   [promesa.core :as p]))
+
+;; Feeder subject receiving task lifecycle messages, scanned into the
+;; `pending-shapes` map.
+(defonce ^:private reflow-input (rx/subject))
+
+(defonce ^:private workspace-generation (atom 0))
+(defonce ^:private next-task-id (atom 0))
+
+(defn- add-task
+  [acc {:keys [id kind ids]}]
+  (reduce (fn [m shape-id]
+            (update-in m [shape-id kind] (fnil conj #{}) id))
+          acc
+          ids))
+
+(defn- remove-task
+  [acc {:keys [id kind ids]}]
+  (let [task-id id]
+    (reduce (fn [m shape-id]
+              (let [tasks (disj (get-in m [shape-id kind] #{}) task-id)
+                    kinds (if (seq tasks)
+                            (assoc (get m shape-id) kind tasks)
+                            (dissoc (get m shape-id) kind))]
+                (if (seq kinds)
+                  (assoc m shape-id kinds)
+                  (dissoc m shape-id))))
+            acc
+            ids)))
+
+(defn- reducer
+  [acc {:keys [op task ids]}]
+  (case op
+    :add    (add-task acc task)
+    :remove (remove-task acc task)
+    :cancel (apply dissoc acc ids)
+    :reset  {}
+    acc))
+
+;; Behaviour subject holding `{shape-id -> {kind -> #{task-id}}}`.
+;; It replays its current value synchronously to new subscribers, which gives
+;; `wait-for-layout-update` a free fast-path when there is nothing pending.
+(defonce ^:private pending-shapes
+  (let [sub (rx/behavior-subject {})]
+    (rx/sub! (->> reflow-input (rx/scan reducer {})) sub)
+    sub))
+
+(defn task
+  "Creates an opaque task token without opening it."
+  [kind ids]
+  {:id (swap! next-task-id inc)
+   :generation @workspace-generation
+   :kind kind
+   :ids (into #{} ids)})
+
+(defn start!
+  "Opens and returns a task. The one-argument form opens a token created with
+  `task`; the two-argument form creates and opens it in one step."
+  ([task]
+   (when (and (seq (:ids task))
+              (= (:generation task) @workspace-generation))
+     (rx/push! reflow-input {:op :add :task task}))
+   task)
+  ([kind ids]
+   (start! (task kind ids))))
+
+(defn finish!
+  "Closes `task` if it belongs to the active workspace generation. Repeated or
+  stale completion is a no-op."
+  [{:keys [generation ids] :as task}]
+  (when (and (seq ids)
+             (= generation @workspace-generation))
+    (rx/push! reflow-input {:op :remove :task task})))
+
+(defn reset-pending!
+  "Starts a new workspace generation and forgets every task from the old one."
+  []
+  (swap! workspace-generation inc)
+  (rx/push! reflow-input {:op :reset}))
+
+(defn cancel-shapes!
+  "Forgets pending work attached to shapes that no longer exist."
+  [ids]
+  (when (seq ids)
+    (rx/push! reflow-input {:op :cancel :ids ids})))
+
+(defn with-pending
+  "Runs observable `ob` as tracked layout work. Prefer this entry point for
+  observable producers: it owns task activation and finalization, including
+  errors and unsubscription. An `ob` that is built but never subscribed marks
+  nothing."
+  [kind ids ob]
+  (->> (rx/of ::subscribe)
+       (rx/mapcat (fn [_]
+                    (let [task (start! kind ids)]
+                      (rx/finalize #(finish! task) ob))))))
+
+(defn run-pending!
+  "Runs zero-argument promise operation `f` as tracked layout work. The task is
+  opened before `f` runs and is finalized when its returned promise settles.
+  Synchronous failures also finalize the task before being rethrown.
+
+  Prefer this entry point for imperative or renderer-driven producers."
+  [kind ids f]
+  (let [task (start! kind ids)]
+    (try
+      (p/finally (f) #(finish! task))
+      (catch :default cause
+        (finish! task)
+        (throw cause)))))
+
+(defn pending-signal
+  "Emits once any of `kinds` is pending for any of `ids`, then completes.
+  Emits right away when that work is already in flight."
+  [ids kinds]
+  (letfn [(id-pending? [pending id]
+            (some (partial contains? (get pending id)) kinds))
+
+          (any-pending? [pending]
+            (some (partial id-pending? pending) ids))]
+    (->> pending-shapes
+         (rx/filter any-pending?)
+         (rx/take 1))))
+
+;; Ceiling for callers that pass no timeout, so a pipeline that never drains
+;; its marks rejects the promise rather than leaving it unsettled.
+(def ^:private default-timeout 30000)
+
+(defn wait-for-layout-update
+  "Returns a JS Promise that resolves when every id in `shape-ids` has drained
+  from the pending map. A nil `shape-ids` waits for every pending shape; an
+  empty one has nothing to wait for and resolves right away. The promise is
+  rejected when `timeout` (ms) elapses first; a nil `timeout` uses
+  `default-timeout`.
+
+  Callers waiting on one shape pass its whole subtree: reflow work lands either
+  on the shape (a board laying out its children) or on its descendants (a group
+  whose texts are re-measured)."
+  ([timeout]
+   (wait-for-layout-update nil timeout))
+  ([shape-ids timeout]
+   (js/Promise.
+    (fn [resolve reject]
+      (let [timeout (or timeout default-timeout)
+
+            done?   (if (some? shape-ids)
+                      (fn [pending] (not-any? #(contains? pending %) shape-ids))
+                      empty?)
+
+            settled (->> pending-shapes
+                         (rx/filter done?)
+                         (rx/map (constantly :ok)))
+
+            ;; Race the settle signal against the deadline; the loser is
+            ;; unsubscribed. `settled` replays on subscribe, so an already
+            ;; drained map wins even against a 1ms deadline.
+            source  (rx/race (->> (rx/of :timeout)
+                                  (rx/delay timeout))
+                             settled)]
+        (->> source
+             (rx/take 1)
+             (rx/subs!
+              (fn [value]
+                (if (= value :timeout)
+                  (reject (js/Error. "waitForLayoutUpdate timeout"))
+                  (resolve)))
+              reject)))))))
diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index 4798517122..36039f230b 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -221,7 +221,7 @@
   (ptk/reify ::deselect-shape
     ptk/WatchEvent
     (watch [_ _ _]
-      (rx/of ::dwsp/interrupt))
+      (rx/of :interrupt ::dwsp/interrupt))
     ptk/UpdateEvent
     (update [_ state]
       (-> state
@@ -236,7 +236,7 @@
    (ptk/reify ::shift-select-shapes
      ptk/WatchEvent
      (watch [_ _ _]
-       (rx/of ::dwsp/interrupt))
+       (rx/of :interrupt ::dwsp/interrupt))
      ptk/UpdateEvent
      (update [_ state]
        (let [objects (or objects (dsh/lookup-page-objects state))
@@ -275,7 +275,11 @@
             ;; the event loop
             expand-s (->> (rx/of (dwc/expand-all-parents ids objects))
                           (rx/observe-on :async))
-            interrupt-s (rx/of ::dwsp/interrupt)]
+            ;; :interrupt aborts drag-stopper; only emit it when clearing edition
+            ;; (unconditional emit broke marquee selection after #10798).
+            interrupt-s (if (some? (dm/get-in state [:workspace-local :edition]))
+                          (rx/of :interrupt ::dwsp/interrupt)
+                          (rx/of ::dwsp/interrupt))]
         (rx/merge expand-s interrupt-s)))))
 
 (defn select-all
diff --git a/frontend/src/app/main/data/workspace/shape_layout.cljs b/frontend/src/app/main/data/workspace/shape_layout.cljs
index 0e84539988..fade07bd2d 100644
--- a/frontend/src/app/main/data/workspace/shape_layout.cljs
+++ b/frontend/src/app/main/data/workspace/shape_layout.cljs
@@ -26,6 +26,7 @@
    [app.main.data.workspace.colors :as cl]
    [app.main.data.workspace.grid-layout.editor :as dwge]
    [app.main.data.workspace.modifiers :as dwm]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.selection :as dwse]
    [app.main.data.workspace.shapes :as dwsh]
    [app.main.data.workspace.undo :as dwu]
@@ -98,26 +99,50 @@
 ;; Never call this directly but through the data-event `:layout/update`
 ;; Otherwise a lot of cycle dependencies could be generated
 (defn- update-layout-positions
-  [{:keys [page-id ids undo-group]}]
+  [{:keys [page-id ids undo-group reflow-tasks]}]
   (ptk/reify ::update-layout-positions
     ptk/WatchEvent
-    (watch [_ state _]
+    (watch [_ state stream]
       (let [page-id (or page-id (:current-page-id state))
             objects (dsh/lookup-page-objects state page-id)
-            ids (->> ids (remove uuid/zero?) (filter #(contains? objects %)))]
-        (if (d/not-empty? ids)
-          (let [modif-tree (dwm/create-modif-tree ids (ctm/reflow-modifiers))]
-            (if (features/active-feature? state "render-wasm/v1")
-              (rx/of (dwm/apply-wasm-modifiers modif-tree
+            ids (->> ids (remove uuid/zero?) (filter #(contains? objects %)))
+
+            update-positions-stream
+            (if (d/not-empty? ids)
+              (let [modif-tree (dwm/create-modif-tree ids (ctm/reflow-modifiers))]
+                (if (features/active-feature? state "render-wasm/v1")
+                  (rx/of (dwm/apply-wasm-modifiers modif-tree
+                                                   :stack-undo? true
+                                                   :undo-group undo-group
+                                                   :ignore-touched true))
+                  (rx/of (dwm/apply-modifiers {:page-id page-id
+                                               :modifiers modif-tree
                                                :stack-undo? true
-                                               :undo-group undo-group
-                                               :ignore-touched true))
-              (rx/of (dwm/apply-modifiers {:page-id page-id
-                                           :modifiers modif-tree
-                                           :stack-undo? true
-                                           :ignore-touched true
-                                           :undo-group undo-group}))))
-          (rx/empty))))))
+                                               :ignore-touched true
+                                               :undo-group undo-group}))))
+              (rx/empty))
+
+            ;; The apply events above are dispatched and applied synchronously,
+            ;; except while a shape-update buffer is open (token propagation),
+            ;; where the commit lands on `update-shapes-buffer-commit`.
+            drain-stream
+            (if (and (::dwsh/update-shapes-buffer state)
+                     (d/not-empty? ids))
+              (->> stream
+                   (rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
+                   (rx/take 1)
+                   (rx/take-until (rx/filter (ptk/type? :app.main.data.workspace/finalize) stream))
+                   ;; No events are derived from this
+                   (rx/ignore))
+              (rx/empty))]
+
+        (cond->> (rx/concat update-positions-stream drain-stream)
+          (d/not-empty? reflow-tasks)
+          (rx/finalize #(run! wrf/finish! reflow-tasks)))))))
+
+(defn- without-root-board
+  [ids]
+  (into [] (remove uuid/zero?) ids))
 
 (defn initialize-shape-layout
   []
@@ -126,21 +151,27 @@
     (watch [_ _ stream]
       (let [stopper (rx/filter (ptk/type? ::finalize-shape-layout) stream)]
         (->> stream
-             ;; FIXME: we don't need use types for simple signaling,
-             ;; we can just use a keyword for it
              (rx/filter (ptk/type? :layout/update))
-             (rx/map deref)
-             ;; We buffer the updates to the layout so if there are many changes at the same time
-             ;; they are process together. It will get a better performance.
+             ;; Keeps each update's page and the shapes that can be laid out;
+             ;; the root lays out nothing, so an update with only it is dropped.
+             (rx/map (fn [event]
+                       (-> (deref event)
+                           (update :ids without-root-board))))
+             (rx/filter #(d/not-empty? (:ids %)))
+             (rx/map #(assoc % ::reflow-task (wrf/start! :layout (:ids %))))
              (rx/buffer-time 100)
              (rx/filter #(d/not-empty? %))
              (rx/mapcat
-              (fn [data]
-                (->> (group-by :page-id data)
-                     (map (fn [[page-id items]]
-                            (let [ids (reduce #(into %1 (:ids %2)) #{} items)]
-                              (update-layout-positions {:page-id page-id :ids ids})))))))
-             (rx/take-until stopper))))))
+              (fn [updates]
+                (->> (group-by :page-id updates)
+                     (map (fn [[page-id updates]]
+                            (let [ids (into #{} (mapcat :ids) updates)]
+                              (update-layout-positions {:page-id page-id
+                                                        :ids ids
+                                                        :reflow-tasks (mapv ::reflow-task updates)})))))))
+             (rx/take-until stopper)
+             ;; On workspace teardown clear everything still pending.
+             (rx/finalize wrf/reset-pending!))))))
 
 (defn finalize-shape-layout
   []
diff --git a/frontend/src/app/main/data/workspace/shapes.cljs b/frontend/src/app/main/data/workspace/shapes.cljs
index ac3ccae82b..0b3cfb3f94 100644
--- a/frontend/src/app/main/data/workspace/shapes.cljs
+++ b/frontend/src/app/main/data/workspace/shapes.cljs
@@ -23,8 +23,10 @@
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.collapse :as dwco]
    [app.main.data.workspace.edition :as dwe]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.selection :as dws]
    [app.main.data.workspace.undo :as dwu]
+   [app.main.features :as features]
    [beicon.v2.core :as rx]
    [potok.v2.core :as ptk]))
 
@@ -32,6 +34,24 @@
 ;; `(when-not translation? …)` guard in `update-shapes` below.
 (def ^:private update-layout-attr? #{:hidden})
 
+;; Text attrs whose change makes the DOM text pipeline re-measure the shape.
+(def ^:private text-reflow-attr? #{:content :grow-type})
+
+(defn- reflow-attr?
+  [attr]
+  (or (update-layout-attr? attr) (text-reflow-attr? attr)))
+
+(defn- async-text-reflow?
+  "Whether `shape` enters an asynchronous text geometry pipeline. The HTML
+  renderer measures every changed text; WASM only resizes auto-sized texts.
+  A grow-type transition is included because `shape` is the value before the
+  update and may still be fixed."
+  [state shape changed]
+  (and (cfh/text-shape? shape)
+       (or (not (features/active-feature? state "render-wasm/v1"))
+           (not= :fixed (:grow-type shape))
+           (contains? changed :grow-type))))
+
 (defn- add-undo-group
   [changes state]
   (let [undo            (:workspace-undo state)
@@ -177,25 +197,48 @@
                objects   (dsh/lookup-page-objects state page-id)
                ids       (into [] (filter some?) ids)
 
-               xf-update-layout
+               ;; Pairs of [shape changed-attrs] for the shapes whose change
+               ;; matters to a reflow, feeding both id sets below.
+               xf-reflow
                (comp
                 (map (d/getf objects))
-                (filter #(some update-layout-attr? (pcb/changed-attrs % objects update-fn {:attrs attrs :with-objects? with-objects?})))
-                (map :id))
+                (keep (fn [shape]
+                        (let [changed (pcb/changed-attrs shape objects update-fn
+                                                         {:attrs attrs :with-objects? with-objects?})]
+                          (when (some reflow-attr? changed)
+                            [shape changed])))))
 
                ;; `changed-attrs` runs `update-fn` in full for every shape, which
                ;; can be expensive (e.g. `update-bool-shape` recalculates the whole
                ;; boolean path in WASM). Skip the pass entirely when we can prove it
                ;; cannot match: when the caller declares `attrs`, `changed-attrs`
-               ;; filters its result to that set, so if no layout attr is present
+               ;; filters its result to that set, so if no reflow attr is present
                ;; the check is always empty.
-               update-layout-ids
+               reflow-changes
                (when-not (or translation?
                              (not update-layout?)
                              (and (some? attrs)
-                                  (not (some update-layout-attr? attrs))))
-                 (->> (into [] xf-update-layout ids)
-                      (not-empty)))
+                                  (not (some reflow-attr? attrs))))
+                 (into [] xf-reflow ids))
+
+               update-layout-ids
+               (->> reflow-changes
+                    (into [] (comp (filter (fn [[_ changed]] (some update-layout-attr? changed)))
+                                   (map (comp :id first))))
+                    (not-empty))
+
+               ;; Text shapes the DOM pipeline has to re-measure, narrowed to what
+               ;; it actually measures: the active page, never the edited shape.
+               text-reflow-ids
+               (when (= page-id (get state :current-page-id))
+                 (let [edition (dm/get-in state [:workspace-local :edition])]
+                   (->> reflow-changes
+                        (into [] (comp (filter (fn [[shape changed]]
+                                                 (and (async-text-reflow? state shape changed)
+                                                      (some text-reflow-attr? changed))))
+                                       (map (comp :id first))
+                                       (remove #(= % edition))))
+                        (not-empty))))
 
                changes
                (-> (pcb/empty-changes it page-id)
@@ -218,6 +261,13 @@
                (add-undo-group changes state)]
 
            (rx/concat
+            ;; Announces the texts still to be re-measured, so a reflow wait
+            ;; covers the render that measures them. Goes before the commit,
+            ;; which is what triggers that render.
+            (if text-reflow-ids
+              (rx/of (ptk/data-event :text/reflow {:ids text-reflow-ids :page-id page-id}))
+              (rx/empty))
+
             (if (seq (:redo-changes changes))
               (let [changes (cond-> changes reg-objects? (pcb/resize-parents ids))]
                 (rx/of (dch/commit-changes changes)))
@@ -269,6 +319,10 @@
 
          (rx/concat
           (rx/of (dwu/start-undo-transaction undo-id)
+                 ;; A new text has no geometry until the pipeline measures it,
+                 ;; so it raises the same signal an edit does.
+                 (when (async-text-reflow? state shape nil)
+                   (ptk/data-event :text/reflow {:ids [(:id shape)] :page-id page-id}))
                  (dch/commit-changes changes)
                  (when-not no-update-layout?
                    (ptk/data-event :layout/update {:ids [(:parent-id shape)]}))
@@ -327,6 +381,7 @@
              fdata         (dsh/lookup-file-data state file-id)
              page          (dsh/get-page fdata page-id)
              objects       (:objects page)
+             deleted-ids   (into #{} (mapcat #(cfh/get-children-ids-with-self objects %)) ids)
 
              undo-id (or (:undo-id options) (js/Symbol))
              [all-parents changes]
@@ -336,6 +391,7 @@
                                               :undo-group (:undo-group options)
                                               :undo-id undo-id}))]
 
+         (wrf/cancel-shapes! deleted-ids)
          (rx/of (dwu/start-undo-transaction undo-id)
                 (dc/detach-comment-thread ids)
                 (dch/commit-changes changes)
diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs
index 1db91e3eaa..192258f0d7 100644
--- a/frontend/src/app/main/data/workspace/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/shortcuts.cljs
@@ -69,32 +69,38 @@
   {;; EDIT
    :undo                 {:tooltip (ds/meta "Z")
                           :command (ds/c-mod "z")
+                          :section [:workspace]
                           :subsections [:edit]
                           :fn #(emit-when-no-readonly dwu/undo)}
 
    :redo                 {:tooltip (ds/meta "Y")
                           :command [(ds/c-mod "shift+z") (ds/c-mod "y")]
+                          :section [:workspace]
                           :subsections [:edit]
                           :fn #(emit-when-no-readonly dwu/redo)}
 
    :clear-undo           {:tooltip (ds/alt "Q")
                           :command "alt+q"
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly dwu/reinitialize-undo)}
 
    :copy                 {:tooltip (ds/meta "C")
                           :command (ds/c-mod "c")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/copy-selected))}
 
    :copy-link            {:tooltip (ds/shift (ds/alt "C"))
                           :command "shift+alt+c"
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/copy-link-to-clipboard))}
 
    :cut                  {:tooltip (ds/meta "X")
                           :command (ds/c-mod "x")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly
                                 (dw/copy-selected)
                                 (dw/delete-selected))}
@@ -103,58 +109,65 @@
                           :disabled true
                           :command (ds/c-mod "v")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn (constantly nil)}
 
    :paste-replace        {:tooltip (ds/meta (ds/shift "V"))
                           :command (ds/c-mod "shift+v")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/paste-from-clipboard {:replace? true}))}
 
    :copy-props           {:tooltip (ds/meta (ds/alt "c"))
                           :command (ds/c-mod "alt+c")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/copy-selected-props))}
 
    :paste-props          {:tooltip (ds/meta (ds/alt "v"))
                           :command (ds/c-mod "alt+v")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/paste-selected-props))}
 
    :delete               {:tooltip (ds/supr)
                           :command ["del" "backspace"]
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/delete-selected))}
 
    :duplicate            {:tooltip (ds/meta "D")
                           :command (ds/c-mod "d")
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwv/duplicate-or-add-variant))}
 
    :start-editing        {:tooltip (ds/enter)
                           :command "enter"
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/start-editing-selected))}
 
-   :start-measure        {:tooltip (ds/alt "")
-                          :command ["alt" "."]
-                          :type "keydown"
-                          :subsections [:edit]
-                          :fn #(emit-when-no-readonly (dw/toggle-distances-display true))}
-
-   :stop-measure         {:tooltip (ds/alt "")
-                          :command ["alt" "."]
-                          :type "keyup"
-                          :subsections [:edit]
-                          :fn #(emit-when-no-readonly (dw/toggle-distances-display false))}
+   :show-measure        {:tooltip (ds/alt "")
+                         :command ["alt" "."]
+                         :type ["keydown" "keyup"]
+                         :subsections [:tools]
+                         :section [:workspace]
+                         :fn #(emit-when-no-readonly
+                               (let [type (.-type %)]
+                                 (dw/toggle-distances-display (if (= type "keydown") true false))))}
 
    :escape               {:tooltip (ds/esc)
                           :command "escape"
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(st/emit! :interrupt (dwdc/clear-drawing) (dw/deselect-all true))}
 
    :find             {:tooltip (ds/meta "F") :command (ds/c-mod "f") :subsections [:edit]
+                      :section [:workspace]
                       :fn #(st/emit! (dw/open-layers-search :find))}
    :find-and-replace {:tooltip (ds/meta "H") :command (ds/c-mod "h") :subsections [:edit]
+                      :section [:workspace]
                       :fn #(st/emit! (dw/open-layers-search :find-and-replace))}
 
    ;; MODIFY LAYERS
@@ -162,114 +175,137 @@
    :rename               {:tooltip (ds/alt "N")
                           :command "alt+n"
                           :subsections [:edit]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/start-rename-selected))}
 
    :group                {:tooltip (ds/meta "G")
                           :command (ds/c-mod "g")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/group-selected))}
 
    :ungroup              {:tooltip (ds/shift "G")
                           :command "shift+g"
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/ungroup-selected))}
 
    :mask                 {:tooltip (ds/meta "M")
                           :command (ds/c-mod "m")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/mask-group))}
 
    :unmask               {:tooltip (ds/meta-shift "M")
                           :command (ds/c-mod "shift+m")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/unmask-group))}
 
    :create-component-variant {:tooltip (ds/meta "K")
                               :command (ds/c-mod "k")
                               :subsections [:modify-layers]
+                              :section [:workspace]
                               :fn #(emit-when-no-readonly (dwv/add-component-or-variant))}
 
    :detach-component     {:tooltip (ds/meta-shift "K")
                           :command (ds/c-mod "shift+k")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly dwl/detach-selected-components)}
 
    :flip-vertical        {:tooltip (ds/shift "V")
                           :command "shift+v"
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/flip-vertical-selected))}
 
    :flip-horizontal      {:tooltip (ds/shift "H")
                           :command "shift+h"
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/flip-horizontal-selected))}
    :bring-forward        {:tooltip (ds/meta ds/up-arrow)
                           :command (ds/c-mod "up")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/vertical-order-selected :up))}
 
    :bring-backward       {:tooltip (ds/meta ds/down-arrow)
                           :command (ds/c-mod "down")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/vertical-order-selected :down))}
 
    :bring-front          {:tooltip (ds/meta-shift ds/up-arrow)
                           :command (ds/c-mod "shift+up")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/vertical-order-selected :top))}
 
    :bring-back           {:tooltip (ds/meta-shift ds/down-arrow)
                           :command (ds/c-mod "shift+down")
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/vertical-order-selected :bottom))}
 
    :move-fast-up         {:tooltip (ds/shift ds/up-arrow)
                           :command ["shift+up" "shift+alt+up"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :up true))}
 
    :move-fast-down       {:tooltip (ds/shift ds/down-arrow)
                           :command ["shift+down" "shift+alt+down"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :down true))}
 
    :move-fast-right      {:tooltip (ds/shift ds/right-arrow)
                           :command ["shift+right" "shift+alt+right"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :right true))}
 
    :move-fast-left       {:tooltip (ds/shift ds/left-arrow)
                           :command ["shift+left" "shift+alt+left"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :left true))}
 
    :move-unit-up         {:tooltip ds/up-arrow
                           :command ["up" "alt+up"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :up false))}
 
    :move-unit-down       {:tooltip ds/down-arrow
                           :command ["down" "alt+down"]
+                          :section [:workspace]
                           :subsections [:modify-layers]
                           :fn #(emit-when-no-readonly (dwt/move-selected :down false))}
 
    :move-unit-left       {:tooltip ds/right-arrow
                           :command ["right" "alt+right"]
                           :subsections [:modify-layers]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwt/move-selected :right false))}
 
    :move-unit-right      {:tooltip ds/left-arrow
                           :command ["left" "alt+left"]
+                          :section [:workspace]
                           :subsections [:modify-layers]
                           :fn #(emit-when-no-readonly (dwt/move-selected :left false))}
 
    :artboard-selection   {:tooltip (ds/meta (ds/alt "G"))
                           :command (ds/c-mod "alt+g")
+                          :section [:workspace]
                           :subsections [:modify-layers]
                           :fn #(emit-when-no-readonly (dws/create-artboard-from-selection))}
 
    :toggle-layout-flex   {:tooltip (ds/shift "A")
                           :command "shift+a"
+                          :section [:workspace]
                           :subsections [:modify-layers]
                           :fn #(emit-when-no-readonly
                                 (with-meta (dwsl/toggle-layout :flex)
@@ -277,6 +313,7 @@
 
    :toggle-layout-grid   {:tooltip (ds/meta-shift "A")
                           :command (ds/c-mod "shift+a")
+                          :section [:workspace]
                           :subsections [:modify-layers]
                           :fn #(emit-when-no-readonly
                                 (with-meta (dwsl/toggle-layout :grid)
@@ -285,93 +322,111 @@
 
    :draw-frame           {:tooltip "B"
                           :command ["b" "a"]
+                          :section [:workspace :basics]
                           :subsections [:tools :basics]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :frame))}
 
    :move                 {:tooltip "V"
                           :command "v"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly :interrupt)}
 
    :draw-rect            {:tooltip "R"
                           :command "r"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :rect))}
 
    :draw-ellipse         {:tooltip "E"
                           :command "e"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :circle))}
 
    :draw-text            {:tooltip "T"
                           :command "t"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly dwtxt/start-edit-if-selected
                                                       (dwd/select-for-drawing :text))}
 
    :draw-path            {:tooltip "P"
                           :command "p"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :path))}
 
    :draw-line            {:tooltip "L"
                           :command "l"
                           :subsections [:tools]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :line))}
 
    :draw-arrow           {:tooltip (ds/shift "L")
                           :command "shift+l"
                           :subsections [:tools]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :arrow))}
 
    :draw-curve           {:tooltip (ds/shift "C")
                           :command "shift+c"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dwd/select-for-drawing :curve))}
 
    :add-comment          {:tooltip "C"
                           :command "c"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(st/emit! (dwd/select-for-drawing :comments))}
 
    :toggle-comments-visibility
    {:tooltip (ds/meta-shift "C")
     :command (ds/c-mod "shift+c")
+    :section [:workspace]
     :subsections [:main-menu]
     :fn #(st/emit! (dwcm/toggle-comments-visibility {:origin "workspace-shortcuts"}))}
 
    :insert-image         {:tooltip (ds/shift "K")
                           :command "shift+k"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(-> "image-upload" dom/get-element dom/click)}
 
    :toggle-visibility    {:tooltip (ds/meta-shift "H")
                           :command (ds/c-mod "shift+h")
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dw/toggle-visibility-selected))}
 
    :toggle-lock          {:tooltip (ds/meta-shift "L")
                           :command (ds/c-mod "shift+l")
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dw/toggle-lock-selected))}
 
    :toggle-lock-size     {:tooltip (ds/shift "L")
                           :command "shift+l"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (dw/toggle-proportion-lock))}
 
    :scale                {:tooltip "K"
                           :command "k"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (toggle-layout-flag :scale-text))}
 
    :open-color-picker    {:tooltip "I"
                           :command "i"
+                          :section [:workspace]
                           :subsections [:tools]
                           :fn #(emit-when-no-readonly (mdc/picker-for-selected-shape))}
 
    :toggle-focus-mode    {:command "f"
                           :tooltip "F"
+                          :section [:workspace :basics]
                           :subsections [:basics :tools]
                           :fn #(st/emit! (dw/toggle-focus-mode))}
 
@@ -379,41 +434,49 @@
 
    :align-left           {:tooltip (ds/alt "A")
                           :command "alt+a"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :hleft))}
 
    :align-right          {:tooltip (ds/alt "D")
                           :command "alt+d"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :hright))}
 
    :align-top            {:tooltip (ds/alt "W")
                           :command "alt+w"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :vtop))}
 
    :align-hcenter        {:tooltip (ds/alt "H")
                           :command "alt+h"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :hcenter))}
 
    :align-vcenter        {:tooltip (ds/alt "V")
                           :command "alt+v"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :vcenter))}
 
    :align-bottom         {:tooltip (ds/alt "S")
                           :command "alt+s"
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/align-objects :vbottom))}
 
    :h-distribute         {:tooltip (ds/meta-shift (ds/alt "H"))
                           :command (ds/c-mod "shift+alt+h")
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/distribute-objects :horizontal))}
 
    :v-distribute         {:tooltip (ds/meta-shift (ds/alt "V"))
                           :command (ds/c-mod "shift+alt+v")
+                          :section [:workspace]
                           :subsections [:alignment]
                           :fn #(emit-when-no-readonly (dw/distribute-objects :vertical))}
 
@@ -421,11 +484,13 @@
 
    :toggle-rulers        {:tooltip (ds/meta-shift "R")
                           :command (ds/c-mod "shift+r")
+                          :section [:workspace]
                           :subsections [:main-menu]
                           :fn #(st/emit! (toggle-layout-flag :rulers))}
 
    :select-all           {:tooltip (ds/meta "A")
                           :command (ds/c-mod "a")
+                          :section [:workspace]
                           :subsections [:main-menu]
                           :fn #(st/emit! (dw/select-all))}
 
@@ -434,37 +499,44 @@
                           :command [(ds/c-mod "'") (ds/c-mod "219")]
                           :show-command (ds/c-mod "'")
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (toggle-layout-flag :display-guides))}
 
    :toggle-alignment     {:tooltip (ds/meta "\\")
                           :command (ds/c-mod "\\")
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (toggle-layout-flag :dynamic-alignment))}
 
    :thumbnail-set        {:tooltip (ds/shift "T")
                           :command "shift+t"
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/toggle-file-thumbnail-selected))}
 
    :show-pixel-grid      {:tooltip (ds/shift ",")
                           :command "shift+,"
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (toggle-layout-flag :show-pixel-grid))}
 
    :snap-pixel-grid      {:command ","
                           :tooltip ","
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (toggle-layout-flag :snap-pixel-grid))}
 
    :export-shapes        {:tooltip (ds/meta-shift "E")
                           :command (ds/c-mod "shift+e")
                           :subsections [:basics :main-menu]
+                          :section [:workspace :basics]
                           :fn #(st/emit!
                                 (de/show-workspace-export-dialog {:origin "workspace:shortcuts"}))}
 
    :toggle-snap-ruler-guide {:tooltip (ds/meta-shift "G")
                              :command (ds/c-mod "shift+g")
                              :subsections [:main-menu]
+                             :section [:workspace]
                              :fn #(st/emit! (toggle-layout-flag :snap-ruler-guides))}
 
    :toggle-snap-guides      {:tooltip (ds/meta-shift "'")
@@ -472,11 +544,13 @@
                              :command [(ds/c-mod "shift+'") (ds/c-mod "shift+219")]
                              :show-command (ds/c-mod "shift+'")
                              :subsections [:main-menu]
+                             :section [:workspace]
                              :fn #(st/emit! (toggle-layout-flag :snap-guides))}
 
    :show-shortcuts       {:tooltip "?"
                           :command "?"
                           :subsections [:main-menu]
+                          :section [:workspace]
                           :fn #(st/emit! (toggle-layout-flag :shortcuts))}
 
    ;; PANELS
@@ -484,22 +558,26 @@
    :toggle-layers        {:tooltip (ds/alt "L")
                           :command (ds/a-mod "l")
                           :subsections [:panels]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-workspace :layout :layers))}
 
    :toggle-assets        {:tooltip (ds/alt "I")
                           :command (ds/a-mod "i")
                           :subsections [:panels]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-workspace :layout :assets))}
 
    :toggle-history       {:tooltip (ds/meta-alt "H")
                           :command (ds/ca-mod "h")
                           :subsections [:panels]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly
                                 (dw/toggle-layout-flag :document-history))}
 
    :toggle-colorpalette  {:tooltip (ds/alt "P")
                           :command (ds/a-mod "p")
                           :subsections [:panels]
+                          :section [:workspace]
                           :fn #(do (r/set-resize-type! :bottom)
                                    (emit-when-no-readonly (dw/remove-layout-flag :hide-palettes)
                                                           (dw/remove-layout-flag :textpalette)
@@ -508,6 +586,7 @@
    :toggle-textpalette   {:tooltip (ds/alt "T")
                           :command (ds/a-mod "t")
                           :subsections [:panels]
+                          :section [:workspace]
                           :fn #(do (r/set-resize-type! :bottom)
                                    (emit-when-no-readonly (dw/remove-layout-flag :hide-palettes)
                                                           (dw/remove-layout-flag :colorpalette)
@@ -516,6 +595,7 @@
    :hide-ui              {:tooltip "\\"
                           :command "\\"
                           :subsections [:panels :basics]
+                          :section [:workspace :basics]
                           :fn #(st/emit! (toggle-layout-flag :hide-ui))}
 
    ;; ZOOM-WORKSPACE
@@ -523,36 +603,43 @@
    :increase-zoom        {:tooltip "+"
                           :command ["+" "="]
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/increase-zoom))}
 
    :decrease-zoom        {:tooltip "-"
                           :command ["-" "_"]
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/decrease-zoom))}
 
    :reset-zoom           {:tooltip (ds/shift "0")
                           :command ["shift+0" "shift+num0"]
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! dw/reset-zoom)}
 
    :fit-all              {:tooltip (ds/shift "1")
                           :command ["shift+1" "shift+num1"]
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! dw/zoom-to-fit-all)}
 
    :zoom-selected        {:tooltip (ds/shift "2")
                           :command ["shift+2" "shift+num2" "@" "\""]
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! dw/zoom-to-selected-shape)}
 
    :zoom-lense-increase  {:tooltip "Z"
                           :command "z"
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn identity}
 
    :zoom-lense-decrease  {:tooltip (ds/alt "Z")
                           :command "alt+z"
                           :subsections [:zoom-workspace]
+                          :section [:workspace]
                           :fn identity}
 
    ;; NAVIGATION
@@ -561,36 +648,43 @@
    :open-viewer          {:tooltip "G V"
                           :command "g v"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-viewer))}
 
    :open-inspect         {:tooltip "G I"
                           :command "g i"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-viewer :section :inspect))}
 
    :open-comments        {:tooltip "G C"
                           :command "g c"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-viewer :section :comments))}
 
    :open-dashboard       {:tooltip "G D"
                           :command "g d"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dcm/go-to-dashboard-recent))}
 
    :select-prev          {:tooltip (ds/shift "tab")
                           :command "shift+tab"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/select-prev-shape))}
 
    :select-next          {:tooltip ds/tab
                           :command "tab"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(st/emit! (dw/select-next-shape))}
 
    :select-parent-layer  {:tooltip (ds/shift ds/enter)
                           :command "shift+enter"
                           :subsections [:navigation-workspace]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/select-parent-layer))}
    ;; SHAPE
 
@@ -598,27 +692,32 @@
    :bool-union           {:tooltip (ds/meta (ds/alt "U"))
                           :command (ds/c-mod "alt+u")
                           :subsections [:shape]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/create-bool :union))}
 
    :bool-difference      {:tooltip (ds/meta (ds/alt "D"))
                           :command (ds/c-mod "alt+d")
                           :subsections [:shape]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/create-bool :difference))}
 
    :bool-intersection    {:tooltip (ds/meta (ds/alt "I"))
                           :command (ds/c-mod "alt+i")
                           :subsections [:shape]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/create-bool :intersection))}
 
    :bool-exclude         {:tooltip (ds/meta (ds/alt "E"))
                           :command (ds/c-mod "alt+e")
                           :subsections [:shape]
+                          :section [:workspace]
                           :fn #(emit-when-no-readonly (dw/create-bool :exclude))}
 
    ;; THEME
    :toggle-theme         {:tooltip (ds/alt "M")
                           :command (ds/a-mod "m")
-                          :subsections [:basics]
+                          :subsections [:generic :basics]
+                          :section [:workspace :basics]
                           :fn #(st/emit! (with-meta (du/toggle-theme)
                                            {::ev/origin "workspace:shortcut"}))}
 
@@ -626,7 +725,8 @@
    ;; PLUGINS
    :plugins               {:tooltip (ds/meta (ds/alt "P"))
                            :command (ds/c-mod "alt+p")
-                           :subsections [:basics]
+                           :subsections [:generic :basics]
+                           :section [:workspace :basics]
                            :fn #(when (features/active-feature? @st/state "plugins/runtime")
                                   (st/emit!
                                    (ev/event {::ev/name "open-plugins-manager" ::ev/origin "workspace:shortcuts"})
@@ -644,6 +744,7 @@
             (map (fn [n] [(keyword (str "opacity-" n))
                           {:tooltip (str n)
                            :command [(str n) (str "num" n)]
+                           :section [:workspace]
                            :subsections [:modify-layers]
                            :fn #(emit-when-no-readonly (dwly/pressed-opacity n))}])))))
 
@@ -652,6 +753,24 @@
     *assert*
     (merge debug-shortcuts)))
 
-(defn get-tooltip [shortcut]
+(defn get-tooltip
+  "Returns the tooltip string for a shortcut, using any custom binding
+  from the user's profile props if one exists, falling back to the
+  default :tooltip field."
+  [shortcut]
   (assert (contains? shortcuts shortcut) (str shortcut))
-  (get-in shortcuts [shortcut :tooltip]))
+  (let [custom-shortcuts (deref refs/custom-shortcuts)
+        custom-command   (get-in custom-shortcuts [:workspace shortcut])]
+    (if (and custom-command (not= custom-command ""))
+      (ds/command->tooltip custom-command)
+      (get-in shortcuts [shortcut :tooltip]))))
+
+(defn get-effective-tooltip
+  "Returns the tooltip string for a shortcut given an already-resolved
+  custom-shortcuts map. Use this when you already have the custom
+  shortcuts derefed for the current render cycle."
+  [shortcut custom-shortcuts]
+  (let [custom-command (get-in custom-shortcuts [:workspace shortcut])]
+    (if (and custom-command (not= custom-command ""))
+      (ds/command->tooltip custom-command)
+      (get-in shortcuts [shortcut :tooltip]))))
diff --git a/frontend/src/app/main/data/workspace/text/shortcuts.cljs b/frontend/src/app/main/data/workspace/text/shortcuts.cljs
index c1e050ad6b..9943c809e0 100644
--- a/frontend/src/app/main/data/workspace/text/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/text/shortcuts.cljs
@@ -11,6 +11,7 @@
    [app.common.types.text :as txt]
    [app.main.data.shortcuts :as ds]
    [app.main.data.workspace.texts :as dwt]
+   [app.main.data.workspace.texts-v3 :as dwt-v3]
    [app.main.data.workspace.undo :as dwu]
    [app.main.features :as features]
    [app.main.fonts :as fonts]
@@ -170,6 +171,8 @@
                 :else props)]
 
     (when (and shape props)
+      (when (features/active-feature? @st/state "text-editor-wasm/v1")
+        (st/emit! (dwt-v3/v3-update-text-editor-styles (:id shape) props)))
       (st/emit! (dwt/update-attrs (:id shape) props)))))
 
 (defn blend-props
@@ -237,31 +240,37 @@
   {:underline     {:tooltip (ds/meta "U")
                    :command (ds/c-mod "u")
                    :subsections [:text-editor]
+                   :section [:workspace]
                    :fn #(update-attrs-when-no-readonly {:text-decoration "toggle-underline"})}
 
    :line-through  {:tooltip (ds/alt (ds/meta-shift "5"))
                    :command "alt+shift+5"
                    :subsections [:text-editor]
+                   :section [:workspace]
                    :fn #(update-attrs-when-no-readonly {:text-decoration "toggle-line-through"})}
 
    :font-size-inc {:tooltip (ds/meta-shift ">")
                    :command (ds/c-mod "shift+.")
                    :subsections [:text-editor]
+                   :section [:workspace]
                    :fn #(update-attrs-when-no-readonly {:font-size-inc true})}
 
    :font-size-dec {:tooltip (ds/meta-shift "<")
                    :command (ds/c-mod "shift+,")
                    :subsections [:text-editor]
+                   :section [:workspace]
                    :fn #(update-attrs-when-no-readonly {:font-size-dec true})}
 
    :bold     {:tooltip (ds/meta "b")
               :command (ds/c-mod "b")
               :subsections [:text-editor]
+              :section [:workspace]
               :fn #(update-attrs-when-no-readonly {:font-variant-id "toggle-bold"})}
 
    :italic     {:tooltip (ds/meta "i")
                 :command (ds/c-mod "i")
                 :subsections [:text-editor]
+                :section [:workspace]
                 :fn #(update-attrs-when-no-readonly {:font-variant-id "toggle-italic"})}})
 
 
diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index df0508a1ba..113561a506 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -27,8 +27,10 @@
    [app.main.data.workspace.common :as dwc]
    [app.main.data.workspace.libraries :as dwl]
    [app.main.data.workspace.modifiers :as dwm]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.selection :as dws]
    [app.main.data.workspace.shapes :as dwsh]
+   [app.main.data.workspace.texts-v3 :as dwt-v3]
    [app.main.data.workspace.transforms :as dwt]
    [app.main.data.workspace.undo :as dwu]
    [app.main.data.workspace.wasm-text :as dwwt]
@@ -37,8 +39,10 @@
    [app.main.router :as rt]
    [app.main.store :as st]
    [app.render-wasm.api :as wasm.api]
+   [app.render-wasm.api.fonts :as wasm.fonts]
    [app.render-wasm.text-editor :as wasm.text-editor]
    [app.util.text-editor :as ted]
+   [app.util.text.content :as tc]
    [app.util.text.content.styles :as styles]
    [app.util.timers :as ts]
    [beicon.v2.core :as rx]
@@ -59,8 +63,134 @@
 (declare v2-update-text-editor-styles)
 (declare v2-sync-wasm-text-layout)
 
+(defn- bridge-to-measurement
+  "Marks `ids` pending until the text pipeline marks its own work:
+  `:text-measure` in the DOM renderer, `:text-resize` in wasm. Emits nothing."
+  [ids]
+  (->> (rx/from ids)
+       ;; Each id owns its bridge. Starting work for one text must not release
+       ;; siblings that the renderer has not picked up yet.
+       (rx/mapcat
+        (fn [id]
+          (->> (wrf/pending-signal [id] #{:text-measure :text-resize})
+               (rx/ignore)
+               (wrf/with-pending :text-bridge [id]))))
+       (rx/ignore)))
+
+(defn initialize-text-reflow
+  "Tracks the texts the DOM pipeline still has to re-measure, so a reflow wait
+  covers the measurement that resizes them."
+  []
+  (ptk/reify ::initialize-text-reflow
+    ptk/WatchEvent
+    (watch [_ _ stream]
+      (let [stopper (rx/filter (ptk/type? ::finalize-text-reflow) stream)]
+        (->> stream
+             (rx/filter (ptk/type? :text/reflow))
+             (rx/map deref)
+             (rx/mapcat (fn [{:keys [ids]}] (bridge-to-measurement ids)))
+             (rx/take-until stopper))))))
+
+(defn finalize-text-reflow
+  []
+  (ptk/data-event ::finalize-text-reflow))
+
+(defn- resolve-text-ids
+  "Returns the text shapes an attribute change on `id` applies to: `id` itself
+  when it is a text, its text descendants when it is a group. These are the
+  shapes that get re-measured, and so the ones the reflow waits track."
+  [objects id]
+  (let [shape (get objects id)]
+    (cond
+      (cfh/text-shape? shape)
+      [id]
+
+      (cfh/group-shape? shape)
+      (into [] (filter #(cfh/text-shape? (get objects %))) (cfh/get-children-ids objects id))
+
+      :else
+      [])))
+
+(defn- await-font-resize
+  "Marks `ids` as pending font work and dispatches their wasm resize once wasm
+  can measure with `font-id`, draining the marks afterwards. The fetch of that
+  font is started by the wasm shape sync of the content change these shapes
+  receive, so measuring before it lands would use the fallback font."
+  [stream font-id ids]
+  (if (empty? ids)
+    (rx/empty)
+    (let [stopper (rx/filter (ptk/type? :app.main.data.workspace/finalize) stream)]
+      (->> wasm.fonts/font-stored-stream
+           (rx/filter #(= % font-id))
+           (rx/take 1)
+           (rx/take-until stopper)
+           (rx/observe-on :async)
+           (rx/mapcat (fn [_] (rx/from (mapv dwwt/resize-wasm-text ids))))
+           (wrf/with-pending :font ids)))))
+
+(defn- await-html-font
+  "Keeps legacy DOM text pending while its new font is loading. The DOM
+  measurement also awaits this promise, so the font task bridges the state
+  update to the renderer commit without relying on a fixed settle delay."
+  [font-id font-variant-id ids]
+  (if (or (nil? font-id) (empty? ids))
+    (rx/empty)
+    (->> (rx/of ::load-font)
+         ;; `ensure-loaded!` is intentionally invoked after `with-pending`
+         ;; subscribes, so even an immediately settled promise cannot create a
+         ;; gap before the task is visible to waiters.
+         (rx/mapcat (fn [_]
+                      (rx/from (fonts/ensure-loaded! font-id font-variant-id))))
+         (rx/ignore)
+         (wrf/with-pending :font ids))))
+
 ;; -- Content helpers
 
+;; Style attrs typed as `::sm/text` in the content schema (see
+;; app.common.types.shape.text/schema:content): when the key is present its
+;; value must be a non-blank string, so an explicit nil fails backend
+;; `validate-shape`. `:key` is likewise a plain `:string`.
+(def ^:private non-nilable-style-attrs
+  #{:font-family :font-size :font-style :font-weight
+    :direction :text-direction :text-decoration :text-transform :key})
+
+(defn- remove-nil-style-attrs
+  "Strip nil-valued non-nilable style attrs from every node in a content tree.
+  Repairs content already corrupted with e.g. nil :font-family/:font-weight/
+  :font-style (from an unloaded font) so it can pass the backend schema again."
+  [content]
+  (txt/transform-nodes
+   (fn [node]
+     (reduce (fn [node k]
+               (if (and (contains? node k) (nil? (get node k)))
+                 (dissoc node k)
+                 node))
+             node
+             non-nilable-style-attrs))
+   content))
+
+(defn ensure-valid-text-content
+  "Repair structurally incomplete text :content to a canonical
+  root -> paragraph-set -> paragraph -> span tree. Returns the
+  content unchanged when it is already well-formed.
+
+  A `nil` content, a root with no :children, or a root with an empty
+  :children vector all fail the backend `validate-shape` schema
+  (children must contain at least one paragraph-set). This helper
+  is the defensive normalizer used by content-commit paths.
+
+  It also scrubs nil-valued non-nilable style attrs (e.g. nil
+  :font-family/:font-weight/:font-style left over from an unloaded font),
+  so already-corrupted content self-heals on the next commit."
+  [content]
+  (if (and (map? content)
+           (= "root" (:type content))
+           (or (nil? (:children content))
+               (empty? (:children content))))
+    (let [base (tc/v2-default-text-content)]
+      (d/txt-merge base (select-keys content txt/root-attrs)))
+    (remove-nil-style-attrs content)))
+
 (defn- v2-content-has-text?
   [content]
   (boolean
@@ -192,7 +322,8 @@
     (update [_ state]
       (let [text-state   (some->> content ted/import-content)
             attrs        (merge (txt/get-default-text-attrs)
-                                (get-in state [:workspace-global :default-font]))
+                                (fonts/valid-default-font
+                                 (get-in state [:workspace-global :default-font])))
             editor       (cond-> (ted/create-editor-state text-state decorator)
                            (and (nil? content) (some? attrs))
                            (ted/update-editor-current-block-data attrs))]
@@ -406,12 +537,20 @@
                 (update-text-range-attrs start end attrs)))
 
             shape-ids (cond (cfh/text-shape? shape)  [id]
-                            (cfh/group-shape? shape) (cfh/get-children-ids objects id))]
+                            (cfh/group-shape? shape) (cfh/get-children-ids objects id))
+            text-ids  (resolve-text-ids objects id)]
 
         (rx/concat
          (rx/of (dwsh/update-shapes shape-ids update-fn))
-         (if (features/active-feature? state "render-wasm/v1")
-           (rx/of (dwwt/resize-wasm-text-debounce id))
+         (cond
+           (features/active-feature? state "render-wasm/v1")
+           (->> (rx/from text-ids)
+                (rx/map dwwt/resize-wasm-text-debounce))
+
+           (contains? attrs :font-id)
+           (await-html-font (:font-id attrs) (:font-variant-id attrs) text-ids)
+
+           :else
            (rx/empty)))))))
 
 (defn update-root-attrs
@@ -426,7 +565,14 @@
             (fn [shape]
               (if (some? (:content shape))
                 (txt/update-text-content shape txt/is-root-node? d/txt-merge attrs)
-                (assoc shape :content (d/txt-merge {:type "root"} attrs))))
+                ;; Shape has no :content yet (e.g. a brand-new text
+                ;; shape that has never been edited). Seed the
+                ;; canonical root/paragraph-set/paragraph/span tree
+                ;; before applying the new root attrs; the
+                ;; `validate-shape` schema requires :children to
+                ;; contain at least one paragraph-set.
+                (assoc shape :content
+                       (d/txt-merge (tc/v2-default-text-content) attrs))))
 
             shape-ids
             (cond (cfh/text-shape? shape)  [id]
@@ -554,13 +700,19 @@
 
            (rx/concat (rx/of (dwsh/update-shapes shape-ids update-shape options))
                       (when (features/active-feature? state "text-editor-wasm/v1")
-                        (let [styles ((comp update-node-fn migrate-node))
-                              result (wasm.api/apply-styles-to-selection styles)]
+                        ;; Transform each span so add-fill preserves its existing fills.
+                        (let [result (wasm.api/apply-styles-to-selection
+                                      (comp update-node-fn migrate-node)
+                                      {:with-fills? true})]
                           (when result
                             (rx/of (v2-update-text-shape-content
                                     (:shape-id result)
                                     (:content result)
-                                    :update-name? true)))))))))
+                                    :update-name? true)
+                                   ;; Refresh the panel now, not only after a reselect.
+                                   (dwt-v3/v3-update-text-editor-styles
+                                    (:shape-id result)
+                                    {:fills (:fills result)})))))))))
 
      ptk/EffectEvent
      (effect [_ state _]
@@ -638,17 +790,20 @@
 (defn resize-text
   [id new-width new-height]
 
-  (let [cur-event (js/Symbol)]
+  (let [cur-event   (js/Symbol)
+        reflow-task (wrf/task :text-resize [id])]
     (ptk/reify ::resize-text
       ptk/UpdateEvent
       (update [_ state]
         (-> state
             (update ::resize-text-debounce-props (fnil assoc {}) id [new-width new-height])
+            (update ::resize-text-reflow-tasks (fnil conj []) reflow-task)
             (cond-> (nil? (::resize-text-debounce-event state))
               (assoc ::resize-text-debounce-event cur-event))))
 
       ptk/WatchEvent
       (watch [_ state stream]
+        (wrf/start! reflow-task)
         (if (= (::resize-text-debounce-event state) cur-event)
           (let [stopper (->> stream (rx/filter (ptk/type? :app.main.data.workspace/finalize)))]
             (rx/concat
@@ -660,7 +815,12 @@
                    (rx/map #(commit-resize-text))
                    (rx/take-until stopper))
               (rx/of (resize-text id new-width new-height)))
-             (rx/of #(dissoc % ::resize-text-debounce-props ::resize-text-debounce-event))))
+             (rx/of (fn [state]
+                      (run! wrf/finish! (::resize-text-reflow-tasks state))
+                      (dissoc state
+                              ::resize-text-debounce-props
+                              ::resize-text-reflow-tasks
+                              ::resize-text-debounce-event)))))
           (rx/empty))))))
 
 (defn save-font
@@ -808,19 +968,21 @@
              (rx/of (update-position-data id position-data))))
           (rx/empty))))))
 
-(defn font-loaded-event?
-  [font-id]
-  (fn [event]
-    (and
-     (= :font-loaded (ptk/type event))
-     (= (:font-id (deref event)) font-id))))
-
 (defn update-attrs
   [id attrs]
   (ptk/reify ::update-attrs
     ptk/WatchEvent
     (watch [_ state stream]
-      (let [text-editor-instance (:workspace-editor state)]
+      (let [text-editor-instance (:workspace-editor state)
+            objects              (dsh/lookup-page-objects state)
+            text-ids             (resolve-text-ids objects id)
+
+            wasm-editing?
+            (and (features/active-feature? state "text-editor-wasm/v1")
+                 (= id (wasm.api/text-editor-get-active-shape-id)))
+
+            wasm-editing-selection?
+            (and wasm-editing? (wasm.api/text-editor-has-selection?))]
         (if (and (features/active-feature? state "text-editor/v2")
                  (some? text-editor-instance))
           (rx/empty)
@@ -830,21 +992,36 @@
                (rx/of (update-root-attrs {:id id :attrs attrs}))
                (rx/empty)))
 
-           (let [attrs (select-keys attrs txt/paragraph-attrs)]
-             (if-not (empty? attrs)
-               (rx/of (update-paragraph-attrs {:id id :attrs attrs}))
-               (rx/empty)))
+           ;; `:line-height` is stored on both the paragraph and its spans, and
+           ;; the renderer takes the larger of the two.
+           (let [pattrs (if wasm-editing-selection?
+                          (conj txt/paragraph-attrs :line-height)
+                          txt/paragraph-attrs)
+                 attrs  (select-keys attrs pattrs)
+                 result (when (and (seq attrs) wasm-editing?)
+                          (wasm.api/apply-paragraph-attrs-to-selection attrs))]
+             (cond
+               (empty? attrs)
+               (rx/empty)
+
+               (some? result)
+               (rx/of (v2-update-text-shape-content
+                       (:shape-id result) (:content result)
+                       :update-name? true))
+
+               :else
+               (rx/of (update-paragraph-attrs {:id id :attrs attrs}))))
 
            (let [attrs (select-keys attrs txt/text-node-attrs)]
-             (if-not (empty? attrs)
-               (rx/of (update-text-attrs {:id id :attrs attrs}))
-               (rx/empty)))
+             (if (or (empty? attrs) wasm-editing-selection?)
+               (rx/empty)
+               (rx/of (update-text-attrs {:id id :attrs attrs}))))
 
            (when (and (features/active-feature? state "text-editor/v2")
                       (not (features/active-feature? state "text-editor-wasm/v1")))
              (rx/of (v2-update-text-editor-styles id attrs)))
 
-           (when (features/active-feature? state "render-wasm/v1")
+           (if (features/active-feature? state "render-wasm/v1")
              (rx/concat
               ;; Apply style to selected spans and sync content
               (let [has-selection? (wasm.api/text-editor-has-selection?)]
@@ -856,14 +1033,24 @@
                           (rx/of (v2-update-text-shape-content
                                   (:shape-id result) (:content result)
                                   :update-name? true))))))))
-              ;; Resize (with delay for font-id changes)
-              (if (contains? attrs :font-id)
-                (->> stream
-                     (rx/filter (font-loaded-event? (:font-id attrs)))
-                     (rx/take 1)
-                     (rx/observe-on :async)
-                     (rx/map #(dwwt/resize-wasm-text id)))
-                (rx/of (dwwt/resize-wasm-text id)))))))))
+              ;; Resize (with delay for font-id changes). Only auto-height and
+              ;; auto-width shapes have geometry to recompute.
+              (let [auto-ids (into [] (remove #(= :fixed (:grow-type (get objects %)))) text-ids)]
+                (if (contains? attrs :font-id)
+                  ;; The geometry depends on the font, so wait until wasm has it.
+                  (await-font-resize stream (:font-id attrs) auto-ids)
+                  ;; No font change: measurable right away.
+                  (->> (rx/from auto-ids)
+                       (rx/map dwwt/resize-wasm-text)))))
+
+             ;; The legacy renderer re-measures these in the DOM on its own,
+             ;; but font loading starts before that render commits.
+             (if (contains? attrs :font-id)
+               (await-html-font
+                (:font-id attrs)
+                (:font-variant-id attrs)
+                text-ids)
+               (rx/empty)))))))
 
     ptk/EffectEvent
     (effect [_ state _]
@@ -992,7 +1179,8 @@
       ;; Avoid swapping the global store when the computed styles are unchanged,
       ;; otherwise we can end up in store->rerender->selectionchange loops.
       (let [merged-styles (merge (txt/get-default-text-attrs)
-                                 (get-in state [:workspace-global :default-font])
+                                 (fonts/valid-default-font
+                                  (get-in state [:workspace-global :default-font]))
                                  new-styles)
             prev (get-in state [:workspace-v2-editor-state id])]
         (if (= merged-styles prev)
@@ -1078,126 +1266,141 @@
 (defn v2-update-text-shape-content
   [id content & {:keys [update-name? name finalize? save-undo? original-content]
                  :or {update-name? false name nil finalize? false save-undo? true original-content nil}}]
-  (ptk/reify ::v2-update-text-shape-content
-    ptk/WatchEvent
-    (watch [it state _]
-      (if (features/active-feature? state "render-wasm/v1")
-        (let [;; v3 editor always passes :finalize? from keyword opts; when absent
-              ;; that binds nil and :or defaults do not apply — coerce so undo flags
-              ;; stay strict booleans for changes-builder schema validation.
-              finalize?    (boolean finalize?)
-              objects      (dsh/lookup-page-objects state)
-              shape        (get objects id)
-              new-shape?   (contains? (:workspace-new-text-shapes state) id)
-              prev-content (:content shape)
-              has-prev-content? (not (nil? (:prev-content shape)))
-              ;; For existing shapes, capture geometry at session start once so
-              ;; finalize can build a single undo entry. Stored in workspace state,
-              ;; not in the shape, to avoid persisting session-only data.
-              session-start-geom (or (get-in state [:workspace-text-session-geom id])
-                                     (select-keys shape [:selrect :points :width :height]))
-              content-has-text? (v2-content-has-text? content)
-              prev-content-has-text? (v2-content-has-text? prev-content)
-              ;; Only measure/resize the shape on finalize. While the user is
-              ;; actively typing, the WASM editor already renders the growing text
-              ;; (and the editor overlay measures it live), so a per-keystroke
-              ;; resize is redundant and, going through the interactive-transform
-              ;; modifier machinery, made auto-width typing very laggy.
-              new-size (when (and finalize? (not= :fixed (:grow-type shape)))
-                         (dwwt/get-wasm-text-new-size shape content))
-              ;; New shapes: single undo on finalize only (no per-keystroke undo)
-              effective-save-undo? (if new-shape? finalize? save-undo?)
-              effective-stack-undo? (and new-shape? finalize?)
-              ;; No save-undo on first update when finalizing: either build-finalize
-              ;; holds undo (non-new), or we delete empty text and only delete-shapes
-              ;; should record undo.
-              finalize-save-undo-first?
-              (if (and finalize? (or (not new-shape?) (not content-has-text?)))
-                false
-                effective-save-undo?)]
+  ;; Defensive: ensure the content we are about to commit has the
+  ;; canonical root/paragraph-set/paragraph/span tree. The v2 editor
+  ;; always produces well-formed content from `dom->cljs`, but legacy
+  ;; producers (or programmatic API calls) can still pass a root with
+  ;; empty :children, which would fail the backend `validate-shape`
+  ;; schema.
+  (let [content (ensure-valid-text-content content)
+        original-content (ensure-valid-text-content original-content)]
+    (ptk/reify ::v2-update-text-shape-content
+      ptk/WatchEvent
+      (watch [it state _]
+        (if (features/active-feature? state "render-wasm/v1")
+          (let [;; v3 editor always passes :finalize? from keyword opts; when absent
+                ;; that binds nil and :or defaults do not apply — coerce so undo flags
+                ;; stay strict booleans for changes-builder schema validation.
+                finalize?    (boolean finalize?)
+                objects      (dsh/lookup-page-objects state)
+                shape        (get objects id)
+                new-shape?   (contains? (:workspace-new-text-shapes state) id)
+                prev-content (:content shape)
+                has-prev-content? (not (nil? (:prev-content shape)))
+                ;; For existing shapes, capture geometry at session start once so
+                ;; finalize can build a single undo entry. Stored in workspace state,
+                ;; not in the shape, to avoid persisting session-only data.
+                session-start-geom (or (get-in state [:workspace-text-session-geom id])
+                                       (select-keys shape [:selrect :points :width :height]))
+                content-has-text? (v2-content-has-text? content)
+                prev-content-has-text? (v2-content-has-text? prev-content)
+                ;; Only measure/resize the shape on finalize. While the user is
+                ;; actively typing, the WASM editor already renders the growing text
+                ;; (and the editor overlay measures it live), so a per-keystroke
+                ;; resize is redundant and, going through the interactive-transform
+                ;; modifier machinery, made auto-width typing very laggy.
+                new-size (when (and finalize? (not= :fixed (:grow-type shape)))
+                           (dwwt/get-wasm-text-new-size shape content))
+                ;; New shapes: single undo on finalize only (no per-keystroke undo)
+                effective-save-undo? (if new-shape? finalize? save-undo?)
+                effective-stack-undo? (and new-shape? finalize?)
+                ;; No save-undo on first update when finalizing: either build-finalize
+                ;; holds undo (non-new), or we delete empty text and only delete-shapes
+                ;; should record undo.
+                finalize-save-undo-first?
+                (if (and finalize? (or (not new-shape?) (not content-has-text?)))
+                  false
+                  effective-save-undo?)]
 
-          (rx/concat
-           (rx/of
-            ;; Store session-start geometry in workspace state once for existing shapes
-            (when (and (not new-shape?)
-                       (nil? (get-in state [:workspace-text-session-geom id])))
-              (fn [s] (assoc-in s [:workspace-text-session-geom id] session-start-geom)))
-            (dwsh/update-shapes
-             [id]
-             (fn [shape]
-               (-> shape
-                   (assoc :content content)
-                   (cond-> (and (not new-shape?)
-                                content-has-text?
-                                has-prev-content?)
-                     (dissoc :prev-content))
+            (rx/concat
+             (rx/of
+              ;; Store session-start geometry in workspace state once for existing shapes
+              (when (and (not new-shape?)
+                         (nil? (get-in state [:workspace-text-session-geom id])))
+                (fn [s] (assoc-in s [:workspace-text-session-geom id] session-start-geom)))
+              (dwsh/update-shapes
+               [id]
+               (fn [shape]
+                 (-> shape
+                     (assoc :content content)
+                     (cond-> (and (not new-shape?)
+                                  content-has-text?
+                                  has-prev-content?)
+                       (dissoc :prev-content))
 
-                   (cond-> (and (not new-shape?)
-                                prev-content-has-text?
-                                (not content-has-text?)
-                                (not finalize?))
-                     (assoc :prev-content prev-content))
+                     (cond-> (and (not new-shape?)
+                                  prev-content-has-text?
+                                  (not content-has-text?)
+                                  (not finalize?))
+                       (assoc :prev-content prev-content))
 
-                   (cond-> (and update-name? (some? name))
-                     (assoc :name name))))
-             {:save-undo? finalize-save-undo-first?
-              :stack-undo? effective-stack-undo?
-              :undo-group (when new-shape? id)})
+                     (cond-> (and update-name? (some? name))
+                       (assoc :name name))))
+               {:save-undo? finalize-save-undo-first?
+                :stack-undo? effective-stack-undo?
+                :undo-group (when new-shape? id)})
 
-            ;; `new-size` is only computed on finalize (see above), so this commits
-            ;; the final auto-width/auto-height geometry via `apply-wasm-modifiers`
-            ;; like other transform flows (flex parents, sidebar width, etc.).
-            (when (some? new-size)
-              (when-let [modifiers (dwwt/resize-wasm-text-modifiers shape content)]
-                (dwm/apply-wasm-modifiers modifiers {:undo-group (when new-shape? id)}))))
+              ;; `new-size` is only computed on finalize (see above), so this commits
+              ;; the final auto-width/auto-height geometry via `apply-wasm-modifiers`
+              ;; like other transform flows (flex parents, sidebar width, etc.).
+              (when (some? new-size)
+                (when-let [modifiers (dwwt/resize-wasm-text-modifiers shape content)]
+                  (dwm/apply-wasm-modifiers modifiers {:undo-group (when new-shape? id)}))))
 
-           (when finalize?
-             (rx/concat
-              (if (and (not content-has-text?) (some? id))
+             (when finalize?
+               (rx/concat
+                (if (and (not content-has-text?) (some? id))
+                  (rx/concat
+                   (if (and (some? original-content) (v2-content-has-text? original-content))
+                     (rx/of
+                      (dwsh/update-shapes
+                       [id]
+                       (fn [s] (-> s (assoc :content original-content) (dissoc :prev-content)))
+                       {:save-undo? false}))
+                     (rx/empty))
+                   (rx/of (dws/deselect-shape id)
+                          (dwsh/delete-shapes #{id})))
+                  (rx/empty))
                 (rx/concat
-                 (if (and (some? original-content) (v2-content-has-text? original-content))
+                 (if content-has-text?
                    (rx/of
-                    (dwsh/update-shapes
-                     [id]
-                     (fn [s] (-> s (assoc :content original-content) (dissoc :prev-content)))
-                     {:save-undo? false}))
+                    (dch/commit-changes
+                     (build-finalize-commit-changes it state id
+                                                    {:new-shape? new-shape?
+                                                     :content-has-text? content-has-text?
+                                                     :content content
+                                                     ;; Undo baseline for the finalize commit: restore the
+                                                     ;; content as it was right before this commit. For existing
+                                                     ;; shapes that's `prev-content`; using the (unset, nil)
+                                                     ;; `original-content` here wiped `:content` to nil on undo,
+                                                     ;; which emptied the shape and crashed the WASM editor's
+                                                     ;; select-all on 0 paragraphs. New shapes keep the previous
+                                                     ;; behavior (their create is bundled in the undo group).
+                                                     :original-content (if new-shape? original-content prev-content)
+                                                     :update-name? update-name?
+                                                     :name name})))
                    (rx/empty))
-                 (rx/of (dws/deselect-shape id)
-                        (dwsh/delete-shapes #{id})))
-                (rx/empty))
-              (rx/concat
-               (if content-has-text?
-                 (rx/of
-                  (dch/commit-changes
-                   (build-finalize-commit-changes it state id
-                                                  {:new-shape? new-shape?
-                                                   :content-has-text? content-has-text?
-                                                   :content content
-                                                   :original-content original-content
-                                                   :update-name? update-name?
-                                                   :name name})))
-                 (rx/empty))
-               (rx/of (dwt/finish-transform)
-                      (fn [state]
-                        (-> state
-                            (update :workspace-new-text-shapes disj id)
-                            (update :workspace-text-session-geom (fnil dissoc {}) id)))))))))
+                 (rx/of (dwt/finish-transform)
+                        (fn [state]
+                          (-> state
+                              (update :workspace-new-text-shapes disj id)
+                              (update :workspace-text-session-geom (fnil dissoc {}) id)))))))))
 
-        (let [modifiers    (get-in state [:workspace-text-modifier id])
-              new-shape?   (contains? (:workspace-new-text-shapes state) id)]
-          (rx/of
-           (dwsh/update-shapes [id]
-                               (fn [shape]
-                                 (let [{:keys [width height position-data]} modifiers]
-                                   (-> shape
-                                       (assoc :content content)
-                                       (cond-> position-data
-                                         (assoc :position-data position-data))
-                                       (cond-> (and update-name? (some? name))
-                                         (assoc :name name))
-                                       (cond-> (or (some? width) (some? height))
-                                         (gsh/transform-shape (ctm/change-size shape width height))))))
-                               {:undo-group (when new-shape? id)})))))))
+          (let [modifiers    (get-in state [:workspace-text-modifier id])
+                new-shape?   (contains? (:workspace-new-text-shapes state) id)]
+            (rx/of
+             (dwsh/update-shapes [id]
+                                 (fn [shape]
+                                   (let [{:keys [width height position-data]} modifiers]
+                                     (-> shape
+                                         (assoc :content content)
+                                         (cond-> position-data
+                                           (assoc :position-data position-data))
+                                         (cond-> (and update-name? (some? name))
+                                           (assoc :name name))
+                                         (cond-> (or (some? width) (some? height))
+                                           (gsh/transform-shape (ctm/change-size shape width height))))))
+                                 {:undo-group (when new-shape? id)}))))))))
 
 (defn replace-layer-names-in-shapes
   [ids search replacement]
diff --git a/frontend/src/app/main/data/workspace/texts_v3.cljs b/frontend/src/app/main/data/workspace/texts_v3.cljs
index 4f0834d7d2..c0b27abe95 100644
--- a/frontend/src/app/main/data/workspace/texts_v3.cljs
+++ b/frontend/src/app/main/data/workspace/texts_v3.cljs
@@ -7,6 +7,7 @@
 (ns app.main.data.workspace.texts-v3
   (:require
    [app.common.types.text :as txt]
+   [app.main.fonts :as fonts]
    [potok.v2.core :as ptk]))
 
 (defn v3-update-text-editor-styles
@@ -14,7 +15,11 @@
   (ptk/reify ::v3-update-text-editor-styles
     ptk/UpdateEvent
     (update [_ state]
-      (let [merged-styles (merge (txt/get-default-text-attrs)
-                                 (get-in state [:workspace-global :default-font])
-                                 new-styles)]
-        (update-in state [:workspace-wasm-editor-styles id] (fnil merge {}) merged-styles)))))
+      (if (not= id (get-in state [:workspace-local :edition]))
+        state
+        (let [defaults (merge (txt/get-default-text-attrs)
+                              (fonts/valid-default-font
+                               (get-in state [:workspace-global :default-font])))]
+          (update-in state [:workspace-wasm-editor-styles id]
+                     (fn [current-styles]
+                       (merge defaults current-styles new-styles))))))))
diff --git a/frontend/src/app/main/data/workspace/thumbnails_wasm.cljs b/frontend/src/app/main/data/workspace/thumbnails_wasm.cljs
index 2755c530fd..edef890e1e 100644
--- a/frontend/src/app/main/data/workspace/thumbnails_wasm.cljs
+++ b/frontend/src/app/main/data/workspace/thumbnails_wasm.cljs
@@ -68,7 +68,9 @@
                           {sel-w :width sel-h :height} (:selrect frame)
                           max-size (mth/max (or ext-w sel-w) (or ext-h sel-h))
                           scale (mth/max 1 (/ target-size max-size))
-                          png-bytes (wasm.api/render-shape-pixels frame-id scale)]
+                          ;; Thumbnails are always PNG: they need the alpha
+                          ;; channel and are consumed as a `image/png` data uri.
+                          png-bytes (wasm.api/render-shape-pixels frame-id scale :png)]
                       (if (or (nil? png-bytes) (zero? (.-length png-bytes)))
                         (do
                           (l/error :hint "render-shape-pixels returned empty" :frame-id (str frame-id))
diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs
index 5eb90ca433..d0e612b493 100644
--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -143,8 +143,7 @@
 
     ptk/EffectEvent
     (effect [_ _ _]
-      (rx/push! ms/wasm-modifiers nil)
-      (rx/push! ms/workspace-selrect nil))))
+      (ms/clear-transform-preview!))))
 
 ;; -- Resize --------------------------------------------------------
 
@@ -1023,6 +1022,9 @@
                 (rx/concat
                  (rx/merge
                   (->> modif-stream
+                       ;; Sample at a fixed cadence to cap re-renders, mirroring the
+                       ;; drag/resize/rotation paths throttled in #10560.
+                       (rx/sample mconst/move-sample-time)
                        (rx/map #(dwm/set-wasm-modifiers % {:ignore-snap-pixel true})))
 
                   (->> modif-stream
@@ -1031,17 +1033,28 @@
                   (rx/of (nudge-selected-shapes direction shift?)))
                  (rx/of (finish-transform))))
 
-              (rx/concat
-               (rx/merge
-                (->> move-events
-                     (rx/scan #(gpt/add %1 mov-vec) (gpt/point 0 0))
-                     (rx/map #(dwm/create-modif-tree selected (ctm/move-modifiers %)))
-                     (rx/map #(dwm/set-modifiers % false true))
-                     (rx/take-until stopper))
-                (rx/of (nudge-selected-shapes direction shift?)))
+              (let [modif-stream
+                    (->> move-events
+                         (rx/scan #(gpt/add %1 mov-vec) (gpt/point 0 0))
+                         (rx/map #(dwm/create-modif-tree selected (ctm/move-modifiers %)))
+                         (rx/take-until stopper))]
+                (rx/concat
+                 (rx/merge
+                  (->> modif-stream
+                       ;; Sample at a fixed cadence to cap re-renders, mirroring the
+                       ;; drag/resize/rotation paths throttled in #10560.
+                       (rx/sample mconst/move-sample-time)
+                       (rx/map #(dwm/set-modifiers % false true)))
+                  ;; Un-sampled final write ensures the modifiers atom holds the
+                  ;; exact cumulative position before `apply-modifiers` commits,
+                  ;; even if `sample` drops the tail value on completion.
+                  (->> modif-stream
+                       (rx/last)
+                       (rx/map #(dwm/set-modifiers % false true)))
+                  (rx/of (nudge-selected-shapes direction shift?)))
 
-               (rx/of (dwm/apply-modifiers)
-                      (finish-transform)))))
+                 (rx/of (dwm/apply-modifiers)
+                        (finish-transform))))))
           (rx/empty))))))
 
 (defn move-selected
diff --git a/frontend/src/app/main/data/workspace/wasm_text.cljs b/frontend/src/app/main/data/workspace/wasm_text.cljs
index fc97dba96e..eba1fdb8f6 100644
--- a/frontend/src/app/main/data/workspace/wasm_text.cljs
+++ b/frontend/src/app/main/data/workspace/wasm_text.cljs
@@ -17,6 +17,7 @@
    [app.common.types.modifiers :as ctm]
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.modifiers :as dwm]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.shapes :as dwsh]
    [app.main.data.workspace.undo :as dwu]
    [app.render-wasm.api :as wasm.api]
@@ -83,12 +84,14 @@
     ptk/WatchEvent
     (watch [_ state _]
       (let [objects (dsh/lookup-page-objects state)
-            shape   (get objects id)]
-        (if (and (some? shape)
-                 (cfh/text-shape? shape)
-                 (not= :fixed (:grow-type shape)))
-          (rx/of (dwm/apply-wasm-modifiers (resize-wasm-text-modifiers shape)))
-          (rx/empty))))))
+            shape   (get objects id)
+            resize-stream
+            (if (and (some? shape)
+                     (cfh/text-shape? shape)
+                     (not= :fixed (:grow-type shape)))
+              (rx/of (dwm/apply-wasm-modifiers (resize-wasm-text-modifiers shape)))
+              (rx/empty))]
+        (wrf/with-pending :text-resize [id] resize-stream)))))
 
 (defn resize-wasm-text-debounce-commit
   ([]
@@ -141,17 +144,20 @@
   ([id]
    (resize-wasm-text-debounce-inner id nil))
   ([id {:keys [undo-group undo-id]}]
-   (let [cur-event (js/Symbol)]
+   (let [cur-event   (js/Symbol)
+         reflow-task (wrf/task :text-resize [id])]
      (ptk/reify ::resize-wasm-text-debounce-inner
        ptk/UpdateEvent
        (update [_ state]
          (-> state
              (update ::resize-wasm-text-debounce-ids (fnil conj []) id)
+             (update ::resize-wasm-text-reflow-tasks (fnil conj []) reflow-task)
              (cond-> (nil? (::resize-wasm-text-debounce-event state))
                (assoc ::resize-wasm-text-debounce-event cur-event))))
 
        ptk/WatchEvent
        (watch [_ state stream]
+         (wrf/start! reflow-task)
          (if (= (::resize-wasm-text-debounce-event state) cur-event)
            (let [stopper (->> stream (rx/filter (ptk/type? :app.main.data.workspace/finalize)))]
              (rx/concat
@@ -168,9 +174,16 @@
                (rx/of (with-meta
                         (resize-wasm-text-debounce-inner id)
                         {:undo-group undo-group :undo-id undo-id})))
-              (rx/of #(dissoc %
-                              ::resize-wasm-text-debounce-ids
-                              ::resize-wasm-text-debounce-event))))
+              ;; Cleanup, reached both after the commit and when the stopper
+              ;; cancels the debounce, so the batch always drains and stays
+              ;; pending until the resize is applied. All exact tasks in the
+              ;; batch are retained in state and finished by the cleanup.
+              (rx/of (fn [state]
+                       (run! wrf/finish! (::resize-wasm-text-reflow-tasks state))
+                       (dissoc state
+                               ::resize-wasm-text-debounce-ids
+                               ::resize-wasm-text-reflow-tasks
+                               ::resize-wasm-text-debounce-event)))))
            (rx/empty)))))))
 
 (defn resize-wasm-text-debounce
@@ -190,33 +203,44 @@
                   (every?
                    (fn [font]
                      (let [font-data (wasm.fonts/make-font-data font)]
-                       (wasm.fonts/font-stored? font-data (:emoji? font-data))))))]
+                       (wasm.fonts/font-stored? font-data (:emoji? font-data))))))
 
-         (if fonts-loaded?
-           (let [pass-opts (when (or (some? undo-group) (some? undo-id))
-                             (cond-> {}
-                               (some? undo-group) (assoc :undo-group undo-group)
-                               (some? undo-id) (assoc :undo-id undo-id)))]
-             (rx/of (resize-wasm-text-debounce-inner id pass-opts)))
+             resize-wasm-stream
+             (if fonts-loaded?
+               (let [pass-opts (when (or (some? undo-group) (some? undo-id))
+                                 (cond-> {}
+                                   (some? undo-group) (assoc :undo-group undo-group)
+                                   (some? undo-id) (assoc :undo-id undo-id)))]
+                 (rx/of (resize-wasm-text-debounce-inner id pass-opts)))
 
-           ;; Fonts not loaded; retry after 20 msecs
-           (->> (rx/of (resize-wasm-text-debounce id opts))
-                (rx/delay 20))))))))
+               ;; Fonts not loaded; retry after 20 msecs
+               (->> (rx/of (resize-wasm-text-debounce id opts))
+                    (rx/delay 20)))]
+
+         ;; Holds the shape pending across the font-retry loop: the retried
+         ;; event opens its task before this one drains, so the task set never
+         ;; becomes empty in between.
+         (wrf/with-pending :text-resize [id] resize-wasm-stream))))))
 
 (defn resize-wasm-text-all
   "Resize all text shapes (auto-width/auto-height) from a collection of ids."
-  [ids]
-  (ptk/reify ::resize-wasm-text-all
-    ptk/WatchEvent
-    (watch [_ state stream]
-      (let [resize-stream
-            (->> (rx/from ids)
-                 (rx/map resize-wasm-text-debounce))]
-        (if (::dwsh/update-shapes-buffer state)
-          ;; If we're in the middle of a token propagation we wait until is finished to
-          ;; recalculate the text sizes
-          (->> stream
-               (rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
-               (rx/take 1)
-               (rx/mapcat (constantly resize-stream)))
-          resize-stream)))))
+  ([ids]
+   (resize-wasm-text-all ids nil))
+  ([ids opts]
+   (ptk/reify ::resize-wasm-text-all
+     ptk/WatchEvent
+     (watch [_ state stream]
+       (let [resize-stream
+             (->> (rx/from ids)
+                  (rx/map #(resize-wasm-text-debounce % opts)))]
+         (if (::dwsh/update-shapes-buffer state)
+           ;; If we're in the middle of a token propagation we wait until is finished to
+           ;; recalculate the text sizes. The shapes stay pending for that whole wait,
+           ;; since the per-shape debounce only marks them once dispatched.
+           (wrf/with-pending
+             :text-resize ids
+             (->> stream
+                  (rx/filter (ptk/type? ::dwsh/update-shapes-buffer-commit))
+                  (rx/take 1)
+                  (rx/mapcat (constantly resize-stream))))
+           resize-stream))))))
diff --git a/frontend/src/app/main/errors.cljs b/frontend/src/app/main/errors.cljs
index 5b7bb40f5b..de4ca4f5bd 100644
--- a/frontend/src/app/main/errors.cljs
+++ b/frontend/src/app/main/errors.cljs
@@ -8,7 +8,7 @@
   "Generic error handling"
   (:require
    [app.common.exceptions :as ex]
-   [app.common.pprint :as pp]
+   [app.common.time :as ct]
    [app.config :as cf]
    [app.main.data.auth :as da]
    [app.main.data.event :as ev]
@@ -134,13 +134,14 @@
       (with-out-str
         (println "Context:")
         (println "--------------------")
-        (println "Hint:    " (or (:hint data) (ex-message cause) "--"))
-        (println "Prof ID: " (str (or profile-id "--")))
-        (println "Team ID: " (str (or team-id "--")))
+        (println "Timestamp:" (ct/format-inst (ct/now) :rfc1123))
+        (println "Hint:     " (or (:hint data) (ex-message cause) "--"))
+        (println "Prof ID:  " (str (or profile-id "--")))
+        (println "Team ID:  " (str (or team-id "--")))
         (when-let [file-id (or (:file-id data) file-id)]
-          (println "File ID: " (str file-id)))
-        (println "Version: " (:full cf/version))
-        (println "HREF:    " (rt/get-current-href))
+          (println "File ID:  " (str file-id)))
+        (println "Version:  " (:full cf/version))
+        (println "HREF:     " (rt/get-current-href))
         (println)
 
         (println
@@ -149,7 +150,7 @@
 
         (println "Last events:")
         (println "--------------------")
-        (pp/pprint @st/last-events {:length 200})
+        (println (st/format-last-events))
         (println)))
     (catch :default cause
       (.error js/console "error on generating report" cause)
@@ -353,17 +354,17 @@
 ;; That are special case server-errors that should be treated
 ;; differently.
 
-(derive :not-found ::exceptional-state)
-(derive :bad-gateway ::exceptional-state)
-(derive :service-unavailable ::exceptional-state)
-(derive :nitrate-unavailable ::exceptional-state)
-
-(defmethod ptk/handle-error ::exceptional-state
+(defn- handle-exceptional-state
   [error]
   (when-let [instance (get error ::instance)]
     (ex/print-throwable instance :prefix "Exceptional State"))
   (ts/schedule #(st/emit! (rt/assign-exception error))))
 
+(defmethod ptk/handle-error :not-found [error] (handle-exceptional-state error))
+(defmethod ptk/handle-error :bad-gateway [error] (handle-exceptional-state error))
+(defmethod ptk/handle-error :service-unavailable [error] (handle-exceptional-state error))
+(defmethod ptk/handle-error :nitrate-unavailable [error] (handle-exceptional-state error))
+
 (defn- redirect-to-dashboard
   []
   (let [team-id    (:current-team-id @st/state)
diff --git a/frontend/src/app/main/fonts.cljs b/frontend/src/app/main/fonts.cljs
index 761e1dbc6f..b41a9d6135 100644
--- a/frontend/src/app/main/fonts.cljs
+++ b/frontend/src/app/main/fonts.cljs
@@ -6,10 +6,10 @@
 
 (ns app.main.fonts
   "Fonts management and loading logic."
-  (:require-macros [app.main.fonts :refer [preload-gfonts]])
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.fonts :as cfnt]
    [app.common.logging :as log]
    [app.common.types.text :as txt]
    [app.common.uri :as u]
@@ -25,27 +25,6 @@
 
 (log/set-level! :warn)
 
-(def google-fonts
-  (preload-gfonts "fonts/gfonts.2025.11.28.json"))
-
-(def local-fonts
-  [{:id "sourcesanspro"
-    :name "Source Sans Pro"
-    :family "sourcesanspro"
-    :variants
-    [{:id "200" :name "200" :weight "200" :style "normal" :suffix "extralight" :ttf-url "sourcesanspro-extralight.ttf"}
-     {:id "200italic" :name "200 Italic" :weight "200" :style "italic" :suffix "extralightitalic" :ttf-url "sourcesanspro-extralightitalic.ttf"}
-     {:id "300" :name "300" :weight "300" :style "normal" :suffix "light" :ttf-url "sourcesanspro-light.ttf"}
-     {:id "300italic" :name "300 Italic"  :weight "300" :style "italic" :suffix "lightitalic" :ttf-url "sourcesanspro-lightitalic.ttf"}
-     {:id "regular" :name "400" :weight "400" :style "normal" :ttf-url "sourcesanspro-regular.ttf"}
-     {:id "italic" :name "400 Italic" :weight "400" :style "italic" :ttf-url "sourcesanspro-italic.ttf"}
-     {:id "600" :name "600" :weight "600" :style "normal" :suffix "semibold" :ttf-url "sourcesanspro-semibold.ttf"}
-     {:id "600italic" :name "600 Italic" :weight "600" :style "italic" :suffix "semibolditalic" :ttf-url "sourcesanspro-semibolditalic.ttf"}
-     {:id "bold" :name "700" :weight "700" :style "normal" :ttf-url "sourcesanspro-bold.ttf"}
-     {:id "bolditalic" :name "700 Italic" :weight "700" :style "italic" :ttf-url "sourcesanspro-bolditalic.ttf"}
-     {:id "black" :name "900" :weight "900" :style "normal" :ttf-url "sourcesanspro-black.ttf"}
-     {:id "blackitalic" :name "900 Italic" :weight "900" :style "italic" :ttf-url "sourcesanspro-blackitalic.ttf"}]}])
-
 (defonce fontsdb (l/atom {}))
 (defonce fonts (l/atom []))
 
@@ -65,14 +44,33 @@
                  fonts (map #(assoc % :backend backend) fonts)]
              (merge db (d/index-by :id fonts))))))
 
-(register! :builtin local-fonts)
+(register! :builtin cfnt/local-fonts)
 
 (when (contains? cf/flags :google-fonts-provider)
-  (register! :google google-fonts))
+  (register! :google cfnt/catalog))
 
 (defn get-font-data [id]
   (get @fontsdb id))
 
+(defn installed?
+  "True when a font with `font-id` is currently registered in `fontsdb`."
+  [font-id]
+  (contains? @fontsdb font-id))
+
+(defn valid-default-font
+  "Return the remembered default-font attrs only when its font is still
+  installed in `fontsdb`; otherwise nil, so callers fall back to the built-in
+  default text attrs (Source Sans Pro).
+
+  A new text shape inherits the last-used font (`[:workspace-global
+  :default-font]`). If that font is gone (deleted, unavailable in the current
+  team, or never resolved), its attrs carry a missing/nil font-family, which
+  produces content that fails the backend `validate-shape` schema."
+  [default-font]
+  (when (and (some? default-font)
+             (installed? (:font-id default-font)))
+    default-font))
+
 (defn find-font-data [data]
   (d/seek
    (fn [font]
@@ -247,8 +245,7 @@
 
 (defn- process-gfont-css
   [css]
-  (let [base (u/join cf/public-uri "internal/gfonts/font")]
-    (str/replace css "https://fonts.gstatic.com/s" (dm/str base))))
+  (cfnt/gstatic->proxy-url css (u/join cf/public-uri "internal/gfonts/font")))
 
 (defn- fetch-gfont-css
   [url]
@@ -378,42 +375,12 @@
 
 (defn find-closest-variant
   "Find the closest font weight variant in `font` for `target-weight` with optional `target-style` match.
-  When exactly between two weights, choose the higher one."
+  When exactly between two weights, choose the higher one.
+
+  The algorithm lives in `app.common.fonts` so the headless exporter resolves the
+  same variant for the same text."
   [font target-weight target-style]
-  (when-let [target-weight (d/parse-integer target-weight)]
-    (let [variants (:variants font [])
-          result
-          (reduce
-           (fn [closest-match variant]
-             (let [weight (d/parse-integer (:weight variant))
-                   distance (abs (- target-weight weight))
-                   matches-style? (= target-style (:style variant))
-                   current {:variant variant
-                            :weight weight
-                            :distance distance}]
-               (cond
-                 ;; Exact match found
-                 (and (zero? distance)
-                      (if target-style matches-style? true))
-                 (reduced current)
-
-                 (nil? closest-match) current
-
-                 ;; Update best match if this variant is closer or equal distance but higher weight
-                 (or (< distance (:distance closest-match))
-                     (and (= distance (:distance closest-match))
-                          (> weight (:weight closest-match))))
-                 current
-
-                 ;; Same weight as the `closest-match` but the style matches `target-style`
-                 (and (= weight (:weight closest-match)) matches-style?)
-                 current
-
-                 :else
-                 closest-match)))
-           nil
-           variants)]
-      (:variant result))))
+  (cfnt/closest-variant (:variants font []) target-weight target-style))
 
 ;; Font embedding functions
 (defn get-node-fonts
diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 08d0a3ab7a..a73ae9b872 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -32,6 +32,9 @@
 (def profile
   (l/derived (l/key :profile) st/state))
 
+(def custom-shortcuts
+  (l/derived (fn [state] (get-in state [:profile :props :custom-shortcuts])) st/state))
+
 (def current-page-id
   (l/derived (l/key :current-page-id) st/state))
 
diff --git a/frontend/src/app/main/render.cljs b/frontend/src/app/main/render.cljs
index 0655545429..31108fa9f0 100644
--- a/frontend/src/app/main/render.cljs
+++ b/frontend/src/app/main/render.cljs
@@ -15,6 +15,7 @@
    ["react-dom/server" :as rds]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
    [app.common.files.helpers :as cfh]
    [app.common.geom.point :as gpt]
    [app.common.geom.rect :as grc]
@@ -59,6 +60,7 @@
    [rumext.v2 :as mf]))
 
 (def ^:const viewbox-decimal-precision 3)
+(def ^:const max-export-dimension 100000)
 (def ^:private default-color clr/canvas)
 
 (mf/defc background
@@ -82,12 +84,20 @@
       (let [bounds
             (->> root-objects
                  (map (partial gsb/get-object-bounds objects))
-                 (grc/join-rects))]
+                 (grc/join-rects))
+            bounds (-> bounds
+                       (update :x mth/finite 0)
+                       (update :y mth/finite 0)
+                       (update :width mth/finite 100000)
+                       (update :height mth/finite 100000))]
+        (when (or (> (:width bounds) max-export-dimension)
+                  (> (:height bounds) max-export-dimension)
+                  (> (+ (:x bounds) (:width bounds)) max-export-dimension)
+                  (> (+ (:y bounds) (:height bounds)) max-export-dimension))
+          (ex/raise :type :validation
+                    :code :export-area-too-large
+                    :hint "export area exceeds maximum allowed dimensions"))
         (-> bounds
-            (update :x mth/finite 0)
-            (update :y mth/finite 0)
-            (update :width mth/finite 100000)
-            (update :height mth/finite 100000)
             (grc/update-rect :position)
             (grc/fix-aspect-ratio aspect-ratio))))))
 
diff --git a/frontend/src/app/main/render_viewer_wasm.cljs b/frontend/src/app/main/render_viewer_wasm.cljs
index 45f7b83f73..1d4cd89506 100644
--- a/frontend/src/app/main/render_viewer_wasm.cljs
+++ b/frontend/src/app/main/render_viewer_wasm.cljs
@@ -9,8 +9,8 @@
   (:require
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
+   [app.common.render-wasm.wasm :as wasm]
    [app.render-wasm.api :as wasm.api]
-   [app.render-wasm.wasm :as wasm]
    [app.util.dom :as dom]
    [app.util.timers :as ts]
    [app.util.webapi :as webapi]
diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs
index a9f9451210..dcfac7bc22 100644
--- a/frontend/src/app/main/repo.cljs
+++ b/frontend/src/app/main/repo.cljs
@@ -276,12 +276,7 @@
   (let [default {:wait false :blob? false}]
     (send-export (merge default params))))
 
-(derive :upload-file-media-object ::multipart-upload)
-(derive :upload-chunk ::multipart-upload)
-(derive :update-profile-photo ::multipart-upload)
-(derive :update-team-photo ::multipart-upload)
-
-(defmethod cmd! ::multipart-upload
+(defn- multipart-upload
   [id params]
   (->> (http/send! {:method :post
                     :uri  (u/join cf/public-uri "api/main/methods/" (name id))
@@ -291,3 +286,8 @@
                     :body (http/form-data params)})
        (rx/map http/conditional-decode-transit)
        (rx/mapcat handle-response)))
+
+(defmethod cmd! :upload-file-media-object [id params] (multipart-upload id params))
+(defmethod cmd! :upload-chunk [id params] (multipart-upload id params))
+(defmethod cmd! :update-profile-photo [id params] (multipart-upload id params))
+(defmethod cmd! :update-team-photo [id params] (multipart-upload id params))
diff --git a/frontend/src/app/main/store.cljs b/frontend/src/app/main/store.cljs
index 160a16ac9d..8bdff34a65 100644
--- a/frontend/src/app/main/store.cljs
+++ b/frontend/src/app/main/store.cljs
@@ -7,6 +7,7 @@
 (ns app.main.store
   (:require
    [app.common.logging :as log]
+   [app.common.time :as ct]
    [app.util.object :as obj]
    [app.util.timers :as tm]
    [beicon.v2.core :as rx]
@@ -94,6 +95,7 @@
          (rx/filter #(not (contains? omitset %)))
          (rx/map str)
          (rx/pipe (rxo/distinct-contiguous))
+         (rx/map (fn [event] {:name event :t (ct/now)}))
          (rx/scan (fn [buffer event]
                     (cond-> (conj buffer event)
                       (> (count buffer) 50)
@@ -102,6 +104,30 @@
          (rx/subs! #(reset! buffer (vec %))))
     buffer))
 
+(defn format-last-events
+  "Render the `last-events` buffer as a multi-line string with the
+  wall-clock time of each event and the delta (ms) since the previous
+  entry. The delta column is right-padded to 10 chars so the event
+  names align. Useful for embedding in error reports."
+  ([] (format-last-events @last-events))
+  ([events]
+   (let [lines
+         (loop [prev-t nil
+                xs     (seq events)
+                out    (transient [])]
+           (if xs
+             (let [{:keys [name t]} (first xs)
+                   iso        (ct/format-inst t :iso)
+                   delta      (if prev-t
+                                (str "(+" (ct/diff-ms prev-t t) "ms)")
+                                "(+0ms)")
+                   delta-pad  (str/pad delta {:length 10 :type :right})]
+               (recur t
+                      (next xs)
+                      (conj! out (str iso "  " delta-pad "  " name))))
+             (persistent! out)))]
+     (str/join "\n" lines))))
+
 (defn emit!
   ([] nil)
   ([event]
diff --git a/frontend/src/app/main/streams.cljs b/frontend/src/app/main/streams.cljs
index 1fe8e55d9b..a2fce0a4e6 100644
--- a/frontend/src/app/main/streams.cljs
+++ b/frontend/src/app/main/streams.cljs
@@ -32,6 +32,17 @@
 (defonce workspace-selrect
   (rx/behavior-subject nil))
 
+(defn clear-transform-preview!
+  "Reset the interactive-transform preview behaviour-subjects. Controls
+  that drive a live preview (drag/resize/rotate, flex spacing handles,
+  grid track/cell gestures) set these via `set-wasm-modifiers` and clear
+  them at gesture end. If the control unmounts mid-gesture that clearing
+  never runs, so the stale selrect keeps displacing the DOM selection
+  overlay of the next selection. Call from gesture end / unmount cleanup."
+  []
+  (rx/push! wasm-modifiers nil)
+  (rx/push! workspace-selrect nil))
+
 ;; --- Derived streams
 
 (defonce ^:private pointer
diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs
index d3216efd70..58175de604 100644
--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -133,18 +133,21 @@
    ::mf/private true}
   [{:keys [team-id children]}]
   (mf/with-effect [team-id]
-    (st/emit! (dtm/initialize-team team-id))
-    (fn []
-      (st/emit! (dtm/finalize-team team-id))))
+    (when (uuid? team-id)
+      (st/emit! (dtm/initialize-team team-id))
+      (fn []
+        (st/emit! (dtm/finalize-team team-id)))))
 
-  (let [{:keys [permissions] :as team} (mf/deref refs/team)]
-    (when (= team-id (:id team))
-      [:> (mf/provider ctx/current-team-id) {:value team-id}
-       [:> (mf/provider ctx/permissions) {:value permissions}
-        [:> (mf/provider ctx/can-edit?) {:value (:can-edit permissions)}
-         ;; The `:key` is mandatory here because we want to reinitialize
-         ;; all dom tree instead of simple rerender.
-         [:* {:key (str team-id)} children]]]])))
+  (if-not (uuid? team-id)
+    nil
+    (let [{:keys [permissions] :as team} (mf/deref refs/team)]
+      (when (= team-id (:id team))
+        [:> (mf/provider ctx/current-team-id) {:value team-id}
+         [:> (mf/provider ctx/permissions) {:value permissions}
+          [:> (mf/provider ctx/can-edit?) {:value (:can-edit permissions)}
+           ;; The `:key` is mandatory here because we want to reinitialize
+           ;; all dom tree instead of simple rerender.
+           [:* {:key (str team-id)} children]]]]))))
 
 (mf/defc page*
   {::mf/props :obj
@@ -154,8 +157,7 @@
         props   (get profile :props)
         section (get data :name)
         team    (mf/deref refs/team)
-        nitrate-entry-active? (dnt/nitrate-entry-active?)
-
+        nitrate-entry-active? (dnt/nitrate-entry-popup-pending?)
 
         show-question-modal?
         (and (contains? cf/flags :onboarding)
@@ -200,7 +202,8 @@
         :settings-feedback
         :settings-subscription
         :settings-integrations
-        :settings-notifications)
+        :settings-notifications
+        :settings-shortcuts)
        (let [params (get params :query)
              error-report-id (some-> params :error-report-id uuid/parse*)]
          [:? [:> settings-page*
diff --git a/frontend/src/app/main/ui/alert.cljs b/frontend/src/app/main/ui/alert.cljs
index f03f963b63..46e825a078 100644
--- a/frontend/src/app/main/ui/alert.cljs
+++ b/frontend/src/app/main/ui/alert.cljs
@@ -10,8 +10,10 @@
    [app.main.data.modal :as modal]
    [app.main.store :as st]
    [app.main.ui.components.link :as lk]
+   [app.main.ui.ds.buttons.button :refer [button*]]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
    [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
-   [app.main.ui.icons :as deprecated-icon]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.keyboard :as k]
@@ -56,22 +58,25 @@
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-container)}
       [:div {:class (stl/css :modal-header)}
-       [:h2 {:class (stl/css :modal-title)} title]
-       [:button {:class (stl/css :modal-close-btn)
-                 :on-click accept-fn} deprecated-icon/close]]
+       [:> heading* {:level 2 :typography "headline-medium" :class (stl/css :modal-title)} title]
+       [:> icon-button* {:icon "close"
+                         :aria-label (tr "labels.close")
+                         :variant "ghost"
+                         :class (stl/css :modal-close-btn)
+                         :on-click accept-fn}]]
 
       [:div {:class (stl/css :modal-content)}
        (when (and (string? message) (not= message ""))
-         [:h3 {:class (stl/css :modal-msg)} message])
+         [:> heading* {:level 3 :typography "body-large" :class (stl/css :modal-msg)} message])
        (when (seq link-message)
-         [:h3 {:class (stl/css :modal-msg)}
+         [:> heading* {:level 3 :typography "body-large" :class (stl/css :modal-msg)}
           [:span (:before link-message)]
           [:> lk/link* {:action (:on-click link-message)
                         :class (stl/css :link)}
            (:text link-message)]
           [:span (:after link-message)]])
        (when (and (string? scd-message) (not= scd-message ""))
-         [:h3 {:class (stl/css :modal-scd-msg)} scd-message])
+         [:> heading* {:level 3 :typography "body-large" :class (stl/css :modal-scd-msg)} scd-message])
 
        (when (string? hint)
          [:> context-notification* {:level :info
@@ -80,10 +85,6 @@
 
       (when-not hide-actions?
         [:div {:class (stl/css :modal-footer)}
-         [:div {:class (stl/css :action-buttons)}
-          [:input {:class (stl/css-case :accept-btn true
-                                        :danger (= accept-style :danger)
-                                        :primary (= accept-style :primary))
-                   :type "button"
-                   :value accept-label
-                   :on-click accept-fn}]]])]]))
+         [:> button* {:variant (if (= accept-style :danger) "destructive" "primary")
+                      :on-click accept-fn}
+          accept-label]])]]))
diff --git a/frontend/src/app/main/ui/alert.scss b/frontend/src/app/main/ui/alert.scss
index 56b57be305..cf4b9e6c37 100644
--- a/frontend/src/app/main/ui/alert.scss
+++ b/frontend/src/app/main/ui/alert.scss
@@ -4,63 +4,63 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
 
 .modal-overlay {
-  @extend %modal-overlay-base;
-
-  &.transparent {
-    background-color: transparent;
-  }
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  inset: 0;
+  z-index: var(--z-index-set);
+  background-color: var(--color-overlay-default);
 }
 
 .modal-container {
-  @extend %modal-container-base;
+  position: relative;
+  padding: var(--sp-xxxl);
+  border-radius: $br-8;
+  background-color: var(--color-background-primary);
+  border: $b-2 solid var(--color-background-quaternary);
+  min-inline-size: px2rem(364);
+  min-block-size: $sz-192;
+  max-inline-size: $sz-512;
+  max-block-size: $sz-512;
 }
 
 .modal-header {
-  margin-bottom: deprecated.$s-24;
+  margin-block-end: var(--sp-xxl);
 }
 
 .modal-title {
-  @include deprecated.headline-medium-typography;
-
-  color: var(--modal-title-foreground-color);
+  color: var(--color-foreground-primary);
 }
 
 .modal-close-btn {
-  @extend %modal-close-btn-base;
+  position: absolute;
+  inset-block-start: var(--sp-s);
+  inset-inline-end: px2rem(6);
 }
 
 .modal-content {
-  @include deprecated.body-large-typography;
+  @include use-typography("body-large");
 
-  margin-bottom: deprecated.$s-24;
+  line-height: 1.5;
+  margin-block-end: var(--sp-xxl);
 }
 
-.action-buttons {
-  @extend %modal-action-btns;
-}
-
-.cancel-button {
-  @extend %modal-cancel-btn;
-}
-
-.accept-btn {
-  @extend %modal-accept-btn;
-
-  &.danger {
-    @extend %modal-danger-btn;
-  }
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
 }
 
 .modal-scd-msg,
-.modal-subtitle,
 .modal-msg {
-  @include deprecated.body-large-typography;
-
-  color: var(--modal-text-foreground-color);
   line-height: 1.5;
+  color: var(--color-foreground-secondary);
 }
 
 .link {
diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs
index e52cbff034..790d8b0a3e 100644
--- a/frontend/src/app/main/ui/auth.cljs
+++ b/frontend/src/app/main/ui/auth.cljs
@@ -14,7 +14,8 @@
    [app.main.ui.auth.recovery :refer [recovery-page*]]
    [app.main.ui.auth.recovery-request :refer [recovery-request-page*]]
    [app.main.ui.auth.register :refer [register-page* register-success-page* register-validate-page* terms-register*]]
-   [app.main.ui.icons :as deprecated-icon]
+   [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*] :as raw-svg]
+   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [rumext.v2 :as mf]))
@@ -45,13 +46,14 @@
     [:main {:class (stl/css-case
                     :auth-section true
                     :register is-register)}
-     [:h1 {:class (stl/css :logo-container)}
-      [:a {:href "#/" :title "Penpot" :class (stl/css :logo-btn)} deprecated-icon/logo]]
+     [:> heading* {:level 1 :typography "title-large" :class (stl/css :logo-container)}
+      [:a {:href "#/" :title "Penpot" :class (stl/css :logo-btn)}
+       [:> raw-svg* {:id raw-svg/penpot-logo
+                     :class (stl/css :logo)}]]]
      [:div {:class (stl/css :login-illustration)}
       [:img {:src "images/registration-illustration.png"}]]
 
      [:section {:class (stl/css :auth-content)}
-
       (case section
         :auth-register
         [:> register-page* {:params params}]
diff --git a/frontend/src/app/main/ui/auth.scss b/frontend/src/app/main/ui/auth.scss
index 11b209ff05..7d593ce4fa 100644
--- a/frontend/src/app/main/ui/auth.scss
+++ b/frontend/src/app/main/ui/auth.scss
@@ -4,53 +4,60 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
 
 .auth-section {
-  position: relative;
-  align-items: center;
-  background: var(--panel-background-color);
   display: grid;
-  gap: deprecated.$s-32;
+  align-items: center;
   grid-template-columns: repeat(5, 1fr);
-  height: 100%;
-  padding: deprecated.$s-32;
-  width: 100%;
+  gap: var(--sp-xxxl);
+  position: relative;
+  background: var(--color-background-primary);
+  block-size: 100%;
+  padding: var(--sp-xxxl);
+  inline-size: 100%;
   overflow: auto;
 
   @media (width <= 992px) {
     display: flex;
     justify-content: center;
   }
+}
 
-  &.register {
-    display: flex;
-    justify-content: center;
-    align-items: center;
+.auth-section.register {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
-    .login-illustration {
-      display: none;
-    }
-  }
+.auth-section.register .login-illustration {
+  display: none;
 }
 
 .logo-container {
-  position: absolute;
-  top: deprecated.$s-20;
-  left: deprecated.$s-20;
   display: flex;
   justify-content: flex-start;
-  width: deprecated.$s-120;
-  height: deprecated.$s-96;
-  margin-block-end: deprecated.$s-52;
+  position: absolute;
+  inset-block-start: var(--sp-xl);
+  inset-inline-start: var(--sp-xl);
+  inline-size: $sz-120;
+  block-size: $sz-96;
+  margin-block-end: px2rem(52);
+}
+
+.logo {
+  inline-size: $sz-120;
+  block-size: $sz-40;
+  fill: var(--color-foreground-primary);
 }
 
 .login-illustration {
   display: flex;
   justify-content: center;
   grid-column: 1 / 4;
-  width: 40vw;
-  height: auto;
+  inline-size: 40vw;
+  block-size: auto;
   justify-self: center;
 
   @media (width <= 992px) {
@@ -59,21 +66,13 @@
 }
 
 .auth-content {
-  grid-column: 4 / 6;
   display: grid;
   grid-template-rows: 1fr auto;
-  gap: deprecated.$s-24;
-  height: fit-content;
-  max-width: deprecated.$s-412;
-  padding-block-end: deprecated.$s-8;
+  grid-column: 4 / 6;
+  gap: var(--sp-xxl);
+  block-size: fit-content;
+  max-inline-size: px2rem(412);
+  padding-block-end: var(--sp-s);
   position: relative;
-  width: 100%;
-}
-
-.logo-btn {
-  svg {
-    width: deprecated.$s-120;
-    height: deprecated.$s-40;
-    fill: var(--main-icon-foreground);
-  }
+  inline-size: 100%;
 }
diff --git a/frontend/src/app/main/ui/auth/common.scss b/frontend/src/app/main/ui/auth/common.scss
index b5852fb094..951ea442a6 100644
--- a/frontend/src/app/main/ui/auth/common.scss
+++ b/frontend/src/app/main/ui/auth/common.scss
@@ -4,91 +4,120 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
 
 .auth-form-wrapper {
-  width: 100%;
+  inline-size: 100%;
   padding-block-end: 0;
   display: grid;
-  gap: deprecated.$s-12;
+  gap: var(--sp-m);
 
+  // Native <form> inside auth-form-wrapper — no class available
   form {
     display: flex;
     flex-direction: column;
-    gap: deprecated.$s-12;
-    margin-top: deprecated.$s-12;
+    gap: var(--sp-m);
+    margin-block-start: var(--sp-m);
   }
 }
 
 .auth-title-wrapper {
-  width: 100%;
+  inline-size: 100%;
   padding-block-end: 0;
   display: grid;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
 }
 
 .separator {
-  border-color: var(--modal-separator-background-color);
+  border-color: var(--color-background-quaternary);
   margin: 0;
 }
 
 .auth-title {
-  @include deprecated.big-title-typography;
+  @include use-typography("title-large");
 
-  color: var(--title-foreground-color-hover);
+  line-height: 1.2;
+  color: var(--color-foreground-primary);
 }
 
 .auth-subtitle {
-  @include deprecated.small-title-typography;
+  @include use-typography("title-small");
 
-  color: var(--title-foreground-color);
+  color: var(--color-foreground-secondary);
 }
 
 .auth-tagline {
-  @include deprecated.small-title-typography;
+  @include use-typography("title-small");
 
   margin: 0;
-  color: var(--title-foreground-color);
+  color: var(--color-foreground-secondary);
 }
 
 .form-field {
   --input-width: 100%;
-  --input-height: #{deprecated.$s-40};
+  --input-height: #{$sz-40};
   --input-min-width: 100%;
 }
 
 .buttons-stack {
   display: grid;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
 }
 
 .login-button,
 .login-ldap-button {
-  @extend %button-primary;
-  @include deprecated.uppercase-title-typography;
+  @include use-typography("headline-small");
 
-  height: deprecated.$s-40;
-  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  background-color: var(--color-accent-primary);
+  border: $b-1 solid var(--color-accent-primary);
+  color: var(--color-background-secondary);
+  border-radius: $br-8;
+  min-block-size: $sz-32;
+  block-size: $sz-40;
+  inline-size: 100%;
+
+  &:disabled {
+    background-color: var(--color-background-quaternary);
+    border: 1px solid var(--color-background-quaternary);
+    color: var(--color-foreground-disabled);
+    cursor: unset;
+  }
 }
 
 .go-back {
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-12;
+  gap: var(--sp-m);
   padding: 0;
   border-block-start: none;
 }
 
 .go-back-link {
-  @extend %button-secondary;
-  @include deprecated.uppercase-title-typography;
+  background: none;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: $br-8;
+  background-color: var(--color-background-tertiary);
+  border: $b-1 solid var(--color-background-tertiary);
+  color: var(--color-foreground-secondary);
 
-  height: deprecated.$s-40;
+  @include use-typography("headline-small");
+
+  block-size: $sz-40;
 }
 
 .links {
   display: grid;
-  gap: deprecated.$s-24;
+  gap: var(--sp-xxl);
 }
 
 .register,
@@ -97,7 +126,7 @@
 .demo-account {
   display: flex;
   justify-content: center;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
   padding: 0;
 }
 
@@ -105,10 +134,10 @@
 .account-text,
 .recovery-text,
 .demo-account-text {
-  @include deprecated.small-title-typography;
+  @include use-typography("title-small");
 
   text-align: right;
-  color: var(--title-foreground-color);
+  color: var(--color-foreground-secondary);
 }
 
 .register-link,
@@ -116,13 +145,13 @@
 .recovery-link,
 .forgot-pass-link,
 .demo-account-link {
-  @include deprecated.small-title-typography;
+  @include use-typography("title-small");
 
   text-align: left;
   background-color: transparent;
   border: none;
   display: inline;
-  color: var(--link-foreground-color);
+  color: var(--color-accent-primary);
 
   &:hover {
     text-decoration: underline;
@@ -137,35 +166,58 @@
 .submit-btn,
 .register-btn,
 .recover-btn {
-  @extend %button-primary;
-  @include deprecated.uppercase-title-typography;
+  @include use-typography("headline-small");
 
-  height: deprecated.$s-40;
-  width: 100%;
+  background: none;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--color-accent-primary);
+  border: $b-1 solid var(--color-accent-primary);
+  color: var(--color-background-secondary);
+  border-radius: $br-8;
+  min-block-size: $sz-32;
+  block-size: $sz-40;
+  inline-size: 100%;
+
+  &:disabled {
+    background-color: var(--color-background-quaternary);
+    border: $b-1 solid var(--color-background-quaternary);
+    color: var(--color-foreground-disabled);
+    cursor: unset;
+  }
 }
 
 .login-btn {
-  @include deprecated.small-title-typography;
+  @include use-typography("title-small");
 
   display: flex;
   align-items: center;
-  gap: deprecated.$s-6;
-  width: 100%;
-  border-radius: deprecated.$br-8;
-  background-color: var(--button-secondary-background-color-rest);
-  color: var(--button-foreground-color-focus);
+  gap: px2rem(6);
+  inline-size: 100%;
+  border-radius: $br-8;
+  background-color: var(--color-background-tertiary);
+  color: var(--color-foreground-primary);
 
   span {
-    padding-block-start: deprecated.$s-2;
+    padding-block-start: var(--sp-xxs);
   }
 
   &:hover {
-    color: var(--button-foreground-color-focus);
-    background-color: var(--button-secondary-background-color-hover);
+    color: var(--color-foreground-primary);
+    background-color: var(--color-background-quaternary);
+  }
+
+  &:disabled {
+    background-color: var(--color-background-quaternary);
+    border: 1px solid var(--color-background-quaternary);
+    color: var(--color-foreground-disabled);
+    cursor: unset;
   }
 }
 
 .auth-buttons {
   display: flex;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
 }
diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs
index 8b87825eed..c23cbf1c53 100644
--- a/frontend/src/app/main/ui/auth/login.cljs
+++ b/frontend/src/app/main/ui/auth/login.cljs
@@ -18,8 +18,8 @@
    [app.main.ui.components.button-link :as bl]
    [app.main.ui.components.forms :as fm]
    [app.main.ui.components.link :as lk]
+   [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*] :as raw-icons]
    [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
-   [app.main.ui.icons :as deprecated-icon]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
    [app.util.storage :as s]
@@ -210,6 +210,11 @@
            :class (stl/css :login-ldap-button)
            :on-click on-submit-ldap}])]]]))
 
+(defn raw-icon
+  [id]
+  (mf/html
+   [:> raw-svg* {:id id :class (stl/css :sso-icon)}]))
+
 (mf/defc login-sso-buttons*
   [{:keys [params] :as props}]
   (let [login-with-google (mf/use-fn (mf/deps params) #(login-with-sso "google" params))
@@ -220,25 +225,25 @@
     [:div {:class (stl/css :auth-buttons)}
      (when (contains? cf/flags :login-with-google)
        [:> bl/button-link* {:on-click login-with-google
-                            :icon deprecated-icon/brand-google
+                            :icon (raw-icon raw-icons/brand-google)
                             :label (tr "auth.login-with-google-submit")
                             :class (stl/css :login-btn :btn-google-auth)}])
 
      (when (contains? cf/flags :login-with-github)
        [:> bl/button-link* {:on-click login-with-github
-                            :icon deprecated-icon/brand-github
+                            :icon (raw-icon raw-icons/brand-github)
                             :label (tr "auth.login-with-github-submit")
                             :class (stl/css :login-btn :btn-github-auth)}])
 
      (when (contains? cf/flags :login-with-gitlab)
        [:> bl/button-link* {:on-click login-with-gitlab
-                            :icon deprecated-icon/brand-gitlab
+                            :icon (raw-icon raw-icons/brand-gitlab)
                             :label (tr "auth.login-with-gitlab-submit")
                             :class (stl/css :login-btn :btn-gitlab-auth)}])
 
      (when (contains? cf/flags :login-with-oidc)
        [:> bl/button-link* {:on-click login-with-oidc
-                            :icon deprecated-icon/brand-openid
+                            :icon (raw-icon raw-icons/brand-openid)
                             :label (or (not-empty cf/oidc-name) (tr "auth.login-with-oidc-submit"))
                             :class (stl/css :login-btn :btn-oidc-auth)}])]))
 
diff --git a/frontend/src/app/main/ui/auth/login.scss b/frontend/src/app/main/ui/auth/login.scss
index 136a0cd63a..5aa37946bb 100644
--- a/frontend/src/app/main/ui/auth/login.scss
+++ b/frontend/src/app/main/ui/auth/login.scss
@@ -5,3 +5,9 @@
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
 @use "./common";
+@use "ds/_utils.scss" as *;
+
+.sso-icon {
+  max-inline-size: px2rem(26);
+  max-block-size: px2rem(26);
+}
diff --git a/frontend/src/app/main/ui/auth/recovery.cljs b/frontend/src/app/main/ui/auth/recovery.cljs
index 5ee49525db..d91f200db9 100644
--- a/frontend/src/app/main/ui/auth/recovery.cljs
+++ b/frontend/src/app/main/ui/auth/recovery.cljs
@@ -28,8 +28,18 @@
       (= password-1 password-2))]])
 
 (defn- on-error
-  [_form _error]
-  (st/emit! (ntf/error (tr "errors.invalid-recovery-token"))))
+  [form error]
+  (let [{:keys [type code] :as edata} (ex-data error)]
+    (if (= [:validation :weak-password] [type code])
+      (let [details (:details edata)
+            options (when (seq details)
+                      (mapv tr details))]
+        (swap! form assoc-in [:extra-errors :password-1]
+               {:message (tr "errors.weak-password")
+                :options options}))
+
+      (let [msg (tr "errors.invalid-recovery-token")]
+        (st/emit! (ntf/error msg))))))
 
 (defn- on-success
   [_]
@@ -38,7 +48,7 @@
 
 (defn- on-submit
   [form _event]
-  (let [mdata  {:on-error on-error
+  (let [mdata  {:on-error (partial on-error form)
                 :on-success on-success}
         params {:token (get-in @form [:clean-data :token])
                 :password (get-in @form [:clean-data :password-2])}]
diff --git a/frontend/src/app/main/ui/auth/recovery.scss b/frontend/src/app/main/ui/auth/recovery.scss
index c524894ffc..4d0d4750bd 100644
--- a/frontend/src/app/main/ui/auth/recovery.scss
+++ b/frontend/src/app/main/ui/auth/recovery.scss
@@ -4,9 +4,8 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
 @use "./common";
 
 .submit-btn {
-  margin-top: deprecated.$s-16;
+  margin-block-start: var(--sp-l);
 }
diff --git a/frontend/src/app/main/ui/auth/recovery_request.scss b/frontend/src/app/main/ui/auth/recovery_request.scss
index d372b31df2..11d45df27b 100644
--- a/frontend/src/app/main/ui/auth/recovery_request.scss
+++ b/frontend/src/app/main/ui/auth/recovery_request.scss
@@ -4,17 +4,19 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/typography.scss" as *;
 @use "./common";
 
 .fields-row {
-  margin-bottom: deprecated.$s-8;
+  margin-block-end: var(--sp-s);
 }
 
 .notification-text-email {
-  @include deprecated.med-title-typography;
+  @include use-typography("title-medium");
 
-  font-size: deprecated.$fs-20;
-  color: var(--register-confirmation-color);
-  margin-inline: deprecated.$s-36;
+  line-height: 1.2;
+  color: var(--color-accent-primary);
+  margin-inline: $sz-36;
 }
diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs
index bb8966d12b..be5f3f280b 100644
--- a/frontend/src/app/main/ui/auth/register.cljs
+++ b/frontend/src/app/main/ui/auth/register.cljs
@@ -21,6 +21,7 @@
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.storage :as storage]
    [beicon.v2.core :as rx]
+   [cuerdas.core :as str]
    [rumext.v2 :as mf]))
 
 ;; --- PAGE: Register
@@ -103,8 +104,20 @@
                (st/emit! (ntf/error (tr "errors.email-already-exists")))
 
                [:validation :email-as-password]
-               (swap! form assoc-in [:errors :password]
-                      {:message (tr "errors.email-as-password")})
+               (st/emit! (ntf/error (tr "errors.email-as-password")))
+
+               [:validation :weak-password]
+               (let [details  (:details edata)
+                     items    (when (seq details)
+                                (->> details
+                                     (map #(str "<li>" (tr %) "</li>"))
+                                     (str/join "")))
+                     detail   (when items
+                                (str "<ul>" items "</ul>"))]
+                 (st/emit! (ntf/show {:content (tr "errors.weak-password")
+                                      :detail detail
+                                      :type :toast
+                                      :level :error})))
 
                (do
                  (when-let [explain (get edata :explain)]
diff --git a/frontend/src/app/main/ui/auth/register.scss b/frontend/src/app/main/ui/auth/register.scss
index 8261173e79..1b238cb353 100644
--- a/frontend/src/app/main/ui/auth/register.scss
+++ b/frontend/src/app/main/ui/auth/register.scss
@@ -4,92 +4,72 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
 @use "./common";
 
-.accept-terms-and-privacy-wrapper {
-  :global(a) {
-    color: var(--color-foreground-secondary);
-    font-weight: deprecated.$fw700;
-  }
-}
-
 .checkbox-terms-and-privacy,
 .checkbox-newsletter-updates {
   align-items: flex-start;
 }
 
 .register-form {
-  gap: deprecated.$s-24;
+  gap: var(--sp-xxl);
 }
 
 .register-success {
-  gap: deprecated.$s-24;
-
-  .auth-title {
-    @include deprecated.med-title-typography;
-  }
+  gap: var(--sp-xxl);
 }
 
-.notification-icon {
-  fill: var(--main-icon-foreground);
-  display: flex;
-  justify-content: center;
-  margin-bottom: deprecated.$s-32;
+.register-success .auth-title {
+  @include use-typography("title-medium");
 
-  svg {
-    width: deprecated.$s-92;
-    height: deprecated.$s-92;
-  }
+  line-height: 1.2;
 }
 
 .notification-text {
-  @include deprecated.body-medium-typography;
+  @include use-typography("body-medium");
 
-  color: var(--title-foreground-color);
+  color: var(--color-foreground-secondary);
 }
 
 .notification-text-email {
-  @include deprecated.med-title-typography;
+  @include use-typography("title-medium");
 
-  font-size: deprecated.$fs-20;
-  color: var(--register-confirmation-color);
-  margin-inline: deprecated.$s-36;
+  line-height: 1.2;
+  color: var(--color-accent-primary);
+  margin-inline: $sz-36;
 }
 
 .logo-btn {
-  height: deprecated.$s-40;
-
-  svg {
-    width: deprecated.$s-120;
-    height: deprecated.$s-40;
-    fill: var(--main-icon-foreground);
-  }
+  block-size: $sz-40;
 }
 
 .logo-container {
   display: flex;
   justify-content: flex-start;
-  width: deprecated.$s-120;
-  margin-block-end: deprecated.$s-24;
+  inline-size: $sz-120;
+  margin-block-end: var(--sp-xxl);
 }
 
 .terms-register {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   display: flex;
-  gap: deprecated.$s-4;
+  gap: var(--sp-xs);
   justify-content: center;
-  width: 100%;
+  inline-size: 100%;
 }
 
 .and-text {
-  border-bottom: deprecated.$s-1 solid transparent;
-  color: var(--title-foreground-color);
+  border-block-end: $b-1 solid transparent;
+  color: var(--color-foreground-secondary);
 }
 
 .auth-link {
-  color: var(--link-foreground-color);
+  color: var(--color-accent-primary);
 
   &:hover {
     text-decoration: underline;
diff --git a/frontend/src/app/main/ui/auth/verify_token.cljs b/frontend/src/app/main/ui/auth/verify_token.cljs
index d67be7e5eb..52a17761c6 100644
--- a/frontend/src/app/main/ui/auth/verify_token.cljs
+++ b/frontend/src/app/main/ui/auth/verify_token.cljs
@@ -9,6 +9,7 @@
    [app.config :as cf]
    [app.main.data.auth :as da]
    [app.main.data.common :as dcm]
+   [app.main.data.event :as ev]
    [app.main.data.notifications :as ntf]
    [app.main.data.profile :as du]
    [app.main.repo :as rp]
@@ -43,14 +44,21 @@
   (st/emit! (da/login-from-token tdata)))
 
 (defmethod handle-token :team-invitation
-  [{:keys [state team-id org-team-id organization-name invitation-token] :as tdata}]
+  [{:keys [state team-id organization-team-id organization-name invitation-token] :as tdata}]
+  (when-let [{:keys [origin props]} (:organization-invitation-audit tdata)]
+    (st/emit!
+     (ev/event
+      (assoc props
+             ::ev/name "accept-organization-invitation"
+             ::ev/origin origin))))
+
   (case state
     :created
-    (if org-team-id
+    (if organization-team-id
       (st/emit!
        (du/refresh-profile)
-       (dcm/go-to-dashboard-recent :team-id org-team-id)
-       (ntf/success (tr "auth.notifications.org-invitation-accepted" organization-name)))
+       (dcm/go-to-dashboard-recent :team-id organization-team-id)
+       (ntf/success (tr "auth.notifications.organization-invitation-accepted" organization-name)))
       (st/emit!
        (du/refresh-profile)
        (dcm/go-to-dashboard-recent :team-id team-id)
@@ -91,10 +99,10 @@
                   (st/emit!
                    (rt/nav :dashboard-recent {:team-id team-id}))
 
-                  (= :org-not-found code)
+                  (= :organization-not-found code)
                   (st/emit!
                    (rt/nav :dashboard-recent {:team-id team-id})
-                   (ntf/error (tr "errors.org-not-found")))
+                   (ntf/error (tr "errors.organization-not-found")))
 
                   (= :canceled-invitation code)
                   (let [profile (:profile @st/state)
diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs
index bf49f7acc0..4a7032b62c 100644
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -23,9 +23,9 @@
    [app.main.ui.components.dropdown :refer [dropdown]]
    [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.controls.checkbox :refer [checkbox*]]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
    [app.main.ui.hooks :as h]
-   [app.main.ui.icons :as deprecated-icon]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.keyboard :as kbd]
@@ -925,11 +925,9 @@
       (tr "labels.comment") " " [:span {:class (stl/css :grayed-text)} "#" (:seqn thread)]]
      [:div {:class (stl/css :floating-thread-header-right)}
       (when (some? thread)
-        [:div {:class (stl/css :checkbox-wrapper)
-               :title (tr "labels.comment.mark-as-solved")
-               :on-click toggle-resolved}
-         [:span {:class (stl/css-case :checkbox true
-                                      :global/checked (:is-resolved thread))} deprecated-icon/tick]])
+        [:> checkbox* {:class (stl/css :checkbox-wrapper)
+                       :checked (:is-resolved thread)
+                       :on-change toggle-resolved}])
       (when (= (:id profile) (:id owner))
         [:> icon-button* {:variant "ghost"
                           :aria-label (tr "labels.options")
diff --git a/frontend/src/app/main/ui/comments.scss b/frontend/src/app/main/ui/comments.scss
index fc47433711..a54ad7d48e 100644
--- a/frontend/src/app/main/ui/comments.scss
+++ b/frontend/src/app/main/ui/comments.scss
@@ -4,8 +4,11 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
 @use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
+@use "ds/mixins.scss" as *;
 
 .cursor-grabbing {
   cursor: grabbing;
@@ -20,20 +23,20 @@
 }
 
 .grayed-text {
-  color: var(--comment-subtitle-color);
+  color: var(--color-foreground-secondary);
 }
 
 .error-text {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   color: var(--color-foreground-error);
 }
 
 .location {
-  color: var(--comment-subtitle-color);
+  color: var(--color-foreground-secondary);
   display: flex;
   align-items: center;
-  gap: deprecated.$s-6;
+  gap: px2rem(6);
 }
 
 .location-icon {
@@ -41,15 +44,15 @@
 }
 
 .location-text {
-  @include deprecated.text-ellipsis;
+  @include text-ellipsis;
 }
 
 .author {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   display: flex;
   align-items: center;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
 }
 
 .author-identity {
@@ -57,64 +60,64 @@
 }
 
 .author-fullname {
-  @include deprecated.text-ellipsis;
+  @include text-ellipsis;
 
-  color: var(--comment-title-color);
+  color: var(--color-foreground-primary);
 }
 
 .author-timeago {
-  @include deprecated.text-ellipsis;
+  @include text-ellipsis;
 
-  color: var(--comment-subtitle-color);
+  color: var(--color-foreground-secondary);
 }
 
 .avatar {
   position: relative;
-  height: deprecated.$s-24;
-  width: deprecated.$s-24;
-  border-radius: deprecated.$br-circle;
+  block-size: $sz-24;
+  inline-size: $sz-24;
+  border-radius: $br-circle;
 }
 
 .avatar-lg {
-  height: deprecated.$s-32;
-  width: deprecated.$s-32;
+  block-size: $sz-32;
+  inline-size: $sz-32;
 }
 
 .avatar-read {
-  border: deprecated.$s-2 solid var(--color-background-tertiary);
+  border: $b-2 solid var(--color-background-tertiary);
 }
 
 .avatar-unread {
-  border: deprecated.$s-2 solid var(--color-accent-primary);
+  border: $b-2 solid var(--color-accent-primary);
 }
 
 .avatar-solved {
-  border: deprecated.$s-2 solid var(--color-background-tertiary);
+  border: $b-2 solid var(--color-background-tertiary);
 }
 
 .avatar-image {
-  border-radius: deprecated.$br-circle;
+  border-radius: $br-circle;
 }
 
 .avatar-text {
-  border-radius: deprecated.$br-circle;
-  height: 100%;
-  width: 100%;
+  border-radius: $br-circle;
+  block-size: 100%;
+  inline-size: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: deprecated.$fs-12;
+  font-size: 0.75rem;
   background-color: var(--color-background-quaternary);
-  color: var(--color-foreground-quaternary);
+  color: var(--color-foreground-primary);
 }
 
 .avatar-mask {
-  border-radius: deprecated.$br-circle;
+  border-radius: $br-circle;
   position: absolute;
-  height: 100%;
-  width: 100%;
-  left: 0;
-  top: 0;
+  block-size: 100%;
+  inline-size: 100%;
+  inset-inline-start: 0;
+  inset-block-start: 0;
 }
 
 .avatar-darken {
@@ -122,18 +125,18 @@
 }
 
 .cover {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   cursor: pointer;
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-8;
-  padding: deprecated.$s-20;
-  border-bottom: deprecated.$s-1 solid var(--color-background-quaternary);
+  gap: var(--sp-s);
+  padding: var(--sp-xl);
+  border-block-end: $b-1 solid var(--color-background-quaternary);
 }
 
 .item {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   color: var(--color-foreground-primary);
   overflow-wrap: break-word;
@@ -142,10 +145,10 @@
 }
 
 .replies {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   display: flex;
-  gap: deprecated.$s-8;
+  gap: var(--sp-s);
 }
 
 .replies-total {
@@ -157,26 +160,24 @@
 }
 
 .floating-preview-wrapper {
-  z-index: deprecated.$z-index-1;
+  z-index: 1;
   position: absolute;
   user-select: none;
   cursor: pointer;
   pointer-events: auto;
-  transform: translate(calc(-1 * deprecated.$s-16), calc(-1 * deprecated.$s-16));
+  transform: translate(calc(-1 * var(--sp-l)), calc(-1 * var(--sp-l)));
 }
 
 .floating-preview-bubble {
   z-index: initial;
 }
 
-// Sole pointer target of a floating bubble.
 .floating-preview-avatar {
   display: flex;
-  height: $sz-32;
-  width: $sz-32;
+  block-size: $sz-32;
+  inline-size: $sz-32;
 }
 
-// Expanded-cluster bubble: sits above regular bubbles and fans out on appearance.
 .floating-preview-expanded {
   z-index: 2;
   animation: comment-bubble-fan-out 0.18s ease-out;
@@ -194,22 +195,20 @@
   }
 }
 
-// Hovered bubble's preview card floats above every other bubble.
 .floating-preview-hovered {
   z-index: 10;
 }
 
-// Placeholder shown at the cluster center while its bubbles are fanned out.
 .floating-preview-ghost {
   z-index: 1;
   opacity: 0.6;
   pointer-events: none;
   animation: comment-ghost-appear 0.18s ease-out;
+}
 
-  .avatar {
-    border-style: dashed;
-    background-color: var(--comment-modal-background-color);
-  }
+.floating-preview-ghost .avatar {
+  border-style: dashed;
+  background-color: var(--color-background-primary);
 }
 
 @keyframes comment-ghost-appear {
@@ -222,10 +221,9 @@
   }
 }
 
-// Anchored to the wrapper origin and click-through, so hover stays bound to the avatar.
 .floating-thread-wrapper.floating-preview-hover-card {
-  top: 0;
-  left: 0;
+  inset-block-start: 0;
+  inset-inline-start: 0;
   pointer-events: none;
 }
 
@@ -233,14 +231,14 @@
   position: absolute;
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-12;
-  width: deprecated.$s-284;
-  padding: deprecated.$s-8 deprecated.$s-12 deprecated.$s-8 deprecated.$s-12;
+  gap: var(--sp-m);
+  inline-size: px2rem(284);
+  padding: var(--sp-s) var(--sp-m);
   pointer-events: auto;
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-2 solid var(--modal-border-color);
-  background-color: var(--comment-modal-background-color);
-  max-height: var(--comment-height);
+  border-radius: $br-8;
+  border: $b-2 solid var(--color-background-quaternary);
+  background-color: var(--color-background-primary);
+  max-block-size: var(--comment-height);
 
   --translate-x: 0%;
   --translate-y: 0%;
@@ -257,22 +255,22 @@
 }
 
 .floating-preview-displacement {
-  margin-left: calc(-1 * (deprecated.$s-12 + deprecated.$s-2));
-  margin-top: calc(-1 * (deprecated.$s-8 + deprecated.$s-2));
+  margin-inline-start: calc(-1 * (var(--sp-m) + $b-2));
+  margin-block-start: calc(-1 * (var(--sp-s) + $b-2));
 }
 
 .floating-thread-wrapper {
   position: absolute;
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-12;
-  width: deprecated.$s-284;
-  padding: deprecated.$s-8 deprecated.$s-12 deprecated.$s-8 deprecated.$s-12;
+  gap: var(--sp-m);
+  inline-size: px2rem(284);
+  padding: var(--sp-s) var(--sp-m);
   pointer-events: auto;
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-2 solid var(--modal-border-color);
-  background-color: var(--comment-modal-background-color);
-  max-height: var(--comment-height);
+  border-radius: $br-8;
+  border: $b-2 solid var(--color-background-quaternary);
+  background-color: var(--color-background-primary);
+  max-block-size: var(--comment-height);
 
   --translate-x: 0%;
   --translate-y: 0%;
@@ -293,11 +291,11 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: deprecated.$s-32;
+  block-size: $sz-32;
 }
 
 .floating-thread-header-left {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
   color: var(--color-foreground-primary);
 }
@@ -310,9 +308,9 @@
 .floating-thread-main {
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-16;
+  gap: var(--sp-l);
   overflow-y: auto;
-  padding-bottom: deprecated.$s-16;
+  padding-block-end: var(--sp-l);
 }
 
 .floating-thread-item-wrapper {
@@ -320,76 +318,115 @@
 }
 
 .floating-thread-item {
+  @include use-typography("body-small");
+
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-8;
-
-  @include deprecated.body-small-typography;
+  gap: var(--sp-s);
 }
 
-.checkbox-wrapper {
-  @include deprecated.flex-center;
-
-  width: deprecated.$s-16;
-  height: deprecated.$s-24;
-  margin-right: deprecated.$s-8;
-}
-
-.checkbox {
-  @extend %checkbox-icon;
-}
+// .checkbox-wrapper {
+//   margin-inline-end: var(--sp-s);
+// }
 
 .dropdown-menu {
-  @extend %dropdown-wrapper;
-
   position: absolute;
-  width: fit-content;
-  max-width: deprecated.$s-200;
-  right: deprecated.$s-32;
-  top: 0;
-  left: unset;
+  max-block-size: var(--menu-max-height, px2rem(300));
+  padding: $b-2;
+  margin: 0;
+  margin-block-start: $b-1;
+  border-radius: $br-8;
+  z-index: var(--z-index-dropdown);
+  overflow: hidden auto;
+  background-color: var(--menu-background-color);
+  color: var(--menu-foreground-color);
+  border: $b-2 solid var(--color-background-quaternary);
+  box-shadow: 0 0 var(--sp-m) 0 var(--color-shadow-dark);
+  max-inline-size: $sz-200;
+  inset-inline-end: var(--sp-xxxl);
+  inset-block-start: 0;
+  inline-size: fit-content;
+  inset-inline-start: unset;
 }
 
 .dropdown-menu-option {
-  @extend %dropdown-element-base;
+  @include use-typography("body-small");
+
+  display: flex;
+  align-items: center;
+  gap: var(--sp-s);
+  block-size: $sz-32;
+  padding: 0 var(--sp-s);
+  border-radius: $br-6;
+  cursor: pointer;
+  color: var(--menu-foreground-color-rest);
+
+  span {
+    justify-content: center;
+    align-items: center;
+    display: block;
+    max-inline-size: 99%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    svg {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      block-size: $sz-12;
+      inline-size: $sz-12;
+      stroke-width: 1.33px;
+      stroke: var(--icon-foreground);
+    }
+  }
+
+  &:hover {
+    background-color: var(--menu-background-color-hover);
+    color: var(--menu-foreground-color);
+
+    svg {
+      stroke: var(--menu-foreground-color-hover);
+    }
+  }
 }
 
 .form {
   display: flex;
   flex-direction: column;
-  gap: deprecated.$s-8;
-  max-height: calc(var(--comment-height) - deprecated.$s-132);
+  gap: var(--sp-s);
+  max-block-size: calc(var(--comment-height) - px2rem(132));
 }
 
 .form-buttons-wrapper {
   display: grid;
   grid-template-columns: 1fr auto auto;
   justify-content: flex-end;
-  gap: deprecated.$s-8;
-  margin-top: deprecated.$s-8;
+  gap: var(--sp-s);
+  margin-block-start: var(--sp-s);
 }
 
 .open-mentions-button {
   color: var(--color-foreground-secondary);
+}
 
-  &.is-toggled {
-    color: var(--color-accent-primary);
-  }
+.open-mentions-button.is-toggled {
+  color: var(--color-accent-primary);
 }
 
 .comments-mentions-choice {
   background: var(--color-background-tertiary);
-  border-radius: deprecated.$s-8;
+  border-radius: $br-8;
   border: none;
   display: flex;
   flex-direction: column;
-  left: calc(-1 * deprecated.$s-2);
-  margin-top: deprecated.$s-8;
+  inset-inline-start: calc(-1 * $b-2);
+  margin-block-start: var(--sp-s);
   overflow: hidden;
-  padding: deprecated.$s-2;
+  padding: $b-2;
   position: absolute;
-  top: 100%;
-  width: calc(100% + deprecated.$s-4);
+  inset-block-start: 100%;
+  inline-size: calc(100% + var(--sp-xs));
 }
 
 .comments-mentions-entry {
@@ -398,58 +435,58 @@
   grid-template-areas:
     "avatar name"
     "avatar email";
-  grid-template-columns: deprecated.$s-32 1fr;
-  column-gap: deprecated.$s-8;
-  margin: deprecated.$s-4 deprecated.$s-8;
-  padding: 0 deprecated.$s-4;
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-1 solid transparent;
+  grid-template-columns: $sz-32 1fr;
+  column-gap: var(--sp-s);
+  margin: var(--sp-xs) var(--sp-s);
+  padding: 0 var(--sp-xs);
+  border-radius: $br-8;
+  border: $b-1 solid transparent;
 
   &:hover {
     background: var(--color-background-quaternary);
   }
+}
 
-  .comments-mentions-avatar {
-    grid-area: avatar;
-    border-radius: 50%;
-  }
+.comments-mentions-entry .comments-mentions-avatar {
+  grid-area: avatar;
+  border-radius: 50%;
+}
 
-  .comments-mentions-name {
-    grid-area: name;
-    font-size: deprecated.$fs-12;
-    color: var(--color-foreground-primary);
-  }
+.comments-mentions-entry .comments-mentions-name {
+  grid-area: name;
+  font-size: 0.75rem;
+  color: var(--color-foreground-primary);
+}
 
-  .comments-mentions-email {
-    grid-area: email;
-    font-size: deprecated.$fs-12;
-    color: var(--color-foreground-secondary);
-  }
+.comments-mentions-entry .comments-mentions-email {
+  grid-area: email;
+  font-size: 0.75rem;
+  color: var(--color-foreground-secondary);
+}
 
-  &.is-selected {
-    border: 1px solid var(--color-accent-primary-muted);
-    background: var(--color-background-quaternary);
-  }
+.comments-mentions-entry.is-selected {
+  border: 1px solid var(--color-accent-primary-muted);
+  background: var(--color-background-quaternary);
 }
 
 .comment-input {
-  @include deprecated.body-small-typography;
+  @include use-typography("body-small");
 
-  background: var(--input-background-color);
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-1 solid var(--input-border-color);
-  color: var(--input-foreground-color);
-  height: deprecated.$s-36;
-  max-width: deprecated.$s-260;
+  background: var(--color-background-tertiary);
+  border-radius: $br-8;
+  border: $b-1 solid var(--color-background-tertiary);
+  color: var(--color-foreground-secondary);
+  block-size: $sz-36;
+  max-inline-size: px2rem(260);
   overflow-y: auto;
-  padding: deprecated.$s-8;
+  padding: var(--sp-s);
   resize: vertical;
-  width: 100%;
+  inline-size: 100%;
   white-space: pre-wrap;
   overflow-wrap: break-word;
 
   &:focus {
-    border: deprecated.$s-1 solid var(--input-border-color-active);
+    border: $b-1 solid var(--color-accent-primary);
     outline: none;
   }
 
@@ -477,7 +514,7 @@
 }
 
 .comments-mentions-empty {
-  font-size: deprecated.$fs-12;
+  font-size: 0.75rem;
   color: var(--color-foreground-secondary);
-  padding: deprecated.$s-6 deprecated.$s-8;
+  padding: px2rem(6) var(--sp-s);
 }
diff --git a/frontend/src/app/main/ui/components/button_link.cljs b/frontend/src/app/main/ui/components/button_link.cljs
index 3969012a90..67929b9ce6 100644
--- a/frontend/src/app/main/ui/components/button_link.cljs
+++ b/frontend/src/app/main/ui/components/button_link.cljs
@@ -7,7 +7,6 @@
 (ns app.main.ui.components.button-link
   (:require-macros [app.main.style :as stl])
   (:require
-   [app.common.data.macros :as dm]
    [app.util.keyboard :as kbd]
    [rumext.v2 :as mf]))
 
@@ -20,9 +19,9 @@
                          (when (fn? on-click)
                            (on-click event)))))]
     [:a
-     {:class (dm/str class " " (stl/css :button))
+     {:class [class  (stl/css :button)]
       :tab-index "0"
       :on-click on-click
       :on-key-down on-key-down}
-     [:span.logo icon]
+     icon
      label]))
diff --git a/frontend/src/app/main/ui/components/button_link.scss b/frontend/src/app/main/ui/components/button_link.scss
index e22ff1a9bf..895ed0bc97 100644
--- a/frontend/src/app/main/ui/components/button_link.scss
+++ b/frontend/src/app/main/ui/components/button_link.scss
@@ -4,24 +4,28 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
+@use "ds/typography.scss" as *;
 
 .button {
+  @include use-typography("body-small");
+
   appearance: none;
   align-items: center;
   border: none;
   cursor: pointer;
   display: flex;
-  font-family: "worksans", "vazirmatn", sans-serif;
   justify-content: center;
-  min-width: 25px;
-  padding: 0 1rem;
+  min-inline-size: px2rem(25);
+  padding-block: 0;
+  padding-inline: var(--sp-l);
   transition: all 0.4s;
   text-decoration: none !important;
-  height: 40px;
-
-  svg {
-    height: 20px;
-    width: 20px;
-  }
+  block-size: $sz-40;
+}
+
+.logo {
+  block-size: px2rem(20);
+  inline-size: px2rem(20);
 }
diff --git a/frontend/src/app/main/ui/components/color_bullet.scss b/frontend/src/app/main/ui/components/color_bullet.scss
index f7d76e4357..8ddd352a1a 100644
--- a/frontend/src/app/main/ui/components/color_bullet.scss
+++ b/frontend/src/app/main/ui/components/color_bullet.scss
@@ -4,103 +4,111 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
+@use "ds/mixins.scss" as *;
 
 .color-bullet {
   position: relative;
   display: flex;
   flex-direction: row;
-  width: var(--bullet-size, deprecated.$s-24);
-  height: var(--bullet-size, deprecated.$s-24);
-  min-width: var(--bullet-size, deprecated.$s-24);
-  min-height: var(--bullet-size, deprecated.$s-24);
-  border: deprecated.$s-2 solid var(--color-bullet-border-color);
-  border-radius: deprecated.$br-circle;
+  inline-size: var(--bullet-size, $sz-24);
+  block-size: var(--bullet-size, $sz-24);
+  min-inline-size: var(--bullet-size, $sz-24);
+  min-block-size: var(--bullet-size, $sz-24);
+  border: $b-2 solid var(--color-background-quaternary);
+  border-radius: $br-circle;
+}
 
-  &.grid-area {
-    grid-area: color;
-  }
+.color-bullet-wrapper {
+  display: flex;
+  flex-direction: row;
+  block-size: 100%;
+  inline-size: 100%;
+  clip-path: circle(50%);
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+}
 
-  &.mini {
-    width: var(--bullet-size, deprecated.$s-16);
-    height: var(--bullet-size, deprecated.$s-16);
-    min-width: var(--bullet-size, deprecated.$s-16);
-    min-height: var(--bullet-size, deprecated.$s-16);
-    margin-top: 0;
-    border: 1px solid var(--color-bullet-border-color);
-  }
+.grid-area {
+  grid-area: color;
+}
 
-  &.is-not-library-color {
-    overflow: hidden;
-    border-radius: deprecated.$br-8;
+.color-bullet.mini {
+  inline-size: var(--bullet-size, $sz-16);
+  block-size: var(--bullet-size, $sz-16);
+  min-inline-size: var(--bullet-size, $sz-16);
+  min-block-size: var(--bullet-size, $sz-16);
+  margin-block-start: 0;
+  border: $b-1 solid var(--color-background-quaternary);
+}
 
-    & .color-bullet-wrapper {
-      clip-path: none;
-    }
+.is-not-library-color {
+  overflow: hidden;
+  border-radius: $br-8;
+}
 
-    &.mini {
-      border-radius: deprecated.$br-4;
-    }
-  }
+.is-not-library-color .color-bullet-wrapper {
+  clip-path: none;
+}
 
-  &.is-gradient {
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAExJREFUSIljvHnz5n8GLEBNTQ2bMMOtW7ewiuNSz4RVlIpg1IKBt4Dx////WFMRqakFl/qhH0SjFhAELNRKLaNl0Qi2YLQsGrWAcgAA0gAgQPhT2rAAAAAASUVORK5CYII=")
-      left center;
-    background-color: var(--color-bullet-background-color);
-    transform: rotate(-90deg);
-  }
+.is-not-library-color.mini {
+  border-radius: $br-4;
+}
 
-  &.is-transparent {
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAExJREFUSIljvHnz5n8GLEBNTQ2bMMOtW7ewiuNSz4RVlIpg1IKBt4Dx////WFMRqakFl/qhH0SjFhAELNRKLaNl0Qi2YLQsGrWAcgAA0gAgQPhT2rAAAAAASUVORK5CYII=")
-      left center;
-    background-color: var(--color-bullet-background-color);
-  }
+.is-gradient {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAExJREFUSIljvHnz5n8GLEBNTQ2bMMOtW7ewiuNSz4RVlIpg1IKBt4Dx////WFMRqakFl/qhH0SjFhAELNRKLaNl0Qi2YLQsGrWAcgAA0gAgQPhT2rAAAAAASUVORK5CYII=")
+    left center;
+  background-color: var(--color-static-white);
+  transform: rotate(-90deg);
+}
 
-  .color-bullet-wrapper {
-    display: flex;
-    flex-direction: row;
-    height: 100%;
-    width: 100%;
-    clip-path: circle(50%);
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-  }
+.is-transparent {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAExJREFUSIljvHnz5n8GLEBNTQ2bMMOtW7ewiuNSz4RVlIpg1IKBt4Dx////WFMRqakFl/qhH0SjFhAELNRKLaNl0Qi2YLQsGrWAcgAA0gAgQPhT2rAAAAAASUVORK5CYII=")
+    left center;
+  background-color: var(--color-static-white);
+}
 
-  .color-bullet-wrapper > * {
-    width: 100%;
-    height: 100%;
-    background-color: var(--color-bullet-background-color);
-  }
+.color-bullet .color-bullet-wrapper > * {
+  inline-size: 100%;
+  block-size: 100%;
+  background-color: var(--color-static-white);
+}
 
-  &:hover:not(.read-only) {
-    border: deprecated.$s-2 solid var(--color-bullet-border-color-selected);
-  }
+.color-bullet:hover:not(.read-only) {
+  border: $b-2 solid var(--color-accent-primary);
 }
 
 .color-text {
-  @include deprecated.two-line-text-ellipsis;
-  @include deprecated.body-small-typography;
+  @include two-line-text-ellipsis;
+  @include use-typography("body-small");
 
-  width: deprecated.$s-80;
+  inline-size: px2rem(80);
   text-align: center;
-  margin-top: deprecated.$s-2;
-  max-height: deprecated.$s-28;
-  color: var(--palette-text-color);
+  margin-block-start: var(--sp-xxs);
+  max-block-size: px2rem(28);
+  color: var(--color-foreground-secondary);
+}
 
-  &.small-text {
-    @include deprecated.text-ellipsis;
+.color-text.small-text {
+  @include text-ellipsis;
 
-    max-height: deprecated.$s-16;
-  }
+  max-block-size: $sz-16;
 }
 
 .big-text {
-  @include deprecated.inspect-value;
-  @include deprecated.two-line-text-ellipsis;
+  @include use-typography("body-small");
+  @include two-line-text-ellipsis;
 
+  display: inline-block;
+  inline-size: fit-content;
+  padding: 0;
+  margin: 0;
   line-height: 1;
-  color: var(--palette-text-color);
+  color: var(--color-foreground-secondary);
   text-align: center;
 }
 
@@ -109,5 +117,5 @@
 }
 
 .color-row-name {
-  color: var(--menu-foreground-color);
+  color: var(--color-foreground-primary);
 }
diff --git a/frontend/src/app/main/ui/components/context_menu_a11y.cljs b/frontend/src/app/main/ui/components/context_menu_a11y.cljs
index 75c97554ce..e2e824c19e 100644
--- a/frontend/src/app/main/ui/components/context_menu_a11y.cljs
+++ b/frontend/src/app/main/ui/components/context_menu_a11y.cljs
@@ -18,6 +18,7 @@
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.keyboard :as kbd]
    [app.util.timers :as tm]
+   [beicon.v2.core :as rx]
    [rumext.v2 :as mf]))
 
 (def ^:private xf:options
@@ -229,8 +230,11 @@
         (partial ug/unlisten "penpot:context-menu:open" on-event)))
 
     (mf/with-effect [ids]
-      (tm/schedule-on-idle
-       #(dom/focus! (dom/get-element (first ids)))))
+      (let [handle (tm/schedule
+                    (fn []
+                      (some-> (dom/get-element (first ids))
+                              (dom/focus!))))]
+        #(rx/dispose! handle)))
 
     (when (some? levels)
       [:> dropdown-content* props
diff --git a/frontend/src/app/main/ui/components/dropdown.cljs b/frontend/src/app/main/ui/components/dropdown.cljs
index 894d9ef204..4a0a1b0590 100644
--- a/frontend/src/app/main/ui/components/dropdown.cljs
+++ b/frontend/src/app/main/ui/components/dropdown.cljs
@@ -11,6 +11,7 @@
    [app.util.globals :as globals]
    [app.util.keyboard :as kbd]
    [app.util.timers :as tm]
+   [beicon.v2.core :as rx]
    [goog.events :as events]
    [rumext.v2 :as mf])
   (:import goog.events.EventType))
@@ -45,9 +46,10 @@
         (fn []
           (let [keys [(events/listen globals/document EventType.CLICK on-click)
                       (events/listen globals/document EventType.CONTEXTMENU on-click)
-                      (events/listen globals/document EventType.KEYUP on-keyup)]]
-            (tm/schedule #(mf/set-ref-val! listening-ref true))
-            #(run! events/unlistenByKey keys)))]
+                      (events/listen globals/document EventType.KEYUP on-keyup)]
+                timer (tm/schedule #(mf/set-ref-val! listening-ref true))]
+            #(do (rx/dispose! timer)
+                 (run! events/unlistenByKey keys))))]
 
     (mf/use-effect on-mount)
     children))
diff --git a/frontend/src/app/main/ui/components/forms.cljs b/frontend/src/app/main/ui/components/forms.cljs
index 89eaa3e700..73632ea4eb 100644
--- a/frontend/src/app/main/ui/components/forms.cljs
+++ b/frontend/src/app/main/ui/components/forms.cljs
@@ -10,6 +10,7 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.main.ui.components.select :as cs]
+   [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as deprecated-icon]
    [app.util.dom :as dom]
    [app.util.forms :as fm]
@@ -179,11 +180,17 @@
 
       (cond
         (and touched? (:message error) show-error)
-        (let [message (:message error)]
+        (let [message (:message error)
+              options (:options error)]
           [:div {:id (dm/str "error-" input-name)
                  :class (stl/css :error)
                  :data-testid (dm/str data-testid "-error")}
-           message])
+           message
+           (when (seq options)
+             [:ul {:class (stl/css :error-options)}
+              (for [opt options]
+                [:li {:key opt
+                      :class (stl/css :error-option)} opt])])])
 
         ;; FIXME: DEPRECATED
         (and touched? (:code error) show-error)
@@ -449,3 +456,190 @@
                         (on-submit form event))))]
     [:> (mf/provider form-ctx) {:value form}
      [:form {:class class :on-submit on-submit'} children]]))
+
+(defn- conj-dedup
+  "A helper that adds item into a vector and removes possible
+  duplicates. This is not very efficient implementation but is ok for
+  handling form input that will have a small number of items."
+  [coll item]
+  (into [] (distinct) (conj coll item)))
+
+(mf/defc multi-input
+  [{:keys [form label class trim valid-item-fn caution-item-fn on-submit] :as props}]
+  (let [form       (or form (mf/use-ctx form-ctx))
+        input-name (get props :name)
+        touched?   (get-in @form [:touched input-name])
+        error      (get-in @form [:errors input-name])
+        focus?     (mf/use-state false)
+
+        auto-focus?  (get props :auto-focus? false)
+
+        items      (mf/use-state
+                    (fn []
+                      (let [initial (get-in @form [:data input-name])]
+                        (if (or (vector? initial)
+                                (set? initial))
+                          (mapv (fn [val]
+                                  {:text val
+                                   :valid (valid-item-fn val)
+                                   :caution (caution-item-fn val)})
+                                initial)
+                          []))))
+
+        value      (mf/use-state "")
+        result     (hooks/use-equal-memo @items)
+
+        empty?     (and (str/empty? @value)
+                        (zero? (count @items)))
+
+        klass (str (get props :class) " "
+                   (stl/css-case
+                    :focus          @focus?
+                    :valid          (and touched? (not error))
+                    :invalid        (and touched? error)
+                    :empty          empty?
+                    :custom-multi-input true))
+
+        in-klass (str class " "
+                      (stl/css-case
+                       :inside-input true
+                       :no-padding   (pos? (count @items))
+                       :invalid (and (some? valid-item-fn)
+                                     touched?
+                                     (not (str/empty? @value))
+                                     (not (valid-item-fn @value)))))
+
+        on-focus
+        (mf/use-fn #(reset! focus? true))
+
+        on-change
+        (mf/use-fn
+         (fn [event]
+           (let [content (-> event dom/get-target dom/get-input-value)]
+             (reset! value content))))
+
+        update-form!
+        (mf/use-fn
+         (mf/deps form)
+         (fn [items]
+           (let [value (str/join " " (map :text items))]
+             (fm/update-input-value! form input-name value))))
+
+        on-key-down
+        (mf/use-fn
+         (mf/deps @value)
+         (fn [event]
+           (let [val (cond-> @value trim str/trim)]
+             (cond
+               (or (kbd/enter? event) (kbd/comma? event) (kbd/space? event))
+               (do
+                 (dom/prevent-default event)
+                 (dom/stop-propagation event)
+
+                 ;; Once enter/comma is pressed we mark it as touched
+                 (swap! form assoc-in [:touched input-name] true)
+
+                 ;; Empty values means "submit" the form (whent some items have been added
+                 (when (and (kbd/enter? event) (str/empty? @value) (not-empty @items))
+                   (when (fn? on-submit)
+                     (on-submit form event)))
+
+                 ;; If we have a string in the input we add it only if valid
+                 (when (and (valid-item-fn val) (not (str/empty? @value)))
+                   (reset! value "")
+
+                   ;; Once added the form is back as "untouched"
+                   (swap! form assoc-in [:touched input-name] false)
+
+                   ;; This split will allow users to copy comma/space separated values of emails
+                   (doseq [val (str/split val #",|\s+")]
+                     (swap! items conj-dedup {:text (str/trim val)
+                                              :valid (valid-item-fn val)
+                                              :caution (caution-item-fn val)}))))
+
+               (and (kbd/backspace? event) (str/empty? @value))
+               (do
+                 (dom/prevent-default event)
+                 (dom/stop-propagation event)
+                 (swap! items (fn [items] (if (c/empty? items) items (pop items)))))))))
+
+        on-paste
+        (mf/use-fn
+         (fn [event]
+           (when-let [clipboard-data (.-clipboardData event)]
+             (let [paste-data (.getData clipboard-data "text")]
+               (when (and (string? paste-data)
+                          (re-find #"[,\s]" paste-data))
+                 (dom/prevent-default event)
+                 (dom/stop-propagation event)
+
+                 ;; Mark as touched
+                 (swap! form assoc-in [:touched input-name] true)
+
+                 ;; Split pasted text by commas and/or whitespace, add each valid part
+                 (let [parts (->> (str/split paste-data #",|\s+")
+                                  (map str/trim)
+                                  (remove str/empty?))]
+                   (doseq [part parts]
+                     (when (valid-item-fn part)
+                       (swap! items conj-dedup {:text part
+                                                :valid true
+                                                :caution (caution-item-fn part)})))
+
+                   ;; Reset input value and mark as untouched after successful paste
+                   (reset! value "")
+                   (swap! form assoc-in [:touched input-name] false)))))))
+
+        on-blur
+        (mf/use-fn
+         (fn [_]
+           (reset! focus? false)
+           (when-not (get-in @form [:touched input-name])
+             (swap! form assoc-in [:touched input-name] true))))
+
+        remove-item!
+        (mf/use-fn
+         (fn [item]
+           (swap! items #(into [] (remove (fn [x] (= x item))) %))))
+
+        manage-key-down
+        (mf/use-fn
+         (fn [item event]
+           (when (kbd/enter? event)
+             (remove-item! item))))]
+
+    (mf/with-effect [result @value]
+      (let [val (cond-> @value trim str/trim)
+            values (conj-dedup result {:text val :valid (valid-item-fn val)})
+            values (filterv #(:valid %) values)]
+
+        (update-form! values)))
+
+    [:div {:class klass}
+     [:input {:id (name input-name)
+              :name (name input-name)
+              :class in-klass
+              :type "text"
+              :auto-focus auto-focus?
+              :on-focus on-focus
+              :on-blur on-blur
+              :on-key-down on-key-down
+              :on-paste on-paste
+              :value @value
+              :on-change on-change
+              :placeholder (when empty? label)}]
+     [:label {:for (name input-name)} label]
+
+     (when-let [items (seq @items)]
+       [:div {:class (stl/css :selected-items)}
+        (for [item items]
+          [:div {:class (stl/css :selected-item)
+                 :key (:text item)
+                 :tab-index "0"
+                 :on-key-down (partial manage-key-down item)}
+           [:span {:class (stl/css-case :around true
+                                        :invalid (not (:valid item))
+                                        :caution (:caution item))}
+            [:span {:class (stl/css :text)} (:text item)]
+            [:button {:class (stl/css :icon)
+                      :on-click #(remove-item! item)} deprecated-icon/close]]])])]))
diff --git a/frontend/src/app/main/ui/components/forms.scss b/frontend/src/app/main/ui/components/forms.scss
index 30901f43ec..a9aed792e3 100644
--- a/frontend/src/app/main/ui/components/forms.scss
+++ b/frontend/src/app/main/ui/components/forms.scss
@@ -168,6 +168,16 @@
   font-size: deprecated.$fs-14;
 }
 
+.error-options {
+  margin-block: var(--sp-xxs);
+  padding-inline-start: var(--sp-l);
+  list-style-type: disc;
+}
+
+.error-option {
+  margin-block: var(--sp-xxs);
+}
+
 .hint {
   @include t.use-typography("body-small");
 
diff --git a/frontend/src/app/main/ui/components/org_avatar.cljs b/frontend/src/app/main/ui/components/org_avatar.cljs
deleted file mode 100644
index 4a9829de22..0000000000
--- a/frontend/src/app/main/ui/components/org_avatar.cljs
+++ /dev/null
@@ -1,41 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.main.ui.components.org-avatar
-  (:require-macros [app.main.style :as stl])
-  (:require
-   [app.common.data :as d]
-   [rumext.v2 :as mf]))
-
-(mf/defc org-avatar*
-  [{:keys [org size]}]
-  (let [name         (:name org)
-        custom-photo (:custom-photo org)
-        avatar-bg    (:avatar-bg-url org)
-        initials     (d/get-initials name)]
-
-    (if custom-photo
-      [:img {:src     custom-photo
-             :class   (stl/css-case :org-avatar true
-                                    :org-avatar-custom true
-                                    :org-avatar-xxxl (= size "xxxl")
-                                    :org-avatar-xxl (= size "xxl")
-                                    :org-avatar-xl (= size "xl"))
-             :alt     name}]
-      [:div {:class       (stl/css-case :org-avatar true
-                                        :org-avatar-xxxl (= size "xxxl")
-                                        :org-avatar-xxl (= size "xxl")
-                                        :org-avatar-xl (= size "xl"))
-             :aria-hidden "true"}
-       [:img {:src   avatar-bg
-              :class (stl/css :org-avatar-bg)
-              :alt   ""}]
-       (when (seq initials)
-         [:span {:class (stl/css-case :org-avatar-initials true
-                                      :size-initials-xxxl (= size "xxxl")
-                                      :size-initials-xxl (= size "xxl")
-                                      :size-initials-xxl (= size "xl"))} ;; Keep the initials as xxl to make them legible
-          initials])])))
diff --git a/frontend/src/app/main/ui/components/organization_avatar.cljs b/frontend/src/app/main/ui/components/organization_avatar.cljs
new file mode 100644
index 0000000000..8b883ca56d
--- /dev/null
+++ b/frontend/src/app/main/ui/components/organization_avatar.cljs
@@ -0,0 +1,41 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.ui.components.organization-avatar
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.data :as d]
+   [rumext.v2 :as mf]))
+
+(mf/defc organization-avatar*
+  [{:keys [organization size]}]
+  (let [name         (:name organization)
+        custom-photo (:custom-photo organization)
+        avatar-bg    (:avatar-bg-url organization)
+        initials     (d/get-initials name)]
+
+    (if custom-photo
+      [:img {:src     custom-photo
+             :class   (stl/css-case :organization-avatar true
+                                    :organization-avatar-custom true
+                                    :organization-avatar-xxxl (= size "xxxl")
+                                    :organization-avatar-xxl (= size "xxl")
+                                    :organization-avatar-xl (= size "xl"))
+             :alt     name}]
+      [:div {:class       (stl/css-case :organization-avatar true
+                                        :organization-avatar-xxxl (= size "xxxl")
+                                        :organization-avatar-xxl (= size "xxl")
+                                        :organization-avatar-xl (= size "xl"))
+             :aria-hidden "true"}
+       [:img {:src   avatar-bg
+              :class (stl/css :organization-avatar-bg)
+              :alt   ""}]
+       (when (seq initials)
+         [:span {:class (stl/css-case :organization-avatar-initials true
+                                      :size-initials-xxxl (= size "xxxl")
+                                      :size-initials-xxl (= size "xxl")
+                                      :size-initials-xxl (= size "xl"))} ;; Keep the initials as xxl to make them legible
+          initials])])))
diff --git a/frontend/src/app/main/ui/components/org_avatar.scss b/frontend/src/app/main/ui/components/organization_avatar.scss
similarity index 84%
rename from frontend/src/app/main/ui/components/org_avatar.scss
rename to frontend/src/app/main/ui/components/organization_avatar.scss
index 4e9367c13c..4bc1d991d1 100644
--- a/frontend/src/app/main/ui/components/org_avatar.scss
+++ b/frontend/src/app/main/ui/components/organization_avatar.scss
@@ -8,35 +8,35 @@
 @use "ds/colors.scss" as *;
 @use "ds/_utils.scss" as *;
 
-.org-avatar {
+.organization-avatar {
   position: relative;
   overflow: hidden;
   flex-shrink: 0;
 }
 
-.org-avatar-custom {
+.organization-avatar-custom {
   object-fit: cover;
 }
 
-.org-avatar-xxxl {
+.organization-avatar-xxxl {
   width: px2rem(30);
   height: px2rem(30);
   border-radius: px2rem(6);
 }
 
-.org-avatar-xxl {
+.organization-avatar-xxl {
   width: var(--sp-xxl);
   height: var(--sp-xxl);
   border-radius: px2rem(5);
 }
 
-.org-avatar-xl {
+.organization-avatar-xl {
   width: px2rem(22);
   height: px2rem(22);
   border-radius: var(--sp-xs);
 }
 
-.org-avatar-bg {
+.organization-avatar-bg {
   position: absolute;
   inset: 0;
   width: 100%;
@@ -44,7 +44,7 @@
   object-fit: cover;
 }
 
-.org-avatar-initials {
+.organization-avatar-initials {
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/frontend/src/app/main/ui/components/search_bar.scss b/frontend/src/app/main/ui/components/search_bar.scss
index 075e176405..59f37812b2 100644
--- a/frontend/src/app/main/ui/components/search_bar.scss
+++ b/frontend/src/app/main/ui/components/search_bar.scss
@@ -10,7 +10,7 @@
   display: flex;
   gap: deprecated.$s-2;
   height: deprecated.$s-32;
-  width: 100%;
+  flex-grow: 1;
   border-radius: deprecated.$br-8;
   background-color: var(--search-bar-background-color);
 }
diff --git a/frontend/src/app/main/ui/confirm.cljs b/frontend/src/app/main/ui/confirm.cljs
index 8e0fef9256..66621e0d07 100644
--- a/frontend/src/app/main/ui/confirm.cljs
+++ b/frontend/src/app/main/ui/confirm.cljs
@@ -12,6 +12,7 @@
    [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
    [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
+   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
    [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
@@ -72,18 +73,18 @@
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-container)}
       [:div {:class (stl/css :modal-header)}
-       [:h2 {:class (stl/css :modal-title)} title]
-       [:div {:class (stl/css :modal-close-btn)}
-        [:> icon-button* {:variant "ghost"
-                          :aria-label (tr "labels.close")
-                          :on-click cancel-fn
-                          :icon i/close}]]]
+       [:> heading* {:level 2 :typography "headline-medium" :class (stl/css :modal-title)} title]
+       [:> icon-button* {:variant "ghost"
+                         :aria-label (tr "labels.close")
+                         :on-click cancel-fn
+                         :icon i/close
+                         :class (stl/css :modal-close-btn)}]]
 
       [:div {:class (stl/css :modal-content)}
        (when (and (string? message) (not= message ""))
-         [:h3 {:class (stl/css :modal-msg)} message])
+         [:> heading* {:level 3 :typography "body-large" :class (stl/css :modal-msg)} message])
        (when (and (string? scd-message) (not= scd-message ""))
-         [:h3 {:class (stl/css :modal-scd-msg)} scd-message])
+         [:> heading* {:level 3 :typography "body-large" :class (stl/css :modal-scd-msg)} scd-message])
        (when (string? hint)
          [:> context-notification* {:level (or hint-level :info)
                                     :appearance :ghost}
@@ -105,12 +106,11 @@
                (:name item)]])]])]
 
       [:div {:class (stl/css :modal-footer)}
-       [:div {:class (stl/css :action-buttons)}
-        (when-not (= cancel-label :omit)
-          [:> button* {:variant "secondary"
-                       :on-click cancel-fn}
-           cancel-label])
-        [:> button* {:variant (cond (= accept-style :danger)  "destructive"
-                                    (= accept-style :primary) "primary")
-                     :on-click accept-fn}
-         accept-label]]]]]))
+       (when-not (= cancel-label :omit)
+         [:> button* {:variant "secondary"
+                      :on-click cancel-fn}
+          cancel-label])
+       [:> button* {:variant (cond (= accept-style :danger)  "destructive"
+                                   (= accept-style :primary) "primary")
+                    :on-click accept-fn}
+        accept-label]]]]))
diff --git a/frontend/src/app/main/ui/confirm.scss b/frontend/src/app/main/ui/confirm.scss
index 0c7d5033da..afcffa7a48 100644
--- a/frontend/src/app/main/ui/confirm.scss
+++ b/frontend/src/app/main/ui/confirm.scss
@@ -4,68 +4,84 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/typography.scss" as *;
 
 .modal-overlay {
-  @extend %modal-overlay-base;
-
-  &.transparent {
-    background-color: transparent;
-  }
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  inset: 0;
+  z-index: var(--z-index-set);
+  background-color: var(--color-overlay-default);
 }
 
 .modal-container {
-  @extend %modal-container-base;
-
+  position: relative;
+  padding: var(--sp-xxxl);
+  border-radius: $br-8;
+  background-color: var(--color-background-primary);
+  border: $b-2 solid var(--color-background-quaternary);
+  min-inline-size: px2rem(364);
+  min-block-size: $sz-192;
+  max-inline-size: $sz-512;
+  max-block-size: $sz-512;
   display: flex;
   flex-direction: column;
   gap: var(--sp-xxl);
 }
 
 .modal-title {
-  @include deprecated.headline-medium-typography;
-
-  color: var(--modal-title-foreground-color);
+  color: var(--color-foreground-primary);
 }
 
 .modal-close-btn {
   position: absolute;
-  top: var(--sp-m);
-  right: var(--sp-m);
+  inset-block-start: var(--sp-m);
+  inset-inline-end: var(--sp-m);
 }
 
 .modal-content {
-  @include deprecated.body-large-typography;
+  @include use-typography("body-large");
 }
 
 .modal-item-element {
-  @include deprecated.flex-row;
+  display: flex;
+  align-items: center;
+  gap: var(--sp-xs);
 }
 
 .modal-component-icon {
-  @include deprecated.flex-center;
-
+  display: flex;
+  justify-content: center;
+  align-items: center;
   color: var(--color-foreground-secondary);
 }
 
 .modal-component-name {
-  @include deprecated.body-large-typography;
+  @include use-typography("body-large");
 
   color: var(--color-foreground-secondary);
 }
 
-.action-buttons {
-  @extend %modal-action-btns;
+.modal-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--sp-l);
 }
 
+// TODO: `.modal-subtitle` appears unused in `confirm.cljs` — verify before removal
 .modal-scd-msg,
 .modal-subtitle,
 .modal-msg {
-  @include deprecated.body-large-typography;
+  @include use-typography("body-large");
 
-  color: var(--modal-text-foreground-color);
+  color: var(--color-foreground-secondary);
 }
 
 .modal-error-msg {
-  margin: var(--sp-xxl) 0;
+  margin-block: var(--sp-xxl);
 }
diff --git a/frontend/src/app/main/ui/context.cljs b/frontend/src/app/main/ui/context.cljs
index 1986876c9f..0ba58aedb6 100644
--- a/frontend/src/app/main/ui/context.cljs
+++ b/frontend/src/app/main/ui/context.cljs
@@ -33,6 +33,8 @@
 (def is-render?           (mf/create-context false))
 (def is-component?        (mf/create-context false))
 
+(def shortcuts-ctx (mf/create-context nil))
+
 (def sidebar
   "A context that intends to store the current sidebar position,
   useful for components that behaves distinctly if they are showed in
diff --git a/frontend/src/app/main/ui/dashboard.cljs b/frontend/src/app/main/ui/dashboard.cljs
index fb96681b6c..20daf964a7 100644
--- a/frontend/src/app/main/ui/dashboard.cljs
+++ b/frontend/src/app/main/ui/dashboard.cljs
@@ -264,12 +264,20 @@
           (swap! storage/session dissoc :template))))))
 
 (defn- use-nitrate-entry-popup
-  []
-  (mf/with-effect []
-    (when (dnt/nitrate-entry-popup-pending?)
-      (dnt/consume-nitrate-entry-popup!)
-      (st/emit! (dprof/update-profile-props {:onboarding-viewed true})
-                (dnt/show-nitrate-popup :nitrate-form)))))
+  [onboarding-viewed? nitrate-onboarding-viewed?]
+  (let [nitrate-popup-pending? (dnt/nitrate-entry-popup-pending?)]
+    (mf/with-effect [nitrate-popup-pending? onboarding-viewed? nitrate-onboarding-viewed?]
+      (when nitrate-popup-pending?
+        (dnt/consume-nitrate-entry-popup!)
+        (st/emit! (dprof/update-profile-props
+                   (cond-> {}
+                     (not (or nitrate-onboarding-viewed? onboarding-viewed?))
+                     (assoc :nitrate-onboarding-viewed false)
+
+                     (not onboarding-viewed?)
+                     (assoc :onboarding-viewed true
+                            :release-notes-viewed (:main cf/version))))
+                  (dnt/show-nitrate-popup :nitrate-form))))))
 
 (defn- use-pending-action
   "Consumes a pending dashboard action from session storage and resumes it"
@@ -282,13 +290,15 @@
         (case (:type action)
           :add-team-to-organization
           (st/emit! (dnt/add-team-to-organization {:team-id         (:team-id action)
-                                                   :organization-id (:organization-id action)}))
+                                                   :organization-id (:organization-id action)
+                                                   :skip-audit?     true}))
           nil)))))
 
 (mf/defc dashboard*
   [{:keys [profile project-id team-id search-term plugin-url template section pending-action-id]}]
   (let [team            (mf/deref refs/team)
         projects        (mf/deref refs/projects)
+        props           (get profile :props)
 
         project         (get projects project-id)
         projects        (mf/with-memo [projects team-id]
@@ -305,7 +315,7 @@
                (filter :is-default)
                (first)))]
 
-    (hooks/use-shortcuts ::dashboard sc/shortcuts-dashboard)
+    (hooks/use-shortcuts ::dashboard sc/shortcuts-dashboard :dashboard)
 
     (mf/with-effect [team-id]
       (st/emit! (dd/initialize team-id))
@@ -323,7 +333,7 @@
 
     (use-plugin-register plugin-url team-id (:id default-project))
     (use-templates-import can-edit? template default-project)
-    (use-nitrate-entry-popup)
+    (use-nitrate-entry-popup (:onboarding-viewed props) (:nitrate-onboarding-viewed props))
     (use-pending-action pending-action-id)
 
     [:& (mf/provider ctx/current-project-id) {:value project-id}
diff --git a/frontend/src/app/main/ui/dashboard.scss b/frontend/src/app/main/ui/dashboard.scss
index 2083e7707e..c2ca60b679 100644
--- a/frontend/src/app/main/ui/dashboard.scss
+++ b/frontend/src/app/main/ui/dashboard.scss
@@ -4,24 +4,26 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/mixins.scss" as *;
 
 .dashboard {
-  @extend %new-scrollbar;
+  @include custom-scrollbar($include-selection: false, $include-placeholder: false);
 
-  background-color: var(--app-background);
+  background-color: var(--color-background-primary);
   display: grid;
-  grid-template-columns: deprecated.$s-40 deprecated.$s-256 1fr;
-  grid-template-rows: deprecated.$s-52 1fr;
-  height: 100vh;
+  grid-template-columns: $sz-40 px2rem(256) 1fr;
+  grid-template-rows: px2rem(52) 1fr;
+  block-size: 100vh;
 }
 
 .dashboard-content {
   display: grid;
-  grid-template-rows: deprecated.$s-64 1fr;
+  grid-template-rows: $sz-64 1fr;
   position: relative;
   grid-row: 1 / span 2;
-  padding: deprecated.$s-16 deprecated.$s-16 0 0;
+  padding: var(--sp-l) var(--sp-l) 0 0;
   overflow: hidden;
-  width: 100%;
+  inline-size: 100%;
 }
diff --git a/frontend/src/app/main/ui/dashboard/change_owner.cljs b/frontend/src/app/main/ui/dashboard/change_owner.cljs
index f39413a939..05d9990b69 100644
--- a/frontend/src/app/main/ui/dashboard/change_owner.cljs
+++ b/frontend/src/app/main/ui/dashboard/change_owner.cljs
@@ -97,20 +97,20 @@
                       :form form
                       :default default-member-id}])]))
 
-(defn- make-leave-org-modal-form-schema [teams]
+(defn- make-leave-organization-modal-form-schema [teams]
   (into
    [:map {:title "LeaveOrgModalForm"}]
    (for [team teams]
      [(keyword (str "member-id-" (:id team))) ::sm/text])))
 
 
-(mf/defc leave-and-reassign-org-modal
+(mf/defc leave-and-reassign-organization-modal
   {::mf/register modal/components
-   ::mf/register-as :leave-and-reassign-org
+   ::mf/register-as :leave-and-reassign-organization
    ::mf/wrap [mf/memo]}
   [{:keys [profile teams-to-transfer num-teams-to-delete accept] :as props}]
   (let [schema (mf/with-memo [teams-to-transfer]
-                 (make-leave-org-modal-form-schema teams-to-transfer))
+                 (make-leave-organization-modal-form-schema teams-to-transfer))
         ;; Compute initial values for each team select
         team-fields (mf/with-memo [teams-to-transfer]
                       (for [team teams-to-transfer]
@@ -146,21 +146,21 @@
                                                   team-fields)]
                       (accept {:teams-to-transfer teams-to-transfer})))]
     [:div {:class (stl/css :modal-overlay)}
-     [:div {:class (stl/css :modal-org-container)}
+     [:div {:class (stl/css :modal-organization-container)}
       [:div {:class (stl/css :modal-header)}
-       [:h2 {:class (stl/css :modal-org-title)} (tr "modals.before-leave-org.title")]
+       [:h2 {:class (stl/css :modal-organization-title)} (tr "modals.before-leave-organization.title")]
        [:button {:class (stl/css :modal-close-btn)
                  :on-click modal/hide!} deprecated-icon/close]]
 
       [:div {:class (stl/css :modal-content)}
        (if (zero? num-teams-to-delete)
-         [:p {:class (stl/css :modal-org-msg)}
-          (tr "modals.leave-org-and-reassign.hint")]
+         [:p {:class (stl/css :modal-organization-msg)}
+          (tr "modals.leave-organization-and-reassign.hint")]
          [:*
-          [:p {:class (stl/css :modal-org-msg)}
-           (tr "modals.leave-org-and-reassign.hint-delete")]
-          [:p {:class (stl/css :modal-org-msg)}
-           (tr "modals.leave-org-and-reassign.hint-promote")]])
+          [:p {:class (stl/css :modal-organization-msg)}
+           (tr "modals.leave-organization-and-reassign.hint-delete")]
+          [:p {:class (stl/css :modal-organization-msg)}
+           (tr "modals.leave-organization-and-reassign.hint-promote")]])
        [:& fm/form {:form form}
         [:div {:class (stl/css :teams-container)}
          (for [{:keys [team field-name default-member-id]} team-fields]
diff --git a/frontend/src/app/main/ui/dashboard/change_owner.scss b/frontend/src/app/main/ui/dashboard/change_owner.scss
index a2497f77ed..01c8d875bd 100644
--- a/frontend/src/app/main/ui/dashboard/change_owner.scss
+++ b/frontend/src/app/main/ui/dashboard/change_owner.scss
@@ -78,20 +78,20 @@
   width: 100%;
 }
 
-.modal-org-container {
+.modal-organization-container {
   @extend %modal-container-base;
 
   overflow-y: auto;
   max-height: $sz-512;
 }
 
-.modal-org-title {
+.modal-organization-title {
   @include t.use-typography("headline-large");
 
   color: var(--modal-title-foreground-color);
 }
 
-.modal-org-msg {
+.modal-organization-msg {
   @include t.use-typography("body-large");
 
   color: var(--modal-text-foreground-color);
diff --git a/frontend/src/app/main/ui/dashboard/files.cljs b/frontend/src/app/main/ui/dashboard/files.cljs
index 05ed77851e..ed3781faba 100644
--- a/frontend/src/app/main/ui/dashboard/files.cljs
+++ b/frontend/src/app/main/ui/dashboard/files.cljs
@@ -195,7 +195,7 @@
       (st/emit! (dpj/fetch-files project-id)
                 (dd/clear-selected-files)))
 
-    (hooks/use-shortcuts ::dashboard sc/shortcuts-drafts-libraries)
+    (hooks/use-shortcuts ::dashboard sc/shortcuts-drafts-libraries :dashboard)
 
     [:*
      [:> header* {:team team
diff --git a/frontend/src/app/main/ui/dashboard/libraries.cljs b/frontend/src/app/main/ui/dashboard/libraries.cljs
index c674dfe868..f907d04b53 100644
--- a/frontend/src/app/main/ui/dashboard/libraries.cljs
+++ b/frontend/src/app/main/ui/dashboard/libraries.cljs
@@ -60,7 +60,7 @@
       (st/emit! (dtm/fetch-shared-files team-id)
                 (dd/clear-selected-files)))
 
-    (hooks/use-shortcuts ::dashboard sc/shortcuts-drafts-libraries)
+    (hooks/use-shortcuts ::dashboard sc/shortcuts-drafts-libraries :dashboard)
 
     [:*
      [:header {:class (stl/css :dashboard-header) :data-testid "dashboard-header"}
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index 56e84ad53c..542395caa7 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -369,7 +369,7 @@
       (st/emit! (dd/fetch-recent-files team-id)
                 (dd/clear-selected-files)))
 
-    (hooks/use-shortcuts ::dashboard sc/shortcuts-projects)
+    (hooks/use-shortcuts ::dashboard sc/shortcuts-projects :dashboard)
 
     (when (seq projects)
       [:*
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index d64063b522..b2dfb2f119 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -25,7 +25,7 @@
    [app.main.ui.components.dropdown-menu :refer [dropdown-menu*
                                                  dropdown-menu-item*]]
    [app.main.ui.components.link :refer [link*]]
-   [app.main.ui.components.org-avatar :refer [org-avatar*]]
+   [app.main.ui.components.organization-avatar :refer [organization-avatar*]]
    [app.main.ui.dashboard.comments :refer [comments-icon* comments-section]]
    [app.main.ui.dashboard.inline-edition :refer [inline-edition]]
    [app.main.ui.dashboard.project-menu :refer [project-menu*]]
@@ -40,7 +40,7 @@
    [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
    [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*]]
-   [app.main.ui.hooks :as hooks]
+   [app.main.ui.hooks :as hooks :refer [use-focus-timer-ref]]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.nitrate.nitrate-form]
    [app.util.dom :as dom]
@@ -74,11 +74,11 @@
 (def ^:private menu-icon
   (deprecated-icon/icon-xref :menu (stl/css :menu-icon)))
 
-(def ^:private org-menu-icon
-  (deprecated-icon/icon-xref :menu (stl/css :org-menu-icon)))
+(def ^:private organization-menu-icon
+  (deprecated-icon/icon-xref :menu (stl/css :organization-menu-icon)))
 
-(def ^:private org-menu-icon-open
-  (deprecated-icon/icon-xref :menu (stl/css :org-menu-icon-open)))
+(def ^:private organization-menu-icon-open
+  (deprecated-icon/icon-xref :menu (stl/css :organization-menu-icon-open)))
 
 (def ^:private pin-icon
   (deprecated-icon/icon-xref :pin (stl/css :pin-icon)))
@@ -86,8 +86,8 @@
 (def ^:private exit-icon
   (deprecated-icon/icon-xref :exit (stl/css :exit-icon)))
 
-(def ^:private add-org-icon
-  (deprecated-icon/icon-xref :add (stl/css :add-org-icon)))
+(def ^:private add-organization-icon
+  (deprecated-icon/icon-xref :add (stl/css :add-organization-icon)))
 
 (def ^:private arrow-up-right-icon
   (deprecated-icon/icon-xref :arrow-up-right (stl/css :arrow-up-right-icon)))
@@ -95,6 +95,14 @@
 (def ^:private ^:svg-id penpot-logo-icon "penpot-logo-icon")
 (def ^:private ^:svg-id penpot-logo-icon-subtle "penpot-logo-subtle")
 
+(defn schedule-focus-by-id!
+  [ref element-id]
+  (when-let [h (mf/ref-val ref)]
+    (ts/dispose! h))
+  (mf/set-ref-val! ref
+                   (ts/schedule
+                    #(dom/focus-and-untabbable! (dom/get-element element-id)))))
+
 (mf/defc sidebar-project*
   {::mf/private true}
   [{:keys [item is-selected]}]
@@ -113,6 +121,8 @@
 
         project-id       (get item :id)
 
+        focus-timer-ref  (use-focus-timer-ref)
+
         on-click
         (mf/use-fn
          (mf/deps project-id)
@@ -124,14 +134,9 @@
          (mf/deps project-id)
          (fn [event]
            (when (kbd/enter? event)
-             (st/emit!
-              (dcm/go-to-dashboard-files :project-id project-id))
-             (ts/schedule
-              (fn []
-                (when-let [title (dom/get-element (str project-id))]
-                  (dom/set-attribute! title "tabindex" "0")
-                  (dom/focus! title)
-                  (dom/set-attribute! title "tabindex" "-1")))))))
+             (schedule-focus-by-id! focus-timer-ref (str project-id))
+             (st/emit! (dcm/go-to-dashboard-files :project-id project-id)))))
+
 
         on-menu-click
         (mf/use-fn
@@ -229,6 +234,8 @@
         focused?    (mf/use-state false)
         emit!       (mf/use-memo #(f/debounce st/emit! 500))
 
+        focus-timer-ref  (use-focus-timer-ref)
+
         on-search-blur
         (mf/use-fn
          (fn [_]
@@ -255,13 +262,7 @@
         (mf/use-fn
          (fn [e]
            (when (kbd/enter? e)
-             (ts/schedule
-              (fn []
-                (let [search-title (dom/get-element (str "dashboard-search-title"))]
-                  (when search-title
-                    (dom/set-attribute! search-title "tabindex" "0")
-                    (dom/focus! search-title)
-                    (dom/set-attribute! search-title "tabindex" "-1")))))
+             (schedule-focus-by-id! focus-timer-ref "dashboard-search-title")
              (dom/prevent-default e)
              (dom/stop-propagation e))))
 
@@ -303,7 +304,15 @@
 (mf/defc organizations-selector-dropdown*
   {::mf/private true}
   [{:keys [organization organizations profile] :rest props}]
-  (let [on-org-click
+  (let [teams (mf/deref refs/teams)
+
+        subscription-type (get-subscription-type (-> profile :props :subscription))
+
+        team-count (count teams)
+
+        account-age-days (dnt/account-age-days profile)
+
+        on-organization-click
         (mf/use-fn
          (fn [event]
            (let [team-id (-> (dom/get-current-target event)
@@ -311,33 +320,43 @@
                              (uuid/parse))]
              (st/emit! (dcm/go-to-dashboard-recent :team-id team-id)))))
 
-        on-create-org-click
+        on-create-organization-click
         (mf/use-fn
-         (mf/deps profile)
+         (mf/deps account-age-days profile subscription-type team-count)
          (fn []
-           (cond
-             (= (get-subscription-type (-> profile :props :subscription)) "unlimited")
-             (st/emit! (dnt/show-nitrate-popup :nitrate-form {:show-contact-sales-option true}))
-
-             (dnt/is-valid-license? profile)
-             (dnt/go-to-nitrate-ac-create-organization)
-
-             :else
-             (st/emit! (dnt/show-nitrate-popup :nitrate-form)))))
+           (if (and (not= subscription-type "unlimited")
+                    (dnt/is-valid-license? profile))
+             (dnt/go-to-nitrate-ac-create-organization
+              "dashboard:organization-switcher")
+             (st/emit!
+              (ev/event
+               (cond-> {::ev/name "open-subscription-modal"
+                        ::ev/origin "dashboard:organization-switcher"
+                        :product "nitrate:enterprise"
+                        :source "frontend"
+                        :has-teams (pos? team-count)
+                        :team-count team-count}
+                 (some? account-age-days)
+                 (assoc :account-age-days account-age-days)))
+              (dnt/show-nitrate-popup
+               :nitrate-form
+               (cond-> {:subscription-start-origin "dashboard:organization-switcher"}
+                 (= subscription-type "unlimited")
+                 (assoc :show-contact-sales-option true)))))))
 
         on-go-to-cc-click
         (mf/use-fn
          (mf/deps organization profile)
          (fn []
-           ;; Navigate to active org if user owns it, otherwise to last visited org
+           ;; Navigate to active organization if user owns it, otherwise to last visited organization
            (if (and (:id organization)
                     (= (:id profile) (:owner-id organization)))
              (dnt/go-to-nitrate-ac {:organization-id (:id organization)
                                     :organization-slug (:slug organization)})
              (dnt/go-to-nitrate-ac))))
 
-        empty-org (d/seek #(nil? (:id %)) organizations)
-        default-team-id (or (:default-team-id empty-org)
+        empty-organization (d/seek #(nil? (:id %)) organizations)
+        default-team-id (or (:default-team-id empty-organization)
                             (:default-team-id profile))
 
         organizations (filter :id organizations)
@@ -346,9 +365,9 @@
 
     [:> dropdown-menu* props
 
-     [:> dropdown-menu-item* {:on-click    on-org-click
+     [:> dropdown-menu-item* {:on-click    on-organization-click
                               :data-value  default-team-id
-                              :class       (stl/css :org-dropdown-item)}
+                              :class       (stl/css :organization-dropdown-item)}
       [:span {:class (stl/css :my-teams-icon)}
        [:> raw-svg* {:id penpot-logo-icon-subtle}]]
       [:span {:class (stl/css :team-text)
@@ -356,29 +375,31 @@
        (tr "dashboard.my-teams")]
       (when (= default-team-id (:default-team-id organization))
         tick-icon)]
-     [:hr {:role "separator" :class (stl/css :team-separator)}]
-     [:li {:role "presentation" :class (stl/css :org-section-label)}
-      (tr "dashboard.section.organizations")]
+     (when (seq organizations)
+       [:*
+        [:hr {:role "separator" :class (stl/css :team-separator)}]
+        [:li {:role "presentation" :class (stl/css :organization-section-label)}
+         (tr "dashboard.section.organizations")]])
 
-     (for [org-item organizations]
-       [:> dropdown-menu-item* {:on-click    on-org-click
-                                :data-value  (:default-team-id org-item)
-                                :class       (stl/css :org-dropdown-item)
-                                :key         (str (:default-team-id org-item))}
-        [:> org-avatar* {:org org-item :size "xxl"}]
+     (for [organization-item organizations]
+       [:> dropdown-menu-item* {:on-click    on-organization-click
+                                :data-value  (:default-team-id organization-item)
+                                :class       (stl/css :organization-dropdown-item)
+                                :key         (str (:default-team-id organization-item))}
+        [:> organization-avatar* {:organization organization-item :size "xxl"}]
         [:span {:class (stl/css :team-text)
-                :title (:name org-item)} (:name org-item)]
-        (when (= (:default-team-id org-item) (:default-team-id organization))
+                :title (:name organization-item)} (:name organization-item)]
+        (when (= (:default-team-id organization-item) (:default-team-id organization))
           tick-icon)])
 
      [:hr {:role "separator" :class (stl/css :team-separator)}]
-     [:> dropdown-menu-item* {:on-click    on-create-org-click
-                              :class       (stl/css :org-dropdown-item :action)}
-      [:span {:class (stl/css :icon-wrapper)} add-org-icon]
-      [:span {:class (stl/css :team-text)} (tr "dashboard.create-new-org")]]
+     [:> dropdown-menu-item* {:on-click    on-create-organization-click
+                              :class       (stl/css :organization-dropdown-item :action)}
+      [:span {:class (stl/css :icon-wrapper)} add-organization-icon]
+      [:span {:class (stl/css :team-text)} (tr "dashboard.create-new-organization")]]
      (when is-valid-license?
        [:> dropdown-menu-item* {:on-click    on-go-to-cc-click
-                                :class       (stl/css :org-dropdown-item :action)}
+                                :class       (stl/css :organization-dropdown-item :action)}
         [:span {:class (stl/css :icon-wrapper)} arrow-up-right-icon]
         [:span {:class (stl/css :team-text)} (tr "dashboard.go-to-admin-console")]])]))
 
@@ -397,7 +418,7 @@
         (mf/use-fn
          (mf/deps team)
          (fn []
-           (if (contains? cf/flags :nitrate)
+           (if (contains? cf/flags :admin-console)
              (st/emit! (dtm/check-and-create-team (:id team)))
              (st/emit! (modal/show :team-form {})))))
 
@@ -412,13 +433,22 @@
     [:> dropdown-menu* props
      [:> dropdown-menu-item* {:on-click    on-team-click
                               :data-value  default-team-id
-                              :class       (stl/css :team-dropdown-item)}
-      [:span {:class (stl/css :penpot-icon)} (if (contains? cf/flags :nitrate) deprecated-icon/logo-files deprecated-icon/logo-icon)]
+                              :class       (stl/css-case :team-dropdown-item true
+                                                         :team-dropdown-item-no-logo (contains? cf/flags :admin-console))}
+      (when-not (contains? cf/flags :admin-console)
+        [:span {:class (stl/css :penpot-icon)} deprecated-icon/logo-icon])
 
-      [:span {:class (stl/css :team-text)} (if (contains? cf/flags :nitrate) (tr "dashboard.my-files") (tr "dashboard.your-penpot"))]
+      [:span {:class (stl/css :team-text)} (if (contains? cf/flags :admin-console) (tr "dashboard.my-files") (tr "dashboard.your-penpot"))]
       (when (= default-team-id (:id team))
         tick-icon)]
 
+     (when (and (contains? cf/flags :admin-console)
+                (seq (remove :is-default (vals teams))))
+       [:*
+        [:hr {:role "separator" :class (stl/css :team-separator)}]
+        [:li {:role "presentation" :class (stl/css :organization-section-label)}
+         (tr "dashboard.section.teams")]])
+
      (for [team-item (remove :is-default (vals teams))]
        [:> dropdown-menu-item* {:on-click    on-team-click
                                 :data-value  (:id team-item)
@@ -594,7 +624,7 @@
                                 :data-testid "delete-team"}
         (tr "dashboard.delete-team")])]))
 
-(mf/defc org-options-dropdown*
+(mf/defc organization-options-dropdown*
   {::mf/private true}
   [{:keys [organization profile teams] :rest props}]
   (let [default-team-id       (mf/with-memo [teams]
@@ -619,8 +649,8 @@
          (fn [error]
            (let [code (-> error ex-data :code)
                  ;; Map error codes to their translation keys
-                 error-map {:not-valid-teams             "errors.org-leave.no-valid-teams"
-                            :org-owner-cannot-leave      "errors.org-leave.org-owner-cannot-leave"
+                 error-map {:not-valid-teams             "errors.organization-leave.no-valid-teams"
+                            :organization-owner-cannot-leave      "errors.organization-leave.organization-owner-cannot-leave"
                             :only-owner-can-delete-team  "errors.team-leave.only-owner-can-delete"
                             :no-enough-members-for-leave "errors.team-leave.insufficient-members"
                             :member-does-not-exist       "errors.team-leave.member-does-not-exists"
@@ -635,7 +665,9 @@
         leave-fn
         (mf/use-fn
          (mf/deps on-error organization default-team-id not-owned-teams owned-teams)
-         (fn [{:keys [teams-to-transfer]}]
+         (fn [{:keys [teams-to-transfer
+                      member-added-at
+                      organization-member-count-before]}]
            (let [teams-to-leave (cond->> not-owned-teams
                                   :always
                                   (map #(select-keys % [:id]))
@@ -646,24 +678,27 @@
                                       (map :id))]
 
 
-             (st/emit! (dnt/leave-org {:id (:id organization)
-                                       :name (:name organization)
-                                       :default-team-id default-team-id
-                                       :teams-to-delete teams-to-delete
-                                       :teams-to-leave teams-to-leave
-                                       :on-error on-error})))))
+             (st/emit! (dnt/leave-organization {:id (:id organization)
+                                                :name (:name organization)
+                                                :default-team-id default-team-id
+                                                :teams-to-delete teams-to-delete
+                                                :teams-to-leave teams-to-leave
+                                                :member-added-at member-added-at
+                                                :organization-member-count-before
+                                                organization-member-count-before
+                                                :on-error on-error})))))
 
         on-leave-clicked
         (mf/use-fn
          (mf/deps leave-fn profile organization default-team-id teams-to-transfer on-error owned-teams-members-loaded?)
          (fn []
            (when owned-teams-members-loaded?
-             (st/emit! (dnt/show-leave-org-modal {:organization organization
-                                                  :profile profile
-                                                  :default-team-id default-team-id
-                                                  :leave-fn leave-fn
-                                                  :teams-to-transfer teams-to-transfer
-                                                  :on-error on-error})))))]
+             (st/emit! (dnt/show-leave-organization-modal {:organization organization
+                                                           :profile profile
+                                                           :default-team-id default-team-id
+                                                           :leave-fn leave-fn
+                                                           :teams-to-transfer teams-to-transfer
+                                                           :on-error on-error})))))]
     (mf/use-effect
      (mf/deps owned-teams)
      (fn []
@@ -675,77 +710,83 @@
 
      [:> dropdown-menu-item* {:on-click on-leave-clicked
                               :class    (stl/css :team-options-item)}
-      (tr "dashboard.leave-org")]]))
+      (tr "dashboard.leave-organization")]]))
 
 
-(mf/defc sidebar-org-switch*
+(mf/defc sidebar-organization-switch*
   [{:keys [team profile]}]
   (let [teams (mf/deref refs/teams)
 
-        current-org (dtm/team->organization team)
+        subscription-type (get-subscription-type (-> profile :props :subscription))
 
-        ;; Find the "your-penpot" teams, and transform them in orgs. When
+        team-count (count teams)
+
+        account-age-days (dnt/account-age-days profile)
+
+        current-organization (dtm/team->organization team)
+
+        ;; Find the "your-penpot" teams, and transform them in organizations. When
         ;; the selected team is directly accessible but not listed in
-        ;; membership teams, include only its org so the org selector can
+        ;; membership teams, include only its organization so the organization selector can
         ;; show the current selection without leaking the team into the
         ;; teams dropdown.
-        orgs  (mf/with-memo [teams current-org]
-                (cond-> (->> teams
-                             vals
-                             (filter :is-default)
-                             (map dtm/team->organization)
-                             (d/index-by :id))
-                  (:id current-org)
-                  (assoc (:id current-org) current-org)))
+        organizations  (mf/with-memo [teams current-organization]
+                         (cond-> (->> teams
+                                      vals
+                                      (filter :is-default)
+                                      (map dtm/team->organization)
+                                      (d/index-by :id))
+                           (:id current-organization)
+                           (assoc (:id current-organization) current-organization)))
 
         show-dropdown? (or (dnt/is-valid-license? profile)
-                           (> (count orgs) 1))
+                           (> (count organizations) 1))
 
-        org-teams (mf/with-memo [teams current-org]
-                    (->> teams
-                         vals
-                         (filter #(= (dm/get-in % [:organization :id]) (:id current-org)))))
+        organization-teams (mf/with-memo [teams current-organization]
+                             (->> teams
+                                  vals
+                                  (filter #(= (dm/get-in % [:organization :id]) (:id current-organization)))))
 
-        default-org? (nil? (:id current-org))
+        default-organization? (nil? (:id current-organization))
 
-        show-options? (and (not default-org?)
-                           (not= (:id profile) (:owner-id current-org)))
+        show-options? (and (not default-organization?)
+                           (not= (:id profile) (:owner-id current-organization)))
 
-        show-orgs-menu*
+        show-organizations-menu*
         (mf/use-state false)
 
-        show-orgs-menu?
-        (deref show-orgs-menu*)
+        show-organizations-menu?
+        (deref show-organizations-menu*)
 
-        orgs-rect*
+        organizations-rect*
         (mf/use-state nil)
 
-        orgs-portal-container
+        organizations-portal-container
         (hooks/use-portal-container :popup)
 
-        show-org-options-menu*
+        show-organization-options-menu*
         (mf/use-state false)
 
-        show-org-options-menu?
-        (deref show-org-options-menu*)
+        show-organization-options-menu?
+        (deref show-organization-options-menu*)
 
         on-show-options-click
         (mf/use-fn
          (fn [event]
            (dom/stop-propagation event)
-           (swap! show-org-options-menu* not)))
+           (swap! show-organization-options-menu* not)))
 
-        close-org-options-menu
-        (mf/use-fn #(reset! show-org-options-menu* false))
+        close-organization-options-menu
+        (mf/use-fn #(reset! show-organization-options-menu* false))
 
-        on-show-orgs-click
+        on-show-organizations-click
         (mf/use-fn
          (fn [event]
            (dom/stop-propagation event)
-           (reset! orgs-rect* (dom/get-bounding-rect (dom/get-current-target event)))
-           (swap! show-orgs-menu* not)))
+           (reset! organizations-rect* (dom/get-bounding-rect (dom/get-current-target event)))
+           (swap! show-organizations-menu* not)))
 
-        on-show-orgs-keydown
+        on-show-organizations-keydown
         (mf/use-fn
          (fn [event]
            (when (or (kbd/space? event)
@@ -754,53 +795,63 @@
              (dom/stop-propagation event)
              (some-> (dom/get-current-target event)
                      (dom/click)))))
-        close-orgs-menu
-        (mf/use-fn #(reset! show-orgs-menu* false))
+        close-organizations-menu
+        (mf/use-fn #(reset! show-organizations-menu* false))
 
-        on-create-org-click
+        on-create-organization-click
         (mf/use-fn
-         (mf/deps profile)
+         (mf/deps account-age-days profile subscription-type team-count)
          (fn []
-           (cond
-             (= (get-subscription-type (-> profile :props :subscription)) "unlimited")
-             (st/emit! (dnt/show-nitrate-popup :nitrate-form {:show-contact-sales-option true}))
-
-             (dnt/is-valid-license? profile)
-             (dnt/go-to-nitrate-ac-create-organization)
-
-             :else
-             (st/emit! (dnt/show-nitrate-popup :nitrate-form)))))]
+           (if (and (not= subscription-type "unlimited")
+                    (dnt/is-valid-license? profile))
+             (dnt/go-to-nitrate-ac-create-organization
+              "dashboard:organization-switcher")
+             (st/emit!
+              (ev/event
+               (cond-> {::ev/name "open-subscription-modal"
+                        ::ev/origin "dashboard:create-organization-button"
+                        :product "nitrate:enterprise"
+                        :source "frontend"
+                        :has-teams (pos? team-count)
+                        :team-count team-count}
+                 (some? account-age-days)
+                 (assoc :account-age-days account-age-days)))
+              (dnt/show-nitrate-popup
+               :nitrate-form
+               (cond-> {:subscription-start-origin "dashboard:create-organization-button"}
+                 (= subscription-type "unlimited")
+                 (assoc :show-contact-sales-option true)))))))]
     (if show-dropdown?
-      [:div {:class (stl/css :sidebar-org-switch)}
-       [:div {:class (stl/css :org-switch-content)}
-        [:button {:class (stl/css-case :current-org true :current-org-no-options (not show-options?))
-                  :on-click on-show-orgs-click
-                  :on-key-down on-show-orgs-keydown
-                  :aria-expanded show-orgs-menu?
+      [:div {:class (stl/css :sidebar-organization-switch)}
+       [:div {:class (stl/css :organization-switch-content)}
+        [:button {:class (stl/css-case :current-organization true :current-organization-no-options (not show-options?))
+                  :on-click on-show-organizations-click
+                  :on-key-down on-show-organizations-keydown
+                  :aria-expanded show-organizations-menu?
                   :aria-haspopup "menu"}
          [:div {:class (stl/css :team-name)}
-          (if default-org?
+          (if default-organization?
             [:*
              [:span {:class (stl/css :my-teams-icon-xxxl)}
               [:> raw-svg* {:id penpot-logo-icon-subtle}]]
              [:span {:class (stl/css :team-text)}
               (tr "dashboard.my-teams")]]
             [:*
-             [:> org-avatar* {:org current-org :size "xxxl"}]
+             [:> organization-avatar* {:organization current-organization :size "xxxl"}]
              [:span {:class (stl/css :team-text)}
-              (:name current-org)]])]
+              (:name current-organization)]])]
          arrow-icon]
         (when show-options?
           [:> button* {:variant "ghost"
                        :type "button"
-                       :class (stl/css :org-options-btn)
+                       :class (stl/css :organization-options-btn)
                        :on-click on-show-options-click}
-           (if show-org-options-menu? org-menu-icon-open org-menu-icon)])]
+           (if show-organization-options-menu? organization-menu-icon-open organization-menu-icon)])]
 
 
-       ;; Orgs Dropdown
-       (when show-orgs-menu?
-         (let [rect (deref orgs-rect*)]
+       ;; Organizations dropdown
+       (when show-organizations-menu?
+         (let [rect (deref organizations-rect*)]
            (mf/portal
             (mf/html
              [:div {:style {:position "fixed"
@@ -808,40 +859,40 @@
                             :left (dm/str (:left rect) "px")
                             :width (dm/str (:width rect) "px")}}
               [:> organizations-selector-dropdown* {:show true
-                                                    :on-close close-orgs-menu
+                                                    :on-close close-organizations-menu
                                                     :id "organizations-list"
                                                     :class (stl/css :dropdown :teams-dropdown)
-                                                    :organization current-org
+                                                    :organization current-organization
                                                     :profile profile
-                                                    :organizations (->> (vals orgs)
+                                                    :organizations (->> (vals organizations)
                                                                         (sort-by (juxt (fn [o] (str/lower (:name o "")))
                                                                                        :id)))}]])
 
 
 
-            orgs-portal-container)))
-       ;; Orgs options
-       [:> org-options-dropdown* {:show show-org-options-menu?
-                                  :on-close close-org-options-menu
-                                  :id "team-options"
-                                  :class (stl/css :dropdown :options-dropdown)
-                                  :organization current-org
-                                  :profile profile
-                                  :teams org-teams}]]
-      [:div {:class (stl/css :selected-org)}
-       [:span {:class (stl/css :org-penpot-icon)}
+            organizations-portal-container)))
+       ;; Organization options
+       [:> organization-options-dropdown* {:show show-organization-options-menu?
+                                           :on-close close-organization-options-menu
+                                           :id "team-options"
+                                           :class (stl/css :dropdown :options-dropdown)
+                                           :organization current-organization
+                                           :profile profile
+                                           :teams organization-teams}]]
+      [:div {:class (stl/css :selected-organization)}
+       [:span {:class (stl/css :organization-penpot-icon)}
         [:> raw-svg* {:id penpot-logo-icon}]]
        "Penpot"
        [:> button* {:variant "ghost"
                     :type "button"
-                    :class (stl/css :create-org)
-                    :on-click on-create-org-click} (tr "dashboard.plus-create-new-org")]])))
+                    :class (stl/css :create-organization)
+                    :on-click on-create-organization-click} (tr "dashboard.plus-create-new-organization")]])))
 
 (mf/defc sidebar-team-switch*
   [{:keys [team profile]}]
-  (let [nitrate?     (contains? cf/flags :nitrate)
-        org          (:organization team)
-        organization-id (when nitrate? (:id org))
+  (let [nitrate?     (contains? cf/flags :admin-console)
+        organization          (:organization team)
+        organization-id (when nitrate? (:id organization))
         teams (cond->> (mf/deref refs/teams)
                 nitrate?
                 (filter #(= (dm/get-in (val %) [:organization :id]) organization-id))
@@ -917,8 +968,10 @@
                 :aria-haspopup "menu"}
        (cond
          is-default?
-         [:div {:class (stl/css :team-name)}
-          [:span {:class (stl/css :penpot-icon)} (if nitrate? deprecated-icon/logo-files deprecated-icon/logo-icon)]
+         [:div {:class (stl/css-case :team-name true
+                                     :team-name-no-logo nitrate?)}
+          (when-not nitrate?
+            [:span {:class (stl/css :penpot-icon)} deprecated-icon/logo-icon])
           [:span {:class (stl/css :team-text)} (if nitrate? (tr "dashboard.my-files") (tr "dashboard.default-team-name"))]]
 
          (and (contains? cf/flags :subscriptions)
@@ -986,7 +1039,9 @@
         overflow*   (mf/use-state false)
         overflow?   (deref overflow*)
 
-        nitrate?    (contains? cf/flags :nitrate)
+        nitrate?    (contains? cf/flags :admin-console)
+
+        focus-timer-ref  (use-focus-timer-ref)
 
         go-projects
         (mf/use-fn #(st/emit! (dcm/go-to-dashboard-recent)))
@@ -997,12 +1052,7 @@
          (fn []
            (st/emit!
             (dcm/go-to-dashboard-recent :team-id team-id))
-           (ts/schedule
-            (fn []
-              (when-let [projects-title (dom/get-element "dashboard-projects-title")]
-                (dom/set-attribute! projects-title "tabindex" "0")
-                (dom/focus! projects-title)
-                (dom/set-attribute! projects-title "tabindex" "-1"))))))
+           (schedule-focus-by-id! focus-timer-ref "dashboard-projects-title")))
 
         go-fonts
         (mf/use-fn
@@ -1015,13 +1065,7 @@
          (fn []
            (st/emit!
             (dcm/go-to-dashboard-fonts :team-id team-id))
-           (ts/schedule
-            (fn []
-              (let [font-title (dom/get-element "dashboard-fonts-title")]
-                (when font-title
-                  (dom/set-attribute! font-title "tabindex" "0")
-                  (dom/focus! font-title)
-                  (dom/set-attribute! font-title "tabindex" "-1")))))))
+           (schedule-focus-by-id! focus-timer-ref "dashboard-fonts-title")))
 
         go-drafts
         (mf/use-fn
@@ -1034,12 +1078,7 @@
          (mf/deps team-id default-project-id)
          (fn []
            (st/emit! (dcm/go-to-dashboard-files :team-id team-id :project-id default-project-id))
-           (ts/schedule
-            (fn []
-              (when-let [title (dom/get-element "dashboard-drafts-title")]
-                (dom/set-attribute! title "tabindex" "0")
-                (dom/focus! title)
-                (dom/set-attribute! title "tabindex" "-1"))))))
+           (schedule-focus-by-id! focus-timer-ref "dashboard-drafts-title")))
 
         go-libs
         (mf/use-fn
@@ -1052,13 +1091,7 @@
          (fn []
            (st/emit!
             (dcm/go-to-dashboard-libraries :team-id team-id))
-           (ts/schedule
-            (fn []
-              (let [libs-title (dom/get-element "dashboard-libraries-title")]
-                (when libs-title
-                  (dom/set-attribute! libs-title "tabindex" "0")
-                  (dom/focus! libs-title)
-                  (dom/set-attribute! libs-title "tabindex" "-1")))))))
+           (schedule-focus-by-id! focus-timer-ref "dashboard-libraries-title")))
 
         pinned-projects
         (mf/with-memo [projects]
@@ -1078,8 +1111,8 @@
     [:*
      [:div {:class (stl/css :sidebar-content-wrapper)}
       (when nitrate?
-        [:div {:class (stl/css :orgs-container)}
-         [:> sidebar-org-switch* {:team team :profile profile}]])
+        [:div {:class (stl/css :organizations-container)}
+         [:> sidebar-organization-switch* {:team team :profile profile}]])
       [:div {:ref container
              :class (stl/css-case :sidebar-content true :sidebar-content-nitrate nitrate?)}
        [:> sidebar-team-switch* {:team team :profile profile}]
@@ -1368,7 +1401,7 @@
            (dom/open-new-window "https://penpot.app/pricing")))]
 
     (mf/with-effect [teams]
-      (when (and (contains? cf/flags :nitrate)
+      (when (and (contains? cf/flags :admin-console)
                  (empty? teams))
         (st/emit! (dtm/fetch-teams))))
 
@@ -1377,7 +1410,7 @@
         (reset! sub-menu* nil)))
 
     [:*
-     (if (contains? cf/flags :nitrate)
+     (if (contains? cf/flags :admin-console)
        [:*
         [:> nitrate-sidebar* {:profile profile :teams teams}]
         [:> nitrate-current-plan* {:profile profile}]]
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.scss b/frontend/src/app/main/ui/dashboard/sidebar.scss
index 7f0a8b983a..836e6b6e93 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.scss
+++ b/frontend/src/app/main/ui/dashboard/sidebar.scss
@@ -94,17 +94,21 @@
   grid-template-columns: 1fr auto;
   gap: var(--sp-s);
   height: 100%;
-  padding: 0 var(--sp-m);
+  padding: 0 var(--sp-m) 0 var(--sp-l);
 }
 
 .team-name {
   display: grid;
   align-items: center;
   grid-template-columns: auto 1fr;
-  gap: var(--sp-m);
+  gap: var(--sp-s);
   height: $sz-40;
 }
 
+.team-name-no-logo {
+  grid-template-columns: 1fr;
+}
+
 .team-text {
   @include deprecated.text-ellipsis;
   @include t.use-typography("title-small");
@@ -185,15 +189,21 @@
   grid-template-columns: var(--sp-xxl) 1fr auto;
   gap: var(--sp-s);
   height: $sz-40;
+  padding-inline-start: var(--sp-m);
 }
 
-.org-dropdown-item {
+.team-dropdown-item-no-logo {
+  grid-template-columns: 1fr auto;
+}
+
+.organization-dropdown-item {
   @extend %menu-item-base;
 
   display: grid;
   grid-template-columns: auto 1fr auto;
   gap: var(--sp-s);
   height: $sz-40;
+  padding-inline-start: var(--sp-m);
 }
 
 .action {
@@ -211,7 +221,6 @@
 
   width: var(--sp-xxl);
   height: var(--sp-xxl);
-  margin-right: var(--sp-m);
   border-radius: 50%;
   background-color: var(--sidebar-icon-backgroun-color);
 }
@@ -229,12 +238,12 @@
   margin: 0;
 }
 
-.org-section-label {
+.organization-section-label {
   @include t.use-typography("headline-small");
 
   color: var(--color-foreground-secondary);
   list-style: none;
-  padding: var(--sp-m) $sz-6 $sz-6;
+  padding: var(--sp-m) $sz-6 $sz-6 var(--sp-m);
   text-transform: uppercase;
 }
 
@@ -550,7 +559,7 @@
   stroke: var(--icon-foreground);
 }
 
-.add-org-icon {
+.add-organization-icon {
   @extend %button-icon;
 
   width: var(--sp-l);
@@ -597,7 +606,7 @@
   color: var(--color-accent-tertiary);
 }
 
-.orgs-container {
+.organizations-container {
   align-items: center;
   display: flex;
   height: calc(2 * var(--sp-xxxl));
@@ -606,7 +615,7 @@
   padding: 0 var(--sp-l);
 }
 
-.selected-org {
+.selected-organization {
   @include t.use-typography("body-medium");
 
   color: var(--color-foreground-primary);
@@ -617,12 +626,12 @@
   gap: var(--sp-s);
 }
 
-.create-org {
+.create-organization {
   margin-inline-start: auto;
   text-transform: uppercase;
 }
 
-.org-penpot-icon {
+.organization-penpot-icon {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -638,7 +647,7 @@
   }
 }
 
-.org-icon {
+.organization-icon {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -676,12 +685,12 @@
   }
 }
 
-.sidebar-org-switch {
+.sidebar-organization-switch {
   position: relative;
   width: 100%;
 }
 
-.current-org {
+.current-organization {
   @include deprecated.button-style;
 
   text-transform: none;
@@ -694,15 +703,15 @@
   width: 100%;
 }
 
-.current-org-no-options {
+.current-organization-no-options {
   gap: 0;
 }
 
-.current-org .arrow-icon {
+.current-organization .arrow-icon {
   margin-inline-end: var(--sp-xs);
 }
 
-.org-options {
+.organization-options {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -711,7 +720,7 @@
   height: 100%;
 }
 
-.org-switch-content {
+.organization-switch-content {
   display: grid;
   grid-template-columns: 1fr auto;
   align-items: center;
@@ -719,27 +728,27 @@
   width: 100%;
 }
 
-.org-options-btn {
+.organization-options-btn {
   --icon-stroke: var(--icon-foreground);
 
   display: flex;
   justify-content: center;
   align-items: center;
-  width: $sz-32;
-  height: $sz-32;
+  width: $sz-48;
+  height: $sz-48;
 
   &:hover {
     --icon-stroke: var(--color-accent-primary);
   }
 }
 
-.org-menu-icon {
+.organization-menu-icon {
   @extend %button-icon;
 
   stroke: var(--icon-stroke);
 }
 
-.org-menu-icon-open {
+.organization-menu-icon-open {
   @extend %button-icon;
 
   stroke: var(--color-accent-primary);
diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs
index e09bea4f71..3886e15fc7 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.cljs
+++ b/frontend/src/app/main/ui/dashboard/subscription.cljs
@@ -152,24 +152,41 @@
         subscription-type
         (if nitrate? (:type nitrate-license) (get-subscription-type (-> profile :props :subscription)))
 
+        team-count (count teams)
+
+        account-age-days (dnt/account-age-days profile)
+
         teams-loaded? (seq teams)
 
-        no-orgs-created? (mf/with-memo [teams]
-                           (and (seq teams)
-                                (->> teams
-                                     vals
-                                     (not-any? :organization))))
+        no-organizations-created? (mf/with-memo [teams]
+                                    (and (seq teams)
+                                         (->> teams
+                                              vals
+                                              (not-any? :organization))))
 
         handle-click
         (mf/use-fn
-         (mf/deps subscription-type)
+         (mf/deps account-age-days subscription-type team-count)
          (fn []
-           (st/emit! (dnt/show-nitrate-popup :nitrate-form
-                                             (when (= subscription-type "unlimited")
-                                               {:show-contact-sales-option true})))))
+           (st/emit!
+            (ev/event
+             (cond-> {::ev/name "open-subscription-modal"
+                      ::ev/origin "dashboard:promotional-banner"
+                      :product "nitrate:enterprise"
+                      :source "frontend"
+                      :has-teams (pos? team-count)
+                      :team-count team-count}
+               (some? account-age-days)
+               (assoc :account-age-days account-age-days)))
+            (dnt/show-nitrate-popup :nitrate-form
+                                    (cond-> {:subscription-start-origin "dashboard:promotional-banner"}
+                                      (= subscription-type "unlimited")
+                                      (assoc :show-contact-sales-option true))))))
 
         handle-go-to-cc
-        (mf/use-fn dnt/go-to-nitrate-ac-create-organization)
+        (mf/use-fn
+         #(dnt/go-to-nitrate-ac-create-organization
+           "dashboard:first-organization-promotional-banner"))
 
         handle-open-renew-modal
         (mf/use-fn #(st/emit! (modal/show :nitrate-code-activation {:renew? true})))]
@@ -182,17 +199,17 @@
 
     [:*
      ;; TODO add translations for this texts when we have the definitive ones
-     (if (and nitrate? teams-loaded? no-orgs-created? (not show-subscription-warning?))
+     (if (and nitrate? teams-loaded? no-organizations-created? (not show-subscription-warning?))
        ;; Banner for users with active nitrate license but no organizations created
        [:div {:class (stl/css :nitrate-banner :highlighted)}
         [:div {:class (stl/css :nitrate-content)}
          [:span {:class (stl/css :nitrate-title)} (tr "subscription.banner.see-enterprise")]]
         [:div {:class (stl/css :nitrate-content)}
-         [:span {:class (stl/css :nitrate-info)} (tr "subscription.banner.create-org-info")]
+         [:span {:class (stl/css :nitrate-info)} (tr "subscription.banner.create-organization-info")]
          [:> button* {:variant "primary"
                       :type "button"
                       :class (stl/css :nitrate-bottom-button)
-                      :on-click handle-go-to-cc} (tr "nitrate.activation-success.create-org")]]]
+                      :on-click handle-go-to-cc} (tr "nitrate.activation-success.create-organization")]]]
 
        ;; Banner for users without nitrate license
        (when (not nitrate?)
diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs
index d100c2af27..2baaf90d12 100644
--- a/frontend/src/app/main/ui/dashboard/team.cljs
+++ b/frontend/src/app/main/ui/dashboard/team.cljs
@@ -24,7 +24,7 @@
    [app.main.ui.components.dropdown :refer [dropdown]]
    [app.main.ui.components.file-uploader :refer [file-uploader]]
    [app.main.ui.components.forms :as fm]
-   [app.main.ui.components.org-avatar :refer [org-avatar*]]
+   [app.main.ui.components.organization-avatar :refer [organization-avatar*]]
    [app.main.ui.dashboard.change-owner]
    [app.main.ui.dashboard.subscription :refer [members-cta*
                                                show-subscription-members-banner?
@@ -56,8 +56,8 @@
 (def ^:private menu-icon
   (deprecated-icon/icon-xref :menu (stl/css :menu-icon)))
 
-(def ^:private org-menu-icon
-  (deprecated-icon/icon-xref :menu (stl/css :org-menu-icon)))
+(def ^:private organization-menu-icon
+  (deprecated-icon/icon-xref :menu (stl/css :organization-menu-icon)))
 
 (def ^:private warning-icon
   (deprecated-icon/icon-xref :msg-warning (stl/css :warning-icon)))
@@ -888,41 +888,41 @@
 (def schema:organization-form [:map {:title "SelectOrgForm"}
                                [:selected-id ::sm/uuid]])
 
-(mf/defc render-org-combobox-avatar*
+(mf/defc render-organization-combobox-avatar*
   [{:keys [avatar]}]
-  [:> org-avatar* {:org (:organization avatar)
-                   :size (:size avatar)}])
+  [:> organization-avatar* {:organization (:organization avatar)
+                            :size (:size avatar)}])
 
 (mf/defc select-organization-modal
   {::mf/register modal/components
    ::mf/register-as :select-organization-modal}
-  [{:keys [organizations orgs-allowed current-organization-id on-confirm title-key text-key choose-key placeholder-key accept-key cancel-key info-message-key team-id]}]
+  [{:keys [organizations organizations-allowed current-organization-id on-confirm title-key text-key choose-key placeholder-key accept-key cancel-key info-message-key team-id]}]
   (let [valid-organizations (mf/with-memo [organizations]
                               (remove #(= (:id %) current-organization-id) organizations))
-        options (mf/with-memo [valid-organizations orgs-allowed]
+        options (mf/with-memo [valid-organizations organizations-allowed]
                   (mapv (fn [organization]
-                          (let [org-id (:id organization)
-                                ;; orgs-allowed is a map of org-id and a boolean indicating if it is allowed
-                                enabled? (or (nil? orgs-allowed)
-                                             (true? (get orgs-allowed org-id)))]
-                            (cond-> {:id (str org-id)
+                          (let [organization-id (:id organization)
+                                ;; organizations-allowed is a map of organization-id and a boolean indicating if it is allowed
+                                enabled? (or (nil? organizations-allowed)
+                                             (true? (get organizations-allowed organization-id)))]
+                            (cond-> {:id (str organization-id)
                                      :label (:name organization)
                                      :disabled (not enabled?)
                                      :dimmed (not enabled?)
-                                     :avatar {:render-fn render-org-combobox-avatar*
+                                     :avatar {:render-fn render-organization-combobox-avatar*
                                               :organization organization
                                               :size "xl"}}
                               (not enabled?)
-                              (assoc :title (tr "dashboard.team-organization.disabled-org-tooltip")))))
+                              (assoc :title (tr "dashboard.team-organization.disabled-organization-tooltip")))))
                         valid-organizations))
 
         form (fm/use-form :schema schema:organization-form :initial {})
 
         warning-info* (mf/use-state nil)
         warning-info (deref warning-info*)
-        selected-org (mf/with-memo [warning-info valid-organizations]
-                       (when warning-info
-                         (d/seek #(= (:id %) (:organization-id warning-info)) valid-organizations)))
+        selected-organization (mf/with-memo [warning-info valid-organizations]
+                                (when warning-info
+                                  (d/seek #(= (:id %) (:organization-id warning-info)) valid-organizations)))
 
         on-change
         (mf/use-fn
@@ -931,13 +931,13 @@
            (uforms/on-input-change form :selected-id id)
            ;; Check for external invitations when selection changes
            (when (and team-id id)
-             (let [org-id (d/parse-uuid id)]
+             (let [organization-id (d/parse-uuid id)]
                (->> (rp/cmd! :check-team-external-invitations
                              {:team-id team-id
-                              :organization-id org-id})
+                              :organization-id organization-id})
                     (rx/subs!
                      (fn [result]
-                       (reset! warning-info* (assoc result :organization-id org-id)))
+                       (reset! warning-info* (assoc result :organization-id organization-id)))
                      (fn [_]
                        (reset! warning-info* nil))))))))
 
@@ -947,22 +947,22 @@
          (fn []
            (on-confirm (dm/get-in @form [:clean-data :selected-id]))))]
     [:div {:class (stl/css :modal-overlay)}
-     [:div {:class (stl/css :modal-select-org-container :modal-container)}
-      [:div {:class (stl/css :modal-select-org-header)}
-       [:h2 {:class (stl/css :modal-select-org-title)}
+     [:div {:class (stl/css :modal-select-organization-container :modal-container)}
+      [:div {:class (stl/css :modal-select-organization-header)}
+       [:h2 {:class (stl/css :modal-select-organization-title)}
         (tr title-key)]
 
        [:button {:class (stl/css :modal-close-btn)
                  :on-click modal/hide!} deprecated-icon/close]]
 
       (when text-key
-        [:div {:class (stl/css :modal-content :modal-select-org-text)} (tr text-key)])
+        [:div {:class (stl/css :modal-content :modal-select-organization-text)} (tr text-key)])
 
-      [:div {:class (stl/css :modal-select-org-body)}
+      [:div {:class (stl/css :modal-select-organization-body)}
        (when info-message-key
-         [:div {:class (stl/css :modal-select-org-info)}
+         [:div {:class (stl/css :modal-select-organization-info)}
           (tr info-message-key)])
-       [:div {:class (stl/css :modal-select-org-content)}
+       [:div {:class (stl/css :modal-select-organization-content)}
         (tr choose-key)]
        [:> combobox* {:id "selected-id"
                       :class (stl/css :team-member)
@@ -976,14 +976,14 @@
        (when (and warning-info
                   (:has-external-invitations warning-info)
                   (not (:allows-anybody warning-info))
-                  selected-org)
-         [:div {:class (stl/css :modal-select-org-warning)}
+                  selected-organization)
+         [:div {:class (stl/css :modal-select-organization-warning)}
           [:& context-notification
-           {:content (tr "dashboard.select-org-modal.external-invitations-will-be-canceled")
+           {:content (tr "dashboard.select-organization-modal.external-invitations-will-be-canceled")
             :class (stl/css :external-invitations-warning)
             :level :warning}]
-          [:div {:class (stl/css :modal-select-org-content)}
-           (tr "dashboard.select-org-modal.external-invitations-warning" (:name selected-org))]])]
+          [:div {:class (stl/css :modal-select-organization-content)}
+           (tr "dashboard.select-organization-modal.external-invitations-warning" (:name selected-organization))]])]
 
       [:div {:class (stl/css :modal-footer)}
        [:div {:class (stl/css :action-buttons :modal-invitation-action-buttons)}
@@ -1504,7 +1504,7 @@
 
 (mf/defc team-settings-page*
   [{:keys [team]}]
-  (let [nitrate?    (contains? cfg/flags :nitrate)
+  (let [nitrate?    (contains? cfg/flags :admin-console)
         finput      (mf/use-ref)
 
         members     (get team :members)
@@ -1526,15 +1526,15 @@
                                  (filter :organization)
                                  (map dtm/team->organization)))
 
-        ;; Filter to orgs where user is allowed to create/add teams
+        ;; Filter to organizations where user is allowed to create/add teams
         organizations (mf/with-memo [all-organizations profile-id]
                         (->> all-organizations
-                             (filter (fn [org]
-                                       (let [perm      (get-in org [:permissions :create-teams])
-                                             is-owner? (= profile-id (:owner-id org))]
+                             (filter (fn [organization]
+                                       (let [perm      (get-in organization [:permissions :create-teams])
+                                             is-owner? (= profile-id (:owner-id organization))]
                                          (or (= perm "any") is-owner?))))))
 
-        ;; Keep parity with UX requirement: hide only when user belongs to one org.
+        ;; Keep parity with UX requirement: hide only when user belongs to one organization.
         can-change-organization? (mf/with-memo [all-organizations]
                                    (> (count all-organizations) 1))
 
@@ -1543,20 +1543,20 @@
                                         (pos? (count all-organizations))
                                         (not (:is-default team))))
 
-        show-org-options-menu*
+        show-organization-options-menu*
         (mf/use-state false)
 
-        show-org-options-menu?
-        (deref show-org-options-menu*)
+        show-organization-options-menu?
+        (deref show-organization-options-menu*)
 
         on-show-options-click
         (mf/use-fn
          (fn [event]
            (dom/stop-propagation event)
-           (swap! show-org-options-menu* not)))
+           (swap! show-organization-options-menu* not)))
 
-        close-org-options-menu
-        (mf/use-fn #(reset! show-org-options-menu* false))
+        close-organization-options-menu
+        (mf/use-fn #(reset! show-organization-options-menu* false))
 
         on-image-click
         (mf/use-fn #(dom/click (mf/ref-val finput)))
@@ -1565,11 +1565,11 @@
         (fn [file]
           (st/emit! (dtm/update-team-photo file)))
 
-        on-remove-team-from-org
+        on-remove-team-from-organization
         (mf/use-fn
          (mf/deps team)
          (fn []
-           (st/emit! (dnt/show-remove-team-from-org-modal {:team-id (:id team)}))))
+           (st/emit! (dnt/show-remove-team-from-organization-modal {:team-id (:id team)}))))
 
         on-add-team-to-organization
         (mf/use-fn
@@ -1577,11 +1577,11 @@
          (fn []
            (st/emit! (dnt/show-add-team-to-organization-modal {:team-id (:id team)}))))
 
-        on-change-team-org
+        on-change-team-organization
         (mf/use-fn
          (mf/deps team)
          (fn []
-           (st/emit! (dnt/show-change-team-org-modal {:team-id (:id team)}))))]
+           (st/emit! (dnt/show-change-team-organization-modal {:team-id (:id team)}))))]
 
     (mf/with-effect [team]
       (dom/set-html-title (tr "title.team-settings"
@@ -1622,8 +1622,8 @@
           (let [organization (:organization team)]
             (if organization
               [:div {:class (stl/css :block-content)}
-               [:div {:class (stl/css :org-block-content)}
-                [:> org-avatar* {:org (dtm/team->organization team) :size "xxxl"}]
+               [:div {:class (stl/css :organization-block-content)}
+                [:> organization-avatar* {:organization (dtm/team->organization team) :size "xxxl"}]
                 [:span {:class (stl/css :block-text)}
                  (:name organization)]
 
@@ -1631,19 +1631,19 @@
                   [:*
                    [:> button* {:variant "ghost"
                                 :type "button"
-                                :class (stl/css-case :org-options-btn (not show-org-options-menu?) :org-options-btn-open show-org-options-menu?)
+                                :class (stl/css-case :organization-options-btn (not show-organization-options-menu?) :organization-options-btn-open show-organization-options-menu?)
                                 :on-click on-show-options-click}
-                    org-menu-icon
+                    organization-menu-icon
 
-                    [:& dropdown {:show show-org-options-menu? :on-close close-org-options-menu :dropdown-id "org-options"}
-                     [:ul {:class (stl/css :org-dropdown)
+                    [:& dropdown {:show show-organization-options-menu? :on-close close-organization-options-menu :dropdown-id "organization-options"}
+                     [:ul {:class (stl/css :organization-dropdown)
                            :role "listbox"}
                       (when can-change-organization?
-                        [:li {:on-click on-change-team-org
-                              :class (stl/css :org-dropdown-item)}
+                        [:li {:on-click on-change-team-organization
+                              :class (stl/css :organization-dropdown-item)}
                          (tr "dashboard.team-organization.change")])
-                      [:li {:on-click on-remove-team-from-org
-                            :class (stl/css :org-dropdown-item)}
+                      [:li {:on-click on-remove-team-from-organization
+                            :class (stl/css :organization-dropdown-item)}
                        (tr "dashboard.team-organization.remove")]]]]])]]
               [:*
                [:div {:class (stl/css :block-content)}
diff --git a/frontend/src/app/main/ui/dashboard/team.scss b/frontend/src/app/main/ui/dashboard/team.scss
index a1bf36a814..14366781c4 100644
--- a/frontend/src/app/main/ui/dashboard/team.scss
+++ b/frontend/src/app/main/ui/dashboard/team.scss
@@ -932,47 +932,47 @@
 
 // SELECT ORGANIZATION MODAL
 
-.modal-select-org-container {
+.modal-select-organization-container {
   display: flex;
   flex-direction: column;
   inline-size: $sz-512;
 }
 
-.modal-select-org-header {
+.modal-select-organization-header {
   margin-block-end: var(--sp-xxxl);
 }
 
-.modal-select-org-body {
+.modal-select-organization-body {
   display: flex;
   flex-direction: column;
   gap: var(--sp-s);
 }
 
-.modal-select-org-warning {
+.modal-select-organization-warning {
   display: flex;
   flex-direction: column;
   gap: var(--sp-xxl);
 }
 
-.modal-select-org-content {
+.modal-select-organization-content {
   @include t.use-typography("body-medium");
 
   color: var(--color-foreground-secondary);
 }
 
-.modal-select-org-info {
+.modal-select-organization-info {
   @include t.use-typography("body-medium");
 
   color: var(--color-foreground-secondary);
 }
 
-.modal-select-org-title {
+.modal-select-organization-title {
   @include t.use-typography("headline-large");
 
   color: var(--color-foreground-primary);
 }
 
-.modal-select-org-text {
+.modal-select-organization-text {
   @include t.use-typography("body-medium");
 
   color: var(--color-foreground-secondary);
@@ -984,7 +984,7 @@
 
 // ORGANIZATIONS SETTINGS
 
-.org-block-content {
+.organization-block-content {
   display: grid;
   grid-template-columns: var(--sp-xxxl) 1fr var(--sp-xxxl);
   align-items: center;
@@ -992,7 +992,7 @@
   inline-size: max-content;
 }
 
-.org-options-btn {
+.organization-options-btn {
   padding: 0;
   justify-content: center;
 
@@ -1003,7 +1003,7 @@
   }
 }
 
-.org-options-btn-open {
+.organization-options-btn-open {
   padding: 0;
   justify-content: center;
 
@@ -1013,7 +1013,7 @@
   position: relative;
 }
 
-.org-menu-icon {
+.organization-menu-icon {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -1025,7 +1025,7 @@
   stroke: var(--stroke-color);
 }
 
-.org-dropdown {
+.organization-dropdown {
   box-shadow: var(--el-shadow-dark);
   display: flex;
   flex-direction: column;
@@ -1043,7 +1043,7 @@
   min-inline-size: $sz-160;
 }
 
-.org-dropdown-item {
+.organization-dropdown-item {
   @include t.use-typography("body-small");
 
   display: flex;
diff --git a/frontend/src/app/main/ui/dashboard/team_form.cljs b/frontend/src/app/main/ui/dashboard/team_form.cljs
index 4d60516a7c..21a9708c4d 100644
--- a/frontend/src/app/main/ui/dashboard/team_form.cljs
+++ b/frontend/src/app/main/ui/dashboard/team_form.cljs
@@ -152,10 +152,10 @@
                                         (tr "dashboard.no-permission-create-team.message" organization-name)]
                           :delete-team [(tr "dashboard.delete-team")
                                         (tr "dashboard.no-permission-delete-team.message" organization-name)]
-                          :no-orgs-create [(tr "dashboard.select-org-modal.title")
-                                           (tr "dashboard.no-org-allows-create-team.message")]
-                          :no-orgs-change [(tr "dashboard.change-org-modal.title")
-                                           (tr "dashboard.no-permission-move-team.message" organization-name)])]
+                          :no-organizations-create [(tr "dashboard.select-organization-modal.title")
+                                                    (tr "dashboard.no-organization-allows-create-team.message")]
+                          :no-organizations-change [(tr "dashboard.change-organization-modal.title")
+                                                    (tr "dashboard.no-permission-move-team.message" organization-name)])]
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-container)}
       [:div {:class (stl/css :modal-header)}
diff --git a/frontend/src/app/main/ui/ds.cljs b/frontend/src/app/main/ui/ds.cljs
index 9dd4eab3fa..ec122ac47f 100644
--- a/frontend/src/app/main/ui/ds.cljs
+++ b/frontend/src/app/main/ui/ds.cljs
@@ -25,6 +25,7 @@
    [app.main.ui.ds.foundations.typography.text :refer [text*]]
    [app.main.ui.ds.foundations.utilities.token.token-status :refer [token-status-icon*
                                                                     token-status-list]]
+   [app.main.ui.ds.layout.modal :refer [modal* modal-header* modal-content* modal-footer*]]
    [app.main.ui.ds.layout.tab-switcher :refer [tab-switcher*]]
    [app.main.ui.ds.notifications.actionable :refer [actionable*]]
    [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
@@ -83,6 +84,10 @@
     :MilestoneGroup milestone-group*
     :Date date*
     :PanelTitle panel-title*
+    :Modal modal*
+    :ModalHeader modal-header*
+    :ModalContent modal-content*
+    :ModalFooter modal-footer*
 
     :set-default-translations
     (fn [data]
diff --git a/frontend/src/app/main/ui/ds/buttons/button.cljs b/frontend/src/app/main/ui/ds/buttons/button.cljs
index 35e99dea00..73b6a65180 100644
--- a/frontend/src/app/main/ui/ds/buttons/button.cljs
+++ b/frontend/src/app/main/ui/ds/buttons/button.cljs
@@ -42,4 +42,4 @@
                                                (on-ref node)))})]
     [:> element props
      (when icon [:> icon* {:icon-id icon :size "m"}])
-     [:span {:class (stl/css :label-wrapper)} children]]))
+     children]))
diff --git a/frontend/src/app/main/ui/ds/controls/combobox.mdx b/frontend/src/app/main/ui/ds/controls/combobox.mdx
index 0537d7c000..8b30516547 100644
--- a/frontend/src/app/main/ui/ds/controls/combobox.mdx
+++ b/frontend/src/app/main/ui/ds/controls/combobox.mdx
@@ -61,23 +61,23 @@ Avatar rendering is defined per option with `:render-fn`, so each avatar type ca
 
 ```clj
 ;; Example renderer for organization avatars
-(mf/defc render-org-avatar*
+(mf/defc render-organization-avatar*
   [{:keys [avatar]}]
   (when (= :organization (:type avatar))
-    [:> org-avatar* {:org (:organization avatar)
-                     :size (:size avatar)}]))
+    [:> organization-avatar* {:organization (:organization avatar)
+                              :size (:size avatar)}]))
 
 [:> combobox*
     {:options [{:label "Design Team"
-                :id "org-design"
-                :avatar {:render-fn render-org-avatar*
+                :id "organization-design"
+                :avatar {:render-fn render-organization-avatar*
                          :size "s"
                          :organization {:name "Design Team"
                                         :organization-avatar-bg-url "https://example.com/avatar-bg.svg"
                                         :organization-custom-photo nil}}}
                {:label "Engineering"
-                :id "org-engineering"
-                :avatar {:render-fn render-org-avatar*
+                :id "organization-engineering"
+                :avatar {:render-fn render-organization-avatar*
                          :size "s"
                          :organization {:name "Engineering"
                                         :organization-avatar-bg-url nil
diff --git a/frontend/src/app/main/ui/ds/controls/numeric-input.stories.jsx b/frontend/src/app/main/ui/ds/controls/numeric-input.stories.jsx
index 277cde04f3..ffb5684c99 100644
--- a/frontend/src/app/main/ui/ds/controls/numeric-input.stories.jsx
+++ b/frontend/src/app/main/ui/ds/controls/numeric-input.stories.jsx
@@ -5,6 +5,7 @@
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 import * as React from "react";
 import Components from "@target/components";
+import { userEvent, within, expect } from "storybook/test";
 
 const { NumericInput } = Components;
 const { icons } = Components.meta;
@@ -128,3 +129,255 @@ export const WithTokens = {
   },
   render: ({ ...args }) => <NumericInput {...args} />,
 };
+
+// Regression tests for https://github.com/penpot/penpot/issues/10638 —
+// on-change must never receive a string; only numbers, nil, or token ops.
+
+const invalidInputCalls = [];
+
+export const TestInvalidInputNeverEmitsString = {
+  args: {
+    // Mirrors the expanded padding fields on a mixed multi-selection:
+    // no value, not nillable (layout_container.cljs multiple-padding-selection*).
+    nillable: false,
+    min: 0,
+    icon: undefined,
+    property: "padding",
+    onChange: (value) => invalidInputCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Invalid text commits no string values", async () => {
+      invalidInputCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.type(input, "abc");
+      await userEvent.keyboard("{Enter}");
+
+      const nonNumeric = invalidInputCalls.filter(
+        (v) => typeof v !== "number" && v !== null && v !== undefined,
+      );
+      expect(nonNumeric).toEqual([]);
+    });
+
+    await step("Whitespace-only input commits nothing", async () => {
+      invalidInputCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "   ");
+      await userEvent.keyboard("{Enter}");
+
+      expect(invalidInputCalls).toEqual([]);
+    });
+  },
+};
+
+const precisionCalls = [];
+
+export const TestPrecisionRevertEmitsNothing = {
+  args: {
+    // Full-precision committed value (e.g. from a 10/3 expression): the
+    // display shows the rounded "3.33". Invalid input must revert the
+    // display without emitting the rounded value — this exact divergence
+    // leaked the rounded STRING before the fix (issue #10638).
+    value: 3.3333333333333335,
+    nillable: false,
+    min: 0,
+    icon: undefined,
+    property: "padding",
+    onChange: (value) => precisionCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Invalid text reverts the display, emits nothing", async () => {
+      precisionCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "abc");
+      await userEvent.keyboard("{Enter}");
+
+      expect(input).toHaveValue("3.33");
+      expect(precisionCalls).toEqual([]);
+    });
+  },
+};
+
+const recommitCalls = [];
+
+export const TestRecommitSameValueEmitsOnce = {
+  args: {
+    value: 33,
+    nillable: false,
+    min: 0,
+    icon: undefined,
+    property: "padding",
+    onChange: (value) => recommitCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Committing the same value twice emits once", async () => {
+      recommitCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "50");
+      await userEvent.keyboard("{Enter}");
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "50");
+      await userEvent.keyboard("{Enter}");
+
+      expect(recommitCalls).toEqual([50]);
+    });
+  },
+};
+
+const nillableClearCalls = [];
+
+export const TestNillableClearEmitsNil = {
+  args: {
+    value: 33,
+    nillable: true,
+    icon: undefined,
+    property: "gap",
+    onChange: (value) => nillableClearCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Clearing a nillable input emits null", async () => {
+      nillableClearCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.keyboard("{Enter}");
+
+      expect(nillableClearCalls).toEqual([null]);
+      expect(input).toHaveValue("");
+    });
+  },
+};
+
+const unifyCalls = [];
+
+export const TestTypingShownValueUnifiesMixed = {
+  args: {
+    // Same mixed-selection shape as above: the field displays "0" while the
+    // shapes hold differing values, so committing "0" must still emit.
+    nillable: false,
+    min: 0,
+    icon: undefined,
+    property: "padding",
+    onChange: (value) => unifyCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Committing the displayed default emits a number", async () => {
+      unifyCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "0");
+      await userEvent.keyboard("{Enter}");
+
+      expect(unifyCalls).toEqual([0]);
+    });
+  },
+};
+
+const escCalls = [];
+
+export const TestEscRevertsWithoutCommit = {
+  args: {
+    value: 33,
+    nillable: false,
+    min: 0,
+    icon: undefined,
+    property: "padding",
+    onChange: (value) => escCalls.push(value),
+  },
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+    const input = await canvas.getByRole("textbox");
+
+    await step("Escape discards typed text and commits nothing", async () => {
+      escCalls.length = 0;
+
+      await userEvent.click(input);
+      await userEvent.clear(input);
+      await userEvent.type(input, "50");
+      await userEvent.keyboard("{Escape}");
+
+      expect(input).toHaveValue("33");
+      expect(escCalls).toEqual([]);
+    });
+  },
+};
+
+const tokenCalls = [];
+
+export const TestTokenApplyAlwaysEmits = {
+  args: {
+    ...WithTokens.args,
+    // Token resolved value equals the current committed value on purpose:
+    // applying it must still emit the token ops.
+    value: 30,
+    icon: undefined,
+    property: "dimension",
+    onChange: (value) => tokenCalls.push(value),
+  },
+  parameters: WithTokens.parameters,
+  play: async ({ canvasElement, step }) => {
+    const canvas = within(canvasElement);
+
+    await step(
+      "Applying a token with the same value emits token ops",
+      async () => {
+        tokenCalls.length = 0;
+
+        const button = await canvas.getByRole("button");
+        await userEvent.click(button);
+
+        const option = await canvas.findByRole("option", {
+          name: /dimension-1/,
+        });
+        await userEvent.click(option);
+
+        expect(tokenCalls.length).toBe(1);
+        // Token ops arrive as a CLJS vector (not a JS array): a non-null
+        // object, never a scalar number/string.
+        expect(typeof tokenCalls[0]).toBe("object");
+        expect(tokenCalls[0]).not.toBeNull();
+      },
+    );
+
+    await step(
+      "Re-applying the same token emits nothing (toggle-token would unapply it)",
+      async () => {
+        const pill = await canvas.findByRole("button", {
+          name: /dimension-1/,
+        });
+        await userEvent.click(pill);
+
+        const option = await canvas.findByRole("option", {
+          name: /dimension-1/,
+        });
+        await userEvent.click(option);
+
+        expect(tokenCalls.length).toBe(1);
+      },
+    );
+  },
+};
diff --git a/frontend/src/app/main/ui/ds/controls/numeric_input.cljs b/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
index 03971210e2..ed7d4c4096 100644
--- a/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
+++ b/frontend/src/app/main/ui/ds/controls/numeric_input.cljs
@@ -44,7 +44,7 @@
   [val step min-val max-val]
   (mth/clamp (- val step) min-val max-val))
 
-(defn- parse-value
+(defn parse-value
   "Parses and clamps `raw-value` as a number within bounds;
    returns nil if invalid or empty."
   [raw-value last-value min-value max-value nillable]
@@ -188,10 +188,13 @@
         token-has-errors? (-> token-applied :errors seq boolean)
 
         is-multiple?    (= :multiple value)
+        ;; NOTE: from here on `value` is the committed value as a number,
+        ;; or nil when the selection has no single committed value (mixed
+        ;; selection, or an absent value).
         value           (cond
                           is-multiple? nil
                           (and nillable (nil? value)) nil
-                          :else (d/parse-double value default))
+                          :else (d/parse-double value (d/parse-double default)))
 
         ;; Default props
         nillable        (d/nilv nillable false)
@@ -234,6 +237,11 @@
 
         raw-value*      (mf/use-ref nil)
         last-value*     (mf/use-ref nil)
+        ;; Name of the token last applied through this input; dedups
+        ;; repeated applications of the same token (toggle-token would
+        ;; otherwise unapply it), while still emitting for a token whose
+        ;; resolved value equals the current committed value.
+        last-token-applied* (mf/use-ref nil)
 
         ;; Flag to prevent effect from overwriting token during selection
         ;; This prevents race condition between blur and token selection
@@ -292,7 +300,7 @@
 
         apply-value
         (mf/use-fn
-         (mf/deps on-change update-input value nillable min max)
+         (mf/deps on-change update-input value nillable min max default)
          (fn [raw-value]
            (let [raw-value (str/trim (str raw-value))]
              (if-let [parsed (parse-value raw-value (mf/ref-val last-value*) min max nillable)]
@@ -315,21 +323,26 @@
                    (when (fn? on-change)
                      (on-change nil)))
 
-                 (let [fallback-value (or (mf/ref-val last-value*) default)]
-                   (mf/set-ref-val! raw-value* fallback-value)
-                   (mf/set-ref-val!  last-value* fallback-value)
+                 ;; Invalid input: restore the display to the last committed
+                 ;; value (or the default) WITHOUT emitting on-change — the
+                 ;; shapes still hold their previous values, so there is
+                 ;; nothing to commit. Emitting here leaked non-numeric
+                 ;; values into shape data (issue #10638).
+                 (let [fallback-value (or (mf/ref-val last-value*) default)
+                       fallback-text  (if (some? fallback-value)
+                                        (fmt/format-number fallback-value)
+                                        "")]
+                   (mf/set-ref-val! raw-value* fallback-text)
                    (reset! token-applied-name* nil)
-                   (update-input (fmt/format-number fallback-value))
-
-                   (when (and (fn? on-change) (not= fallback-value (str value)))
-                     (on-change fallback-value))))))))
+                   (update-input fallback-text)))))))
 
         apply-token
         (mf/use-fn
          (mf/deps min max nillable on-change tokens)
          (fn [value name]
            (let [parsed (parse-value value (mf/ref-val last-value*) min max nillable)]
-             (when-not (= parsed (mf/ref-val last-value*))
+             (when-not (= name (mf/ref-val last-token-applied*))
+               (mf/set-ref-val! last-token-applied* name)
                (mf/set-ref-val! last-value* parsed)
                (when (fn? on-change)
                  (on-change (get-token-op tokens name)))))))
@@ -462,8 +475,13 @@
                  (handle-blur event))
 
                esc?
-               (do
-                 (update-input (fmt/format-number (mf/ref-val last-value*)))
+               ;; Discard the typed text entirely: restore the display AND
+               ;; the pending raw value, and clear the dirty flag so the
+               ;; blur below does not commit the discarded text.
+               (let [restore-text (or (fmt/format-number (mf/ref-val last-value*)) "")]
+                 (update-input restore-text)
+                 (mf/set-ref-val! raw-value* restore-text)
+                 (mf/set-ref-val! dirty-ref false)
                  (reset! is-open* false)
                  (dom/blur! node))
 
@@ -641,6 +659,7 @@
            (when-not disabled
              (dom/prevent-default event)
              (dom/stop-propagation event)
+             (mf/set-ref-val! last-token-applied* nil)
              (reset! token-applied-name* nil)
              (reset! selected-id* nil)
              (reset! focused-id* nil)
@@ -706,7 +725,7 @@
                                 :placeholder (if is-multiple?
                                                (tr "labels.mixed-values")
                                                placeholder)
-                                :default-value (or (mf/ref-val last-value*) (fmt/format-number value))
+                                :default-value (fmt/format-number (or (mf/ref-val last-value*) value))
                                 :on-blur handle-blur
                                 :on-key-down on-key-down
                                 :on-focus on-focus
@@ -739,8 +758,7 @@
                                         (dm/str)))
                 label       (or (get token :name) applied-token-name)
                 token-value (or (get token :resolved-value)
-                                (or (mf/ref-val last-value*)
-                                    (fmt/format-number value)))
+                                (fmt/format-number (or (mf/ref-val last-value*) value)))
                 token-value (if (and (some? id) (= name :opacity))
                               (* 100 token-value)
                               token-value)]
@@ -783,13 +801,18 @@
                      ""
 
                      :else
-                     (fmt/format-number (d/parse-double value default)))]
+                     (fmt/format-number (d/nilv value default)))]
         (mf/set-ref-val! raw-value* value')
-        (mf/set-ref-val! last-value* value')
+        ;; Keep the committed NUMBER (or nil) in last-value*; only the DOM
+        ;; and raw-value* hold formatted strings. Storing the formatted
+        ;; string here made the invalid-input fallback leak strings into
+        ;; on-change (see issue #10638).
+        (mf/set-ref-val! last-value* value)
 
         ;; Only sync token state if not in the middle of a selection
         ;; This prevents race condition between blur and token selection
         (when-not (mf/ref-val token-selection-in-progress*)
+          (mf/set-ref-val! last-token-applied* applied-token-name)
           (reset! token-applied-name* applied-token-name)
           (if applied-token-name
             (let [token-id (:id (get-option-by-name dropdown-options applied-token-name))]
diff --git a/frontend/src/app/main/ui/ds/controls/utilities/token_field.scss b/frontend/src/app/main/ui/ds/controls/utilities/token_field.scss
index 0c2fed2c84..765e6d5eae 100644
--- a/frontend/src/app/main/ui/ds/controls/utilities/token_field.scss
+++ b/frontend/src/app/main/ui/ds/controls/utilities/token_field.scss
@@ -24,7 +24,7 @@
   inline-size: 100%;
   background: var(--token-field-bg-color);
   border-radius: $br-8;
-  padding: var(--sp-xs);
+  padding-inline-end: var(--sp-xs);
   outline: $b-1 solid var(--token-field-outline-color);
   position: relative;
 
diff --git a/frontend/src/app/main/ui/ds/foundations/assets/icon.cljs b/frontend/src/app/main/ui/ds/foundations/assets/icon.cljs
index 44e44e075f..d0634e21b1 100644
--- a/frontend/src/app/main/ui/ds/foundations/assets/icon.cljs
+++ b/frontend/src/app/main/ui/ds/foundations/assets/icon.cljs
@@ -245,19 +245,24 @@
 (def ^:icon-id status-update "status-update")
 (def ^:icon-id status-wrong "status-wrong")
 (def ^:icon-id stroke-arrow "stroke-arrow")
+(def ^:icon-id stroke-bottom "stroke-bottom")
 (def ^:icon-id stroke-center "stroke-center")
 (def ^:icon-id stroke-circle "stroke-circle")
 (def ^:icon-id stroke-dashed "stroke-dashed")
 (def ^:icon-id stroke-diamond "stroke-diamond")
 (def ^:icon-id stroke-dotted "stroke-dotted")
+(def ^:icon-id stroke-extended "stroke-extended")
 (def ^:icon-id stroke-inside "stroke-inside")
+(def ^:icon-id stroke-left "stroke-left")
 (def ^:icon-id stroke-mixed "stroke-mixed")
 (def ^:icon-id stroke-outside "stroke-outside")
 (def ^:icon-id stroke-rectangle "stroke-rectangle")
+(def ^:icon-id stroke-right "stroke-right")
 (def ^:icon-id stroke-rounded "stroke-rounded")
 (def ^:icon-id stroke-size "stroke-size")
 (def ^:icon-id stroke-squared "stroke-squared")
 (def ^:icon-id stroke-solid "stroke-solid")
+(def ^:icon-id stroke-top "stroke-top")
 (def ^:icon-id stroke-triangle "stroke-triangle")
 (def ^:icon-id svg "svg")
 (def ^:icon-id swatches "swatches")
diff --git a/frontend/src/app/main/ui/ds/foundations/assets/raw_svg.cljs b/frontend/src/app/main/ui/ds/foundations/assets/raw_svg.cljs
index f30c5e5bc4..e856a2a1c5 100644
--- a/frontend/src/app/main/ui/ds/foundations/assets/raw_svg.cljs
+++ b/frontend/src/app/main/ui/ds/foundations/assets/raw_svg.cljs
@@ -22,6 +22,7 @@
 (def ^:svg-id logo-subscription "logo-subscription")
 (def ^:svg-id logo-subscription-light "logo-subscription-light")
 (def ^:svg-id nitrate-welcome "nitrate-welcome")
+(def ^:svg-id nitrate-welcome-light "nitrate-welcome-light")
 (def ^:svg-id marketing-arrows "marketing-arrows")
 (def ^:svg-id marketing-exchange "marketing-exchange")
 (def ^:svg-id marketing-file "marketing-file")
diff --git a/frontend/src/app/main/ui/ds/layout/modal.cljs b/frontend/src/app/main/ui/ds/layout/modal.cljs
new file mode 100644
index 0000000000..b808e7040c
--- /dev/null
+++ b/frontend/src/app/main/ui/ds/layout/modal.cljs
@@ -0,0 +1,120 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.main.ui.ds.layout.modal
+  (:require-macros
+   [app.main.style :as stl])
+  (:require
+   ["@penpot/ui/modal" :as modal]
+   [app.common.data :as d]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.foundations.typography :as t]
+   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
+   [app.util.i18n :refer [tr]]
+   [rumext.v2 :as mf]))
+
+(def ^:private schema:modal-header
+  [:map
+   [:title {:optional true} [:maybe :string]]
+   [:class {:optional true} [:maybe :string]]])
+
+(mf/defc modal-header*
+  {::mf/schema schema:modal-header}
+  [{:keys [title class children] :rest props}]
+  (let [props (mf/spread-props props
+                               {:class [class (stl/css :modal-header)]})]
+    [:> :div props
+     (when title
+       [:> heading* {:typography t/headline-medium
+                     :level 2
+                     :class (stl/css :modal-header-title)}
+        title])
+     children]))
+
+(def ^:private schema:modal-content
+  [:map
+   [:class {:optional true} [:maybe :string]]])
+
+(mf/defc modal-content*
+  {::mf/schema schema:modal-content}
+  [{:keys [class children] :rest props}]
+  (let [props (mf/spread-props props
+                               {:class [class (stl/css :modal-content)]})]
+    [:> :div props
+     children]))
+
+(def ^:private schema:modal-footer
+  [:map
+   [:class {:optional true} [:maybe :string]]
+   [:start {:optional true} [:maybe :any]]
+   [:end {:optional true} [:maybe :any]]
+   [:variant {:optional true} [:maybe [:enum "split" "base"]]]])
+
+(mf/defc modal-footer*
+  {::mf/schema schema:modal-footer}
+  [{:keys [class variant children start end] :rest props}]
+  (let [variant (d/nilv variant "base")
+        variant-class
+        (case variant
+          "split"  (stl/css :modal-footer-split)
+          "base" (stl/css :modal-footer-base)
+          nil)
+        props (mf/spread-props props
+                               {:class [class (stl/css :modal-footer) variant-class]})]
+    (if (= variant "split")
+      [:> :div props
+       [:> :div {:class (stl/css :modal-footer-left)}
+        start]
+       [:> :div {:class (stl/css :modal-footer-right)}
+        end]]
+      [:> :div props
+       children])))
+
+
+
+(def ^:private schema:modal
+  [:map
+   [:class {:optional true} [:maybe :string]]
+   [:is-open {:optional true} [:maybe :boolean]]
+   [:on-open-change {:optional true} [:maybe fn?]]
+   [:trigger {:optional true} [:maybe :any]]
+   [:is-dismissable {:optional true} [:maybe :boolean]]
+   [:size {:optional true} [:maybe [:enum "small" "medium" "large" "xlarge"]]]
+   [:hide-close {:optional true} [:maybe :boolean]]
+   [:show-body {:optional true} [:maybe :boolean]]])
+
+(mf/defc modal-close-button*
+  []
+  (let [close (modal/useModalClose)]
+    (when close
+      [:div {:class (stl/css :modal-close)}
+       [:> icon-button* {:icon "close"
+                         :variant "ghost"
+                         :aria-label (tr "labels.close")
+                         :on-click close}]])))
+
+(mf/defc modal*
+  {::mf/schema schema:modal}
+  [{:keys [class is-open on-open-change trigger is-dismissable size hide-close show-body children] :rest props}]
+  (let [hide-close     (d/nilv hide-close false)
+        is-dismissable (d/nilv is-dismissable true)
+        size           (d/nilv size "medium")
+        show-body      (d/nilv show-body true)
+        props
+        (mf/spread-props props
+                         {:class class
+                          :is-open is-open
+                          :on-open-change on-open-change
+                          :trigger trigger
+                          :is-dismissable is-dismissable
+                          :size size})]
+    [:> modal/Modal props
+     (when-not hide-close
+       [:> modal-close-button*])
+     (if show-body
+       [:div {:class [class (stl/css :modal-body)]}
+        children]
+       children)]))
diff --git a/frontend/src/app/main/ui/ds/layout/modal.mdx b/frontend/src/app/main/ui/ds/layout/modal.mdx
new file mode 100644
index 0000000000..5898e730d5
--- /dev/null
+++ b/frontend/src/app/main/ui/ds/layout/modal.mdx
@@ -0,0 +1,163 @@
+{ /* This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  Copyright (c) KALEIDOS INC Sucursal en España SL */ }
+import { Canvas, Meta } from "@storybook/addon-docs/blocks";
+import * as Modal from "./modal.stories";
+
+<Meta title="Layout/Modal" />
+
+# Modal
+
+A modal interrupts the current workflow to display critical information or require a user decision. While open, interaction with the rest of the interface is blocked.
+
+## Example
+
+### Default
+
+<Canvas of={Modal.Default} />
+
+---
+
+# Usage
+
+The modal is composed of optional layout components.
+
+```clojure
+[:> modal*
+ {:is-open open?
+  :on-open-change #(reset! open* %)}
+
+ [:> modal-header*
+  {:title "Dialog title"}]
+
+ [:> modal-content* {}
+  [:> :p {} "Content"]]
+
+ [:> modal-footer* {}
+  [:> button* {:variant "secondary"} "Cancel"]
+  [:> button* {:variant "primary"} "Save"]]]
+```
+
+The header, content and footer are optional. Use only the sections your dialog requires.
+
+---
+
+## Footer layouts
+
+### Simple
+
+Use when all actions belong together.
+
+```clojure
+[:> modal-footer* {}
+ [:> button* {:variant "secondary"} "Cancel"]
+ [:> button* {:variant "primary"} "Save"]]
+```
+
+Result:
+
+```
+.                Cancel   Save
+```
+
+### Split actions
+
+Use when a destructive or secondary action should be visually separated from the primary actions.
+
+```clojure
+[:> modal-footer*
+ {:variant "split"
+  :start
+  (mf/html
+    [:> button* {:variant "destructive"} "Delete"])
+
+  :end
+  (mf/html
+  [:*
+    [:> button* {:variant "secondary"} "Cancel"]
+    [:> button* {:variant "primary"} "Save"]])}]
+```
+
+Result:
+
+```
+Delete                 Cancel   Save
+```
+
+---
+
+# Modal props
+## is-open
+
+Controls whether the modal is open.
+
+Type: boolean
+
+## on-open-change
+
+Callback invoked whenever the open state changes.
+
+Type: function
+
+## trigger
+
+Element that opens the modal.
+
+Type: React element
+
+## is-dismissable
+
+Whether the modal can be closed by pressing Escape or clicking the backdrop.
+
+Default: true
+
+## hide-close
+
+Hides the default close button.
+
+Default: false
+
+## size
+
+Controls the modal width.
+
+Options
+
+"small"
+"medium" (default)
+"large"
+"xlarge"
+
+## class
+
+Additional CSS class applied to the modal.
+
+# Accessibility
+
+The modal automatically provides:
+
+- Accessible `dialog` semantics
+- Focus trapping
+- Focus restoration when closed
+- Keyboard support
+- Optional dismissal with **Escape** and backdrop click
+
+---
+
+# Best practices
+
+Use a modal for:
+
+- Confirming destructive actions
+- Collecting short forms
+- Displaying critical information
+- Requesting a decision before continuing
+
+Avoid using a modal for:
+
+- Long forms
+- Large amounts of content
+- Complex navigation
+- Non-critical information
\ No newline at end of file
diff --git a/frontend/src/app/main/ui/ds/layout/modal.scss b/frontend/src/app/main/ui/ds/layout/modal.scss
new file mode 100644
index 0000000000..c08df6810d
--- /dev/null
+++ b/frontend/src/app/main/ui/ds/layout/modal.scss
@@ -0,0 +1,68 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+@use "ds/mixins" as *;
+
+.modal-header {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.modal-header-title {
+  color: var(--color-foreground-primary);
+}
+
+.modal-close {
+  position: absolute;
+  inset-block-start: var(--sp-m);
+  inset-inline-end: var(--sp-s);
+}
+
+.modal-content {
+  @include custom-scrollbar;
+
+  padding: var(--sp-l);
+  overflow-block: auto;
+  color: var(--color-foreground-primary);
+}
+
+.modal-body {
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  gap: var(--sp-xxxl);
+  min-block-size: 0;
+  padding: var(--sp-xxxl);
+}
+
+.modal-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--sp-s);
+  flex-shrink: 0;
+  inline-size: 100%;
+}
+
+.modal-footer-base {
+  justify-content: flex-end;
+}
+
+.modal-footer-split {
+  justify-content: space-between;
+}
+
+.modal-footer-left {
+  display: flex;
+  align-items: center;
+  gap: var(--sp-s);
+}
+
+.modal-footer-right {
+  display: flex;
+  align-items: center;
+  gap: var(--sp-s);
+}
diff --git a/frontend/src/app/main/ui/ds/layout/modal.stories.jsx b/frontend/src/app/main/ui/ds/layout/modal.stories.jsx
new file mode 100644
index 0000000000..fbb996a3f5
--- /dev/null
+++ b/frontend/src/app/main/ui/ds/layout/modal.stories.jsx
@@ -0,0 +1,146 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+import * as React from "react";
+import Components from "@target/components";
+
+const { Modal, ModalHeader, ModalContent, ModalFooter, Button, IconButton } =
+  Components;
+
+const ModalWrapper = ({ children, ...props }) => {
+  const [open, setOpen] = React.useState(props.isOpen ?? false);
+
+  React.useEffect(() => {
+    setOpen(props.isOpen ?? false);
+  }, [props.isOpen]);
+
+  return (
+    <>
+      <Button onClick={() => setOpen(true)}>Open Modal</Button>
+      <Modal {...props} isOpen={open} onOpenChange={setOpen}>
+        {children}
+      </Modal>
+    </>
+  );
+};
+
+export default {
+  title: "Layout/Modal",
+  component: ModalWrapper,
+  args: {
+    isOpen: false,
+    size: "medium",
+    isDismissable: true,
+    children: (
+      <>
+        <ModalHeader title="Dialog Title" />
+        <ModalContent>
+          <p>This is the default modal content.</p>
+          <p>You can put any React content inside.</p>
+        </ModalContent>
+        <ModalFooter>
+          <Button variant="secondary">Cancel</Button>
+          <Button variant="primary">Confirm</Button>
+        </ModalFooter>
+      </>
+    ),
+  },
+  argTypes: {
+    size: {
+      control: "select",
+      options: ["small", "medium", "large", "xlarge"],
+    },
+    isDismissable: { control: "boolean" },
+  },
+  parameters: {
+    controls: { exclude: ["isOpen", "onOpenChange", "children"] },
+  },
+  render: ({ ...args }) => <ModalWrapper {...args} />,
+};
+
+export const Default = {};
+
+export const WithoutTitle = {
+  args: {
+    hideClose: true,
+    children: (
+      <ModalContent>
+        <p>This modal has no header or footer.</p>
+      </ModalContent>
+    ),
+  },
+};
+
+export const DestructiveFooter = {
+  args: {
+    children: (
+      <>
+        <ModalHeader title="Delete item" />
+        <ModalContent>
+          <p>
+            Are you sure you want to delete this item? This action cannot be
+            undone.
+          </p>
+        </ModalContent>
+        <ModalFooter
+          variant="split"
+          start={<Button variant="destructive">Delete</Button>}
+          end={
+            <>
+              <Button variant="secondary">Cancel</Button>
+              <Button variant="primary">Accept</Button>
+            </>
+          }
+        />
+      </>
+    ),
+  },
+};
+
+export const ScrollableContent = {
+  args: {
+    children: (
+      <>
+        <ModalHeader title="Terms and Conditions" />
+        <ModalContent>
+          {Array.from({ length: 20 }, (_, i) => (
+            <p key={i}>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do
+              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+              enim ad minim veniam, quis nostrud exercitation ullamco laboris
+              nisi ut aliquip ex ea commodo consequat.
+            </p>
+          ))}
+        </ModalContent>
+        <ModalFooter>
+          <Button variant="secondary">Cancel</Button>
+          <Button variant="primary">Accept</Button>
+        </ModalFooter>
+      </>
+    ),
+  },
+};
+
+export const NonDismissable = {
+  args: {
+    isDismissable: false,
+    children: (
+      <>
+        <ModalHeader title="Important" />
+        <ModalContent>
+          <p>
+            This modal cannot be closed by clicking the backdrop or pressing
+            Escape.
+          </p>
+        </ModalContent>
+        <ModalFooter>
+          <Button variant="secondary">Cancel</Button>
+          <Button variant="primary">Confirm</Button>
+        </ModalFooter>
+      </>
+    ),
+  },
+};
diff --git a/frontend/src/app/main/ui/ds/product/empty_state.cljs b/frontend/src/app/main/ui/ds/product/empty_state.cljs
index 9b738cb98d..3dd6ef739f 100644
--- a/frontend/src/app/main/ui/ds/product/empty_state.cljs
+++ b/frontend/src/app/main/ui/ds/product/empty_state.cljs
@@ -14,7 +14,7 @@
 (def ^:private schema:empty-state
   [:map
    [:class {:optional true} :string]
-   [:icon [:and :string [:fn #(contains? icon-list %)]]]
+   [:icon {:optional true} [:and :string [:fn #(contains? icon-list %)]]]
    [:text :string]])
 
 (mf/defc empty-state*
@@ -22,8 +22,9 @@
   [{:keys [class icon text] :rest props}]
   (let [props (mf/spread-props props {:class [class (stl/css :group)]})]
     [:> :div props
-     [:div {:class (stl/css :icon-wrapper)}
-      [:> icon* {:icon-id icon
-                 :size "l"
-                 :class (stl/css :icon)}]]
+     (when icon
+       [:div {:class (stl/css :icon-wrapper)}
+        [:> icon* {:icon-id icon
+                   :size "l"
+                   :class (stl/css :icon)}]])
      [:div {:class (stl/css :text)} text]]))
diff --git a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
index bc20c517c9..e3d6b153fb 100644
--- a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
+++ b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
@@ -322,25 +322,26 @@
          (let [trigger-el (mf/ref-val trigger-ref)
                tooltip-el (mf/ref-val tooltip-ref)]
            (when (and trigger-el tooltip-el)
-             (ts/raf
-              (fn []
-                (let [origin-brect (dom/get-bounding-rect trigger-el)
-                      tooltip-brect (dom/get-bounding-rect tooltip-el)
-                      window-size (dom/get-window-size)]
-                  (when-let [[new-placement placement-rect]
-                             (find-matching-placement
-                              placement
-                              tooltip-brect
-                              origin-brect
-                              window-size
-                              offset)]
-                    (dom/set-css-property! tooltip-el "inset-block-start"
-                                           (str (:top placement-rect) "px"))
-                    (dom/set-css-property! tooltip-el "inset-inline-start"
-                                           (str (:left placement-rect) "px"))
+             (let [raf-id (ts/raf
+                           (fn []
+                             (let [origin-brect (dom/get-bounding-rect trigger-el)
+                                   tooltip-brect (dom/get-bounding-rect tooltip-el)
+                                   window-size (dom/get-window-size)]
+                               (when-let [[new-placement placement-rect]
+                                          (find-matching-placement
+                                           placement
+                                           tooltip-brect
+                                           origin-brect
+                                           window-size
+                                           offset)]
+                                 (dom/set-css-property! tooltip-el "inset-block-start"
+                                                        (str (:top placement-rect) "px"))
+                                 (dom/set-css-property! tooltip-el "inset-inline-start"
+                                                        (str (:left placement-rect) "px"))
 
-                    (when (not= new-placement placement)
-                      (reset! placement* new-placement)))))))))))
+                                 (when (not= new-placement placement)
+                                   (reset! placement* new-placement))))))]
+               #(ts/cancel-af! raf-id)))))))
 
     [:> :div props
      children
diff --git a/frontend/src/app/main/ui/ds/utilities/swatch.cljs b/frontend/src/app/main/ui/ds/utilities/swatch.cljs
index 9e552e8744..63c652bd21 100644
--- a/frontend/src/app/main/ui/ds/utilities/swatch.cljs
+++ b/frontend/src/app/main/ui/ds/utilities/swatch.cljs
@@ -65,7 +65,7 @@
         (uc/gradient-type->string (:type gradient))
 
         (some? image)
-        (tr "media.image")))))
+        (or (:name image) (tr "media.image"))))))
 
 (def ^:private schema:swatch
   [:map {:title "SchemaSwatch"}
diff --git a/frontend/src/app/main/ui/flex_controls/common.cljs b/frontend/src/app/main/ui/flex_controls/common.cljs
index 1aa28a5289..72bed0cf0f 100644
--- a/frontend/src/app/main/ui/flex_controls/common.cljs
+++ b/frontend/src/app/main/ui/flex_controls/common.cljs
@@ -1,9 +1,19 @@
 (ns app.main.ui.flex-controls.common
   (:require
    [app.main.constants :as mconst]
+   [app.main.streams :as ms]
    [app.main.ui.formats :as fmt]
    [rumext.v2 :as mf]))
 
+;; ------------------------------------------------
+;; INTERACTIVE TRANSFORM CLEANUP
+;; ------------------------------------------------
+
+;; Flex spacing controls (padding/margin/gap) call this from their
+;; unmount cleanup, guarded on the resizing flag. See
+;; `ms/clear-transform-preview!` for the rationale.
+(def clear-transform-preview! ms/clear-transform-preview!)
+
 ;; ------------------------------------------------
 ;; CONSTANTS
 ;; ------------------------------------------------
diff --git a/frontend/src/app/main/ui/flex_controls/gap.cljs b/frontend/src/app/main/ui/flex_controls/gap.cljs
index 38926c9887..6bcb237821 100644
--- a/frontend/src/app/main/ui/flex_controls/gap.cljs
+++ b/frontend/src/app/main/ui/flex_controls/gap.cljs
@@ -98,6 +98,11 @@
                  (when on-change
                    (on-change modifiers)))))))]
 
+    (mf/with-effect []
+      (fn []
+        (when (some? @resizing)
+          (fcc/clear-transform-preview!))))
+
     [:g.gap-rect
      [:rect.info-area
       {:x (:x rect-data)
diff --git a/frontend/src/app/main/ui/flex_controls/margin.cljs b/frontend/src/app/main/ui/flex_controls/margin.cljs
index d8ad044355..b8d39c73fb 100644
--- a/frontend/src/app/main/ui/flex_controls/margin.cljs
+++ b/frontend/src/app/main/ui/flex_controls/margin.cljs
@@ -105,6 +105,11 @@
                  (when on-change
                    (on-change modifiers)))))))]
 
+    (mf/with-effect []
+      (fn []
+        (when @resizing?
+          (fcc/clear-transform-preview!))))
+
     [:rect.margin-rect
      {:x (:x rect-data)
       :y (:y rect-data)
diff --git a/frontend/src/app/main/ui/flex_controls/padding.cljs b/frontend/src/app/main/ui/flex_controls/padding.cljs
index c10f83cd31..1b125717bd 100644
--- a/frontend/src/app/main/ui/flex_controls/padding.cljs
+++ b/frontend/src/app/main/ui/flex_controls/padding.cljs
@@ -105,6 +105,11 @@
                  (when on-change
                    (on-change modifiers)))))))]
 
+    (mf/with-effect []
+      (fn []
+        (when @resizing?
+          (fcc/clear-transform-preview!))))
+
     [:g.padding-rect
      [:rect.info-area
       {:x (:x rect-data)
diff --git a/frontend/src/app/main/ui/forms.cljs b/frontend/src/app/main/ui/forms.cljs
index b542a06073..f6a870f618 100644
--- a/frontend/src/app/main/ui/forms.cljs
+++ b/frontend/src/app/main/ui/forms.cljs
@@ -117,14 +117,15 @@
         on-paste
         (mf/use-fn
          (fn [event]
-           (let [paste-data (-> event .-clipboardData (.getData "text"))]
-             (when (and (string? paste-data)
-                        (re-find #"[,\s]" paste-data))
-               (dom/prevent-default event)
-               (dom/stop-propagation event)
+           (when-let [clipboard-data (.-clipboardData event)]
+             (let [paste-data (.getData clipboard-data "text")]
+               (when (and (string? paste-data)
+                          (re-find #"[,\s]" paste-data))
+                 (dom/prevent-default event)
+                 (dom/stop-propagation event)
 
-               ;; Mark as touched
-               (swap! form assoc-in [:touched name] true)
+                 ;; Mark as touched
+                 (swap! form assoc-in [:touched name] true))
 
                ;; Split pasted text by commas and/or whitespace, add each valid part
                (let [parts (->> (str/split paste-data #",|\s+")
diff --git a/frontend/src/app/main/ui/hooks.cljs b/frontend/src/app/main/ui/hooks.cljs
index ed13c36e4e..83b86d932d 100644
--- a/frontend/src/app/main/ui/hooks.cljs
+++ b/frontend/src/app/main/ui/hooks.cljs
@@ -42,13 +42,14 @@
     state))
 
 (defn use-shortcuts
-  [key shortcuts]
-  (mf/use-effect
-   #js [(str key) shortcuts]
-   (fn []
-     (st/emit! (dsc/push-shortcuts key shortcuts))
+  [key shortcuts group-key]
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)]
+    (mf/use-effect
+     #js [(str key) shortcuts custom-shortcuts]
      (fn []
-       (st/emit! (dsc/pop-shortcuts key))))))
+       (st/emit! (dsc/push-shortcuts key shortcuts group-key))
+       (fn []
+         (st/emit! (dsc/pop-shortcuts key)))))))
 
 (defn- set-timer
   [state ms func]
@@ -281,6 +282,16 @@
       (mf/set-ref-val! ref val))
     (mf/ref-val ref)))
 
+;; FIXME: replace with rumext
+(defn use-focus-timer-ref
+  "Returns a ref for scheduling focus timers and disposes any pending
+   timer on component unmount."
+  []
+  (let [ref (mf/use-ref nil)]
+    (mf/with-effect []
+      #(some-> (mf/ref-val ref) ts/dispose!))
+    ref))
+
 ;; FIXME: rename to use-focus-objects
 (defn with-focus-objects
   ([objects]
diff --git a/frontend/src/app/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs
index 1ef023a079..ee405fa7f8 100644
--- a/frontend/src/app/main/ui/icons.cljs
+++ b/frontend/src/app/main/ui/icons.cljs
@@ -17,10 +17,10 @@
 (def ^:icon logo (icon-xref :penpot-logo))
 (def ^:icon logo-icon (icon-xref :penpot-logo-icon))
 (def ^:icon logo-error-screen (icon-xref :logo-error-screen))
-(def ^:icon logo-files (icon-xref :logo-files))
 (def ^:icon logo-subscription (icon-xref :logo-subscription))
 (def ^:icon logo-subscription-light (icon-xref :logo-subscription-light))
 (def ^:icon nitrate-welcome (icon-xref :nitrate-welcome))
+(def ^:icon nitrate-welcome-light (icon-xref :nitrate-welcome-light))
 
 (def ^:icon brand-openid (icon-xref :brand-openid))
 (def ^:icon brand-github (icon-xref :brand-github))
diff --git a/frontend/src/app/main/ui/inspect/attributes/geometry.cljs b/frontend/src/app/main/ui/inspect/attributes/geometry.cljs
index dbfa79a52c..8a6c255d50 100644
--- a/frontend/src/app/main/ui/inspect/attributes/geometry.cljs
+++ b/frontend/src/app/main/ui/inspect/attributes/geometry.cljs
@@ -22,6 +22,10 @@
    :left
    :top
    :border-radius
+   :border-block-start-width   ; top
+   :border-inline-end-width    ; right
+   :border-block-end-width     ; bottom
+   :border-inline-start-width  ; left
    :transform])
 
 (mf/defc geometry-block
diff --git a/frontend/src/app/main/ui/inspect/attributes/stroke.cljs b/frontend/src/app/main/ui/inspect/attributes/stroke.cljs
index bee02622cc..da2d1acb6a 100644
--- a/frontend/src/app/main/ui/inspect/attributes/stroke.cljs
+++ b/frontend/src/app/main/ui/inspect/attributes/stroke.cljs
@@ -13,11 +13,27 @@
    [app.main.ui.components.title-bar :refer [inspect-title-bar*]]
    [app.main.ui.inspect.attributes.common :as cmm]
    [app.util.code-gen.style-css :as css]
+   [app.util.code-gen.style-css-values :as cssv]
    [app.util.i18n :refer [tr]]
    [rumext.v2 :as mf]))
 
 (def ^:private properties [:border-style :border-width])
 
+(def ^:private per-side-properties
+  [:border-style
+   :border-block-start-width
+   :border-inline-end-width
+   :border-block-end-width
+   :border-inline-start-width])
+
+(defn- stroke-properties
+  "Logical per-side width properties when the stroke uses differing
+  per-side widths; the regular border-style/width pair otherwise."
+  [stroke]
+  (if (some? (cssv/stroke-per-side-widths stroke))
+    per-side-properties
+    properties))
+
 (defn- stroke->color [shape]
   {:color (:stroke-color shape)
    :opacity (:stroke-opacity shape)
@@ -41,7 +57,7 @@
          (fn [format]
            (reset! format* format)))]
     [:div {:class (stl/css :attributes-fill-block)}
-     (for [property properties]
+     (for [property (stroke-properties stroke)]
        (let [property-name (cmm/get-css-rule-humanized property)
              property-value (css/get-css-value objects stroke property)]
          [:div {:class (stl/css :stroke-row) :key   (str "stroke-" (:id shape) "-" property)}
@@ -56,7 +72,7 @@
        :property "Border color"
        :format format
        :on-change-format on-change
-       :copy-data (css/get-shape-properties-css objects {:strokes [shape]} properties)}]]))
+       :copy-data (css/get-shape-properties-css objects {:strokes [shape]} (stroke-properties stroke))}]]))
 
 ;; New implementation of stroke-block using the new color format selector
 ;; This component is used when the flag :inspect-styles is enabled. Update when flag no longer needed.
@@ -64,7 +80,7 @@
   [{:keys [objects shape stroke color-space]}]
   (let [color     (stroke->color stroke)]
     [:div {:class (stl/css :attributes-fill-block)}
-     (for [property properties]
+     (for [property (stroke-properties stroke)]
        (let [property-name (cmm/get-css-rule-humanized property)
              property-value (css/get-css-value objects stroke property)]
          [:div {:class (stl/css :stroke-row) :key   (str "stroke-" (:id shape) "-" property)}
@@ -78,7 +94,7 @@
       {:color color
        :property "Border color"
        :format (d/nilv (keyword color-space) :hex)
-       :copy-data (css/get-shape-properties-css objects {:strokes [shape]} properties {:format (keyword color-space)})}]]))
+       :copy-data (css/get-shape-properties-css objects {:strokes [shape]} (stroke-properties stroke) {:format (keyword color-space)})}]]))
 
 (mf/defc stroke-panel*
   [{:keys [shapes color-space]}]
diff --git a/frontend/src/app/main/ui/inspect/styles/panels/geometry.cljs b/frontend/src/app/main/ui/inspect/styles/panels/geometry.cljs
index 6888f99921..d008bf6f84 100644
--- a/frontend/src/app/main/ui/inspect/styles/panels/geometry.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/panels/geometry.cljs
@@ -22,6 +22,11 @@
    :border-start-end-radius
    :border-end-start-radius
    :border-end-end-radius
+   ;; side strokes
+   :border-block-start-width
+   :border-inline-end-width
+   :border-block-end-width
+   :border-inline-start-width
    :transform])
 
 (def ^:private shape-prop->border-radius-prop
diff --git a/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs b/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs
index 200a9d8138..2398eaede9 100644
--- a/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs
+++ b/frontend/src/app/main/ui/inspect/styles/panels/stroke.cljs
@@ -15,11 +15,28 @@
    [app.main.ui.inspect.styles.rows.color-properties-row :refer [color-properties-row*]]
    [app.main.ui.inspect.styles.rows.properties-row :refer [properties-row*]]
    [app.util.code-gen.style-css :as css]
+   [app.util.code-gen.style-css-values :as cssv]
    [app.util.color :as uc]
    [rumext.v2 :as mf]))
 
 (def ^:private properties [:border-color :border-style :border-width])
 
+(def ^:private per-side-properties
+  [:border-color
+   :border-style
+   :border-block-start-width
+   :border-inline-end-width
+   :border-block-end-width
+   :border-inline-start-width])
+
+(defn- stroke-properties
+  "Logical per-side width properties when the stroke uses differing
+  per-side widths; the regular property set otherwise."
+  [stroke]
+  (if (some? (cssv/stroke-per-side-widths stroke))
+    per-side-properties
+    properties))
+
 (def ^:private shape-prop->stroke-prop
   {:border-style :stroke-style
    :border-width :stroke-width
@@ -71,7 +88,14 @@
                        color-value (dm/str "border: " stroke-width "px " (d/name stroke-style) " " formatted-color-value ";")
                        color-gradient (dm/str "border-image: " (uc/gradient->css gradient-data) " 100 / " stroke-width "px;")
                        color-image (dm/str "border-image: url(" (cfg/resolve-file-media color-image) ") 100 / " stroke-width "px;")
-                       :else "")]
+                       :else "")
+               value (if-let [[top right bottom left] (cssv/stroke-per-side-widths stroke)]
+                       (dm/str value
+                               " border-block-start-width: " top "px;"
+                               " border-inline-end-width: " right "px;"
+                               " border-block-end-width: " bottom "px;"
+                               " border-inline-start-width: " left "px;")
+                       value)]
            (if (empty? acc)
              value
              (str acc " " value))))
@@ -92,7 +116,7 @@
      (for [shape shapes]
        [:div {:key (:id shape) :class (stl/css :stroke-shape)}
         (for [[idx stroke] (map-indexed vector (:strokes shape))]
-          (for [property properties]
+          (for [property (stroke-properties stroke)]
             (let [value (css/get-css-value objects stroke property)
                   stroke-type (ctc/stroke->color stroke)
                   property-name (cmm/get-css-rule-humanized property)
diff --git a/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs b/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs
index d2e1a7bd24..8489cdec4a 100644
--- a/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs
+++ b/frontend/src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs
@@ -32,11 +32,12 @@
         date-str        (when cancel-at
                           (ct/format-inst cancel-at "d MMMM, yyyy"))
 
-        on-create-org
+        on-create-organization
         (mf/use-fn
          (fn []
            (modal/hide!)
-           (dnt/go-to-nitrate-ac-create-organization)))]
+           (dnt/go-to-nitrate-ac-create-organization
+            "admin-console:after-payment-organization-naming-form")))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-dialog)}
@@ -50,7 +51,7 @@
 
        [:div {:class (stl/css :modal-end)}
         [:div {:class (stl/css :modal-title)}
-         (tr "nitrate.activation-success.title")]
+         (tr "nitrate.modal-success.title")]
 
         (when (and manual? date-str)
           [:p {:class (stl/css :modal-text-primary)}
@@ -63,6 +64,6 @@
          (tr "nitrate.activation-success.enjoy")]
 
         [:> button* {:variant "primary"
-                     :on-click on-create-org
+                     :on-click on-create-organization
                      :class (stl/css :modal-button)}
-         (tr "nitrate.activation-success.create-org")]]]]]))
+         (tr "nitrate.activation-success.create-organization")]]]]]))
diff --git a/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs b/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs
index 95d2de2256..7ad802a2b8 100644
--- a/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs
+++ b/frontend/src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs
@@ -17,6 +17,7 @@
    [app.main.ui.nitrate.nitrate-activation-success-modal]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
+   [app.util.webapi :as wapi]
    [beicon.v2.core :as rx]
    [cuerdas.core :as str]
    [rumext.v2 :as mf]))
@@ -63,7 +64,16 @@
          (mf/deps on-accept)
          (fn [event]
            (when (and (= "Enter" (.-key event)) (.-ctrlKey event))
-             (on-accept event))))]
+             (on-accept event))))
+
+        on-download-request-click
+        (mf/use-fn
+         (fn []
+           (->> (rp/cmd! :get-nitrate-activation-code-request {})
+                (rx/subs!
+                 (fn [body]
+                   (->> (wapi/create-blob body "text/plain")
+                        (dom/trigger-download "penpot-activation-code-request.txt")))))))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-dialog)}
@@ -101,7 +111,11 @@
           :value (tr "nitrate.code-activation.submit")
           :on-click on-accept}]]
        [:div {:class (stl/css :footer-text)}
-        (tr "nitrate.code-activation.footer") " "
+        (tr "nitrate.code-activation.footer-before")
+        [:a {:class (stl/css :link)
+             :on-click on-download-request-click}
+         (tr "nitrate.code-activation.footer-link")]
+        (tr "nitrate.code-activation.footer-after") " "
         [:a {:class (stl/css :link)
              :href "mailto:sales@nitrate.com"}
          "sales@nitrate.com"]]]]]))
diff --git a/frontend/src/app/main/ui/nitrate/nitrate_form.cljs b/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
index ef973f111f..3ad31a1977 100644
--- a/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
+++ b/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
@@ -7,6 +7,7 @@
 (ns app.main.ui.nitrate.nitrate-form
   (:require-macros [app.main.style :as stl])
   (:require
+   [app.main.data.event :as ev]
    [app.main.data.modal :as modal]
    [app.main.data.nitrate :as dnt]
    [app.main.refs :as refs]
@@ -25,34 +26,57 @@
   [connectivity]
 
   (let [show-contact-sales-option (:show-contact-sales-option connectivity)
+        subscription-start-origin (:subscription-start-origin connectivity)
         online? (and (:licenses connectivity) (not show-contact-sales-option))
         profile  (mf/deref refs/profile)
         on-click
         (mf/use-fn
          (fn []
-           (dnt/go-to-buy-nitrate-license "monthly" dnt/go-to-ac-url)))
+           (dnt/go-to-buy-nitrate-license
+            "monthly"
+            dnt/go-to-ac-url
+            dnt/go-to-subscription-url
+            "dashboard:plan-confirmation-modal"
+            (if (:subscription profile) "paid" "trial")
+            subscription-start-origin)))
 
         on-activate-click
         (mf/use-fn
          (fn []
-           (st/emit! (modal/show {:type :nitrate-code-activation}))))]
+           (st/emit! (modal/show {:type :nitrate-code-activation}))))
+
+        on-see-plan-click
+        (mf/use-fn
+         (fn []
+           (st/emit! (ev/event {::ev/name "open-current-subscription"
+                                ::ev/origin "dashboard:plan-confirmation-modal"}))))
+
+        on-close
+        (mf/use-fn
+         (fn []
+           (st/emit! (ev/event {::ev/name "close-subscription-modal"
+                                ::ev/origin "nitrate:plan-confirmation-modal"
+                                :product "nitrate:enterprise"}))
+           (modal/hide!)))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-dialog :subscription-success)}
-      [:button {:class (stl/css :close-btn) :on-click modal/hide!}
+      [:button {:class (stl/css :close-btn) :on-click on-close}
        [:> icon* {:icon-id "close"
                   :size "m"}]]
       [:div {:class (stl/css :modal-success-content)}
        [:div {:class (stl/css :modal-start)}
-        ;; TODO this svg is a placeholder. Use the proper one when created
-        [:> raw-svg* {:id "nitrate-welcome"}]]
+        [:> raw-svg* {:id "nitrate-welcome-light"
+                      :class (stl/css :welcome-illustration-light)}]
+        [:> raw-svg* {:id "nitrate-welcome"
+                      :class (stl/css :welcome-illustration-dark)}]]
 
        [:div {:class (stl/css :modal-end)}
         [:div {:class (stl/css :modal-title)}
          (tr "nitrate.form.title")]
 
         [:p {:class (stl/css :modal-text-large)}
-         (tr "nitrate.form.enterprise-intro")]
+         (tr "nitrate.form.enterprise-intro" ":")]
         [:ul
          [:li {:class (stl/css :modal-text-large)}
           "- " (tr "nitrate.form.enterprise-feature-1")]
@@ -72,18 +96,20 @@
                           :on-click on-click
                           :class (stl/css :modal-button)}
               (if (:subscription profile)
-                (tr "nitrate.form.upgrade")
+                (tr "nitrate.form.start-enterprise")
                 (tr "nitrate.form.try-free"))]
              [:div {:class (stl/css :modal-text-small :modal-info)}
               (tr "nitrate.form.cancel-anytime")]]]
 
            [:p {:class (stl/css :modal-text-medium)}
-            (tr "nitrate.form.have-code") " " [:a {:class (stl/css :link)
-                                                   :on-click on-activate-click}
-                                               (tr "nitrate.form.enter-code")]]
+            (tr "nitrate.form.subscribe-with-code") " " [:a {:class (stl/css :link)
+                                                             :on-click on-activate-click}
+                                                         (tr "nitrate.form.enter-code")]]
 
            [:p {:class (stl/css :modal-text-medium)}
-            [:a {:class (stl/css :link) :href dnt/go-to-subscription-url}
+            [:a {:class (stl/css :link)
+                 :href dnt/go-to-subscription-url
+                 :on-click on-see-plan-click}
              (tr "nitrate.form.see-plan")]]]
 
           [:div {:class (stl/css :contact)}
@@ -96,10 +122,8 @@
              "sales@penpot.app"]]
            [:div  {:class (stl/css :activation-code)}
             [:p {:class (stl/css :modal-text-large)}
-             (tr "nitrate.form.have-code")]
+             (tr "nitrate.form.subscribe-with-code")]
             [:p {:class (stl/css :modal-text-large)}
              [:a {:class (stl/css :link)
                   :on-click on-activate-click}
               (tr "nitrate.form.enter-code")]]]])]]]]))
-
-
diff --git a/frontend/src/app/main/ui/nitrate/nitrate_form.scss b/frontend/src/app/main/ui/nitrate/nitrate_form.scss
index 74872c0265..5de76305e5 100644
--- a/frontend/src/app/main/ui/nitrate/nitrate_form.scss
+++ b/frontend/src/app/main/ui/nitrate/nitrate_form.scss
@@ -101,6 +101,22 @@
   block-size: auto;
 }
 
+.welcome-illustration-light {
+  display: none;
+
+  :global(.light) & {
+    display: block;
+  }
+}
+
+.welcome-illustration-dark {
+  display: block;
+
+  :global(.light) & {
+    display: none;
+  }
+}
+
 .radio-btns {
   display: flex;
   flex-direction: column;
diff --git a/frontend/src/app/main/ui/routes.cljs b/frontend/src/app/main/ui/routes.cljs
index b33c3b6782..52d7554e1e 100644
--- a/frontend/src/app/main/ui/routes.cljs
+++ b/frontend/src/app/main/ui/routes.cljs
@@ -31,7 +31,7 @@
     ["/recovery"          :auth-recovery]
     ["/verify-token"      :auth-verify-token]]
 
-   (when (contains? cf/flags :nitrate)
+   (when (contains? cf/flags :admin-console)
      ["/subscribe-nitrate" :nitrate-entry])
 
    ["/settings"
@@ -41,7 +41,8 @@
     ["/options"       :settings-options]
     ["/subscriptions" :settings-subscription]
     ["/integrations"  :settings-integrations]
-    ["/notifications" :settings-notifications]]
+    ["/notifications" :settings-notifications]
+    ["/shortcuts"     :settings-shortcuts]]
 
    ["/frame-preview" :frame-preview]
 
@@ -104,7 +105,7 @@
   or redirects to the SSO provider URL."
   [match send-event-info? url]
   (let [route-name     (name (get-in match [:data :name]))
-        relevant?      (and (contains? cf/flags :nitrate)
+        relevant?      (and (contains? cf/flags :admin-console)
                             (or (str/starts-with? route-name "dashboard")
                                 (str/starts-with? route-name "workspace")))
         team-id-str    (when relevant?
diff --git a/frontend/src/app/main/ui/settings.cljs b/frontend/src/app/main/ui/settings.cljs
index 57665fc9d8..3a4b98aed4 100644
--- a/frontend/src/app/main/ui/settings.cljs
+++ b/frontend/src/app/main/ui/settings.cljs
@@ -21,6 +21,7 @@
    [app.main.ui.settings.options :refer [options-page*]]
    [app.main.ui.settings.password :refer [password-page*]]
    [app.main.ui.settings.profile :refer [profile-page*]]
+   [app.main.ui.settings.shortcuts :refer [shortcuts-page*]]
    [app.main.ui.settings.sidebar :refer [sidebar*]]
    [app.main.ui.settings.subscription :refer [subscription-page*]]
    [app.util.i18n :as i18n :refer [tr]]
@@ -29,7 +30,8 @@
 (mf/defc header*
   {::mf/wrap [mf/memo]}
   []
-  [:header {:class (stl/css :dashboard-header) :data-testid "dashboard-header"}
+  [:header {:class (stl/css :dashboard-header)
+            :data-testid "dashboard-header"}
    [:div {:class (stl/css :dashboard-title)}
     [:h1 {:data-testid "account-title"} (tr "dashboard.your-account-title")]]])
 
@@ -38,7 +40,7 @@
   (let [section (get-in route [:data :name])
         profile (mf/deref refs/profile)]
 
-    (hooks/use-shortcuts ::dashboard sc/shortcuts)
+    (hooks/use-shortcuts ::dashboard sc/shortcuts :dashboard)
 
     (mf/with-effect [profile]
       (when (nil? profile)
@@ -46,7 +48,7 @@
 
     [:*
      [:> modal-container*]
-     [:section {:class (stl/css :dashboard-layout-refactor :dashboard)}
+     [:section {:class (stl/css :dashboard)}
 
 
       [:> sidebar* {:profile profile
@@ -54,7 +56,7 @@
 
       [:div {:class (stl/css :dashboard-content)}
        [:> header*]
-       [:section {:class (stl/css :dashboard-container)}
+       [:div {:class (stl/css :dashboard-container)}
         (case section
           :settings-profile
           [:> profile-page*]
@@ -77,7 +79,10 @@
           [:> integrations-page*]
 
           :settings-notifications
-          [:> notifications-page* {:profile profile}])]]]]))
+          [:> notifications-page* {:profile profile}]
+
+          :settings-shortcuts
+          [:> shortcuts-page* {:profile profile}])]]]]))
 
 (mf/defc settings-page*
   {::mf/lazy-load true}
diff --git a/frontend/src/app/main/ui/settings.scss b/frontend/src/app/main/ui/settings.scss
index 3845cce504..b553370331 100644
--- a/frontend/src/app/main/ui/settings.scss
+++ b/frontend/src/app/main/ui/settings.scss
@@ -4,16 +4,18 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
 @use "common/refactor/common-dashboard";
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_borders.scss" as *;
 @use "ds/mixins.scss" as *;
 
 .dashboard {
-  background-color: var(--app-background);
+  background-color: var(--color-background-primary);
   display: grid;
-  grid-template-rows: deprecated.$s-48 1fr;
-  grid-template-columns: deprecated.$s-40 deprecated.$s-256 1fr;
-  height: 100vh;
+  grid-template-rows: $sz-48 1fr;
+  grid-template-columns: $sz-40 px2rem(256) 1fr;
+  block-size: 100vh;
 }
 
 .dashboard-content {
@@ -23,273 +25,13 @@
   flex-direction: column;
   position: relative;
   grid-row: 1 / span 2;
-  padding: deprecated.$s-16 deprecated.$s-16 0 0;
+  padding: var(--sp-l) var(--sp-l) 0 0;
 }
 
 .dashboard-container {
   flex: 1 0 0;
-  margin-right: deprecated.$s-16;
+  margin-inline-end: var(--sp-l);
   overflow-y: auto;
-  width: 100%;
-  border-top: deprecated.$s-1 solid var(--color-background-quaternary);
-
-  &.dashboard-projects {
-    user-select: none;
-  }
-
-  &.dashboard-shared {
-    width: calc(100vw - deprecated.$s-320);
-    margin-right: deprecated.$s-52;
-  }
-
-  &.search {
-    margin-top: deprecated.$s-12;
-  }
-}
-
-.dashboard-settings {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  align-items: center;
-
-  a {
-    color: var(--color-foreground-secondary);
-  }
-}
-
-.form-container {
-  margin: deprecated.$s-48 auto deprecated.$s-32 deprecated.$s-120;
-  display: flex;
-  max-width: deprecated.$s-368;
-  width: 100%;
-
-  &.two-columns {
-    max-width: deprecated.$s-520;
-    justify-content: space-between;
-    flex-direction: row;
-  }
-
-  h2 {
-    margin-bottom: deprecated.$s-16;
-  }
-
-  form {
-    width: deprecated.$s-468;
-
-    .custom-input,
-    .custom-select {
-      flex-direction: column-reverse;
-
-      label {
-        position: relative;
-        text-transform: uppercase;
-        color: var(--color-foreground-primary);
-        font-size: deprecated.$fs-11;
-        margin-bottom: deprecated.$s-12;
-        margin-left: calc(-1 * deprecated.$s-4);
-      }
-
-      input,
-      select {
-        background-color: var(--color-background-tertiary);
-        border-radius: deprecated.$s-8;
-        border-color: transparent;
-        color: var(--color-foreground-primary);
-        padding: 0 deprecated.$s-16;
-
-        &:focus {
-          outline: deprecated.$s-1 solid var(--color-accent-primary);
-        }
-
-        ::placeholder {
-          color: var(--color-foreground-secondary);
-        }
-      }
-
-      .help-icon {
-        bottom: deprecated.$s-12;
-        top: auto;
-
-        svg {
-          fill: var(--color-foreground-secondary);
-        }
-      }
-
-      &.disabled {
-        input {
-          background-color: var(--input-background-color-disabled);
-          border-color: var(--color-background-quaternary);
-          color: var(--color-foreground-secondary);
-        }
-      }
-
-      .input-container {
-        background-color: var(--color-background-tertiary);
-        border-radius: deprecated.$s-8;
-        border-color: transparent;
-        margin-top: deprecated.$s-24;
-
-        .main-content {
-          label {
-            position: absolute;
-            top: calc(-1 * deprecated.$s-24);
-          }
-
-          span {
-            color: var(--color-foreground-primary);
-          }
-        }
-
-        &:focus {
-          border: deprecated.$s-1 solid var(--color-accent-primary);
-        }
-      }
-
-      textarea {
-        border-radius: deprecated.$s-8;
-        padding: deprecated.$s-12 deprecated.$s-16;
-        background-color: var(--color-background-tertiary);
-        color: var(--color-foreground-primary);
-        border: none;
-
-        &:focus {
-          outline: deprecated.$s-1 solid var(--color-accent-primary);
-        }
-      }
-    }
-
-    .field-title {
-      color: var(--color-foreground-primary);
-    }
-
-    .field-title:not(:first-child) {
-      margin-top: deprecated.$s-64;
-    }
-
-    .field-text {
-      color: var(--color-foreground-secondary);
-    }
-
-    button,
-    .btn-secondary {
-      width: 100%;
-      font-size: deprecated.$fs-11;
-      text-transform: uppercase;
-      background-color: var(--color-background-tertiary);
-      color: var(--color-foreground-primary);
-
-      &:hover {
-        color: var(--color-accent-primary);
-        background-color: var(--color-background-quaternary);
-      }
-    }
-
-    hr {
-      display: none;
-    }
-  }
-
-  .links {
-    margin-top: deprecated.$s-12;
-  }
-}
-
-.profile-form {
-  display: flex;
-  flex-direction: column;
-  max-width: deprecated.$s-368;
-  width: 100%;
-
-  .newsletter-subs {
-    border-bottom: deprecated.$s-1 solid var(--color-foreground-secondary);
-    border-top: deprecated.$s-1 solid var(--color-foreground-secondary);
-    padding: deprecated.$s-32 0;
-    margin-bottom: deprecated.$s-32;
-
-    .newsletter-title {
-      font-family: "worksans", "vazirmatn", sans-serif;
-      color: var(--color-foreground-secondary);
-      font-size: deprecated.$fs-14;
-    }
-
-    label {
-      font-family: "worksans", "vazirmatn", sans-serif;
-      color: var(--color-background-primary);
-      font-size: deprecated.$fs-12;
-      margin-right: calc(-1 * deprecated.$s-16);
-      margin-bottom: deprecated.$s-12;
-    }
-
-    .info {
-      font-family: "worksans", "vazirmatn", sans-serif;
-      color: var(--color-foreground-secondary);
-      font-size: deprecated.$fs-12;
-      margin-bottom: deprecated.$s-8;
-    }
-
-    .input-checkbox label {
-      align-items: flex-start;
-    }
-  }
-}
-
-.avatar-form {
-  display: flex;
-  flex-direction: column;
-  width: deprecated.$s-120;
-  min-width: deprecated.$s-120;
-
-  img {
-    border-radius: 50%;
-    flex-shrink: 0;
-    height: deprecated.$s-120;
-    margin-right: deprecated.$s-16;
-    width: deprecated.$s-120;
-  }
-
-  .image-change-field {
-    position: relative;
-    width: deprecated.$s-120;
-    height: deprecated.$s-120;
-
-    .update-overlay {
-      opacity: 0;
-      cursor: pointer;
-      position: absolute;
-      width: deprecated.$s-120;
-      height: deprecated.$s-120;
-      border-radius: 50%;
-      font-size: deprecated.$fs-24;
-      color: var(--color-foreground-primary);
-      line-height: 5;
-      text-align: center;
-      background: var(--color-accent-tertiary);
-      z-index: 14;
-    }
-
-    input[type="file"] {
-      width: deprecated.$s-120;
-      height: deprecated.$s-120;
-      position: absolute;
-      opacity: 0;
-      cursor: pointer;
-      top: 0;
-      z-index: 15;
-    }
-
-    &:hover {
-      .update-overlay {
-        opacity: 0.8;
-      }
-    }
-  }
-}
-
-.options-form,
-.password-form {
-  h2 {
-    font-size: deprecated.$fs-14;
-    margin-bottom: deprecated.$s-20;
-  }
+  inline-size: 100%;
+  border-block-start: $b-1 solid var(--color-background-quaternary);
 }
diff --git a/frontend/src/app/main/ui/settings/delete_account.cljs b/frontend/src/app/main/ui/settings/delete_account.cljs
index 4c7dace38a..b6d0a0e4c8 100644
--- a/frontend/src/app/main/ui/settings/delete_account.cljs
+++ b/frontend/src/app/main/ui/settings/delete_account.cljs
@@ -13,7 +13,7 @@
    [app.main.data.profile :as du]
    [app.main.repo :as rp]
    [app.main.store :as st]
-   [app.main.ui.components.org-avatar :refer [org-avatar*]]
+   [app.main.ui.components.organization-avatar :refer [organization-avatar*]]
    [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.notifications.context-notification :refer [context-notification]]
@@ -33,9 +33,9 @@
   {::mf/register modal/components
    ::mf/register-as :delete-account}
   []
-  (let [orgs* (mf/use-state nil)
-        orgs  (deref orgs*)
-        has-orgs? (seq orgs)
+  (let [organizations* (mf/use-state nil)
+        organizations  (deref organizations*)
+        has-organizations? (seq organizations)
 
         expanded* (mf/use-state true)
         expanded? (deref expanded*)
@@ -48,14 +48,14 @@
                      (with-meta {} {:on-error on-error}))))]
 
     (mf/with-effect []
-      (if (contains? cf/flags :nitrate)
+      (if (contains? cf/flags :admin-console)
         (let [sub (->> (rp/cmd! :get-owned-organizations-summary {})
                        (rx/subs!
-                        (fn [result] (reset! orgs* (or result [])))
-                        (fn [_] (reset! orgs* []))))]
+                        (fn [result] (reset! organizations* (or result [])))
+                        (fn [_] (reset! organizations* []))))]
           (fn []
             (rx/dispose! sub)))
-        (reset! orgs* [])))
+        (reset! organizations* [])))
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-container)}
@@ -69,33 +69,33 @@
        [:div {:class (stl/css :warning-notice)}
         [:& context-notification
          {:level :warning
-          :content (tr (if has-orgs?
-                         "modals.delete-account.info.with-orgs"
+          :content (tr (if has-organizations?
+                         "modals.delete-account.info.with-organizations"
                          "modals.delete-account.info"))}]]
 
-       (when has-orgs?
-         [:div {:class (stl/css :orgs-section)}
-          [:button {:class (stl/css :orgs-section-toggle)
+       (when has-organizations?
+         [:div {:class (stl/css :organizations-section)}
+          [:button {:class (stl/css :organizations-section-toggle)
                     :type "button"
                     :aria-expanded expanded?
                     :on-click on-toggle}
-           [:span {:class (stl/css :orgs-section-title)}
-            (tr "modals.delete-account.owned-orgs.list-title")]
+           [:span {:class (stl/css :organizations-section-title)}
+            (tr "modals.delete-account.owned-organizations.list-title")]
            [:> icon* {:icon-id i/arrow
                       :size "s"
-                      :class (stl/css-case :orgs-section-arrow true
+                      :class (stl/css-case :organizations-section-arrow true
                                            :expanded expanded?)}]]
           (when expanded?
-            [:ul {:class (stl/css :org-list)}
-             (for [{:keys [id name team-count member-count] :as org} orgs]
-               [:li {:class (stl/css :org-item) :key id}
-                [:> org-avatar* {:org org :size "xxl"}]
-                [:div {:class (stl/css :org-info)}
-                 [:span {:class (stl/css :org-name)} name]
-                 [:div {:class (stl/css :org-counts)}
-                  [:span (tr "modals.delete-account.owned-orgs.teams-count"
+            [:ul {:class (stl/css :organization-list)}
+             (for [{:keys [id name team-count member-count] :as organization} organizations]
+               [:li {:class (stl/css :organization-item) :key id}
+                [:> organization-avatar* {:organization organization :size "xxl"}]
+                [:div {:class (stl/css :organization-info)}
+                 [:span {:class (stl/css :organization-name)} name]
+                 [:div {:class (stl/css :organization-counts)}
+                  [:span (tr "modals.delete-account.owned-organizations.teams-count"
                              (i18n/c (or team-count 0)))]
-                  [:span (tr "modals.delete-account.owned-orgs.members-count"
+                  [:span (tr "modals.delete-account.owned-organizations.members-count"
                              (i18n/c (or member-count 0)))]]]])])])]
 
       [:div {:class (stl/css :modal-footer)}
diff --git a/frontend/src/app/main/ui/settings/delete_account.scss b/frontend/src/app/main/ui/settings/delete_account.scss
index cabfea544e..ff4a0849e9 100644
--- a/frontend/src/app/main/ui/settings/delete_account.scss
+++ b/frontend/src/app/main/ui/settings/delete_account.scss
@@ -60,7 +60,7 @@
   color: var(--modal-title-foreground-color);
 }
 
-.orgs-section {
+.organizations-section {
   @include t.use-typography("body-medium");
 
   display: flex;
@@ -70,7 +70,7 @@
   gap: var(--sp-l);
 }
 
-.orgs-section-toggle {
+.organizations-section-toggle {
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -81,20 +81,20 @@
   cursor: pointer;
 }
 
-.orgs-section-title {
+.organizations-section-title {
   color: var(--color-accent-tertiary);
 }
 
-.orgs-section-arrow {
+.organizations-section-arrow {
   color: var(--color-accent-tertiary);
   transition: transform 0.15s ease;
 }
 
-.orgs-section-arrow.expanded {
+.organizations-section-arrow.expanded {
   transform: rotate(90deg);
 }
 
-.org-list {
+.organization-list {
   display: flex;
   flex-direction: column;
   flex: 1 1 auto;
@@ -106,23 +106,23 @@
   overflow-y: auto;
 }
 
-.org-item {
+.organization-item {
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: var(--sp-s);
 }
 
-.org-info {
+.organization-info {
   display: flex;
   flex-direction: column;
 }
 
-.org-name {
+.organization-name {
   color: var(--modal-title-foreground-color);
 }
 
-.org-counts {
+.organization-counts {
   display: flex;
   flex-direction: row;
   gap: var(--sp-s);
diff --git a/frontend/src/app/main/ui/settings/feedback.cljs b/frontend/src/app/main/ui/settings/feedback.cljs
index 6b7e10fc0e..ee7fd553e9 100644
--- a/frontend/src/app/main/ui/settings/feedback.cljs
+++ b/frontend/src/app/main/ui/settings/feedback.cljs
@@ -98,7 +98,8 @@
                  :form form}
 
      ;; --- Feedback section
-     [:h2 {:class (stl/css :field-title :feedback-title)} (tr "feedback.title-contact-us")]
+     [:h2 {:class (stl/css :field-title :feedback-title)
+           :id "feedback-section-title"} (tr "feedback.title-contact-us")]
      [:p {:class (stl/css :field-text :feedback-title)} (tr "feedback.subtitle")]
 
      [:div {:class (stl/css :fields-row)}
@@ -164,6 +165,7 @@
                  (:content errors/last-report))
         props  (mf/spread-props props {:error-report report})]
 
-    [:div {:class (stl/css :dashboard-settings)}
+    [:section {:class (stl/css :dashboard-settings)
+               :aria-labelledby "feedback-section-title"}
      [:div {:class (stl/css :form-container)}
       [:> feedback-form* props]]]))
diff --git a/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.cljs b/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
new file mode 100644
index 0000000000..bb0c8a81af
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
@@ -0,0 +1,161 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.main.ui.settings.import-shortcuts-diff-modal
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.i18n :refer [tr]]
+   [app.main.data.dashboard.shortcuts :as dsc]
+   [app.main.data.modal :as modal]
+   [app.main.data.viewer.shortcuts :as vsc]
+   [app.main.data.workspace.path.shortcuts :as psc]
+   [app.main.data.workspace.shortcuts :as wsc]
+   [app.main.store :as st]
+   [app.main.ui.ds.buttons.button :refer [button*]]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.foundations.assets.icon :as i]
+   [app.main.ui.shortcuts :as ss]
+   [app.util.dom :as dom]
+   [cuerdas.core :as str]
+   [rumext.v2 :as mf]))
+
+(def ^:private context->defaults
+  {:workspace (d/deep-merge psc/shortcuts wsc/shortcuts)
+   :dashboard dsc/shortcuts
+   :viewer    vsc/shortcuts})
+
+(defn compute-diff
+  [imported-shortcuts custom-shortcuts]
+  (let [contexts (filter #(contains? imported-shortcuts %) [:workspace :dashboard :viewer])]
+    (mapcat
+     (fn [ctx]
+       (let [imported-ctx (get imported-shortcuts ctx)
+             current-ctx  (get custom-shortcuts ctx {})
+             defaults-ctx (get context->defaults ctx)]
+         (keep
+          (fn [[shortcut-key imported-binding]]
+            (let [current-binding (get current-ctx shortcut-key)
+                  default-cmd     (:command (get defaults-ctx shortcut-key))
+                  effective-binding (or current-binding default-cmd)
+                  customized?     (and (some? current-binding)
+                                       (seq current-binding)
+                                       (not= current-binding default-cmd))]
+              (when (and (some? imported-binding)
+                         (not= effective-binding imported-binding))
+                {:context ctx
+                 :key     shortcut-key
+                 :current effective-binding
+                 :imported imported-binding
+                 :customized? customized?})))
+          imported-ctx)))
+     contexts)))
+
+(def ^:private context-order {:workspace 0 :dashboard 1 :viewer 2})
+
+(def ^:private context-name
+  {:workspace "Workspace"
+   :dashboard "Dashboard"
+   :viewer    "Viewer"})
+
+(mf/defc import-shortcuts-diff-modal
+  {::mf/register modal/components
+   ::mf/register-as :import-shortcuts-diff-modal}
+  [{:keys [imported-shortcuts custom-shortcuts all-shortcuts-raw]}]
+  (let [diff-entries
+        (mf/with-memo [imported-shortcuts custom-shortcuts]
+          (->> (compute-diff imported-shortcuts custom-shortcuts)
+               (sort-by (fn [e] [(get context-order (:context e) 99)
+                                 (name (:key e))]))))
+
+        handle-close-dialog
+        (mf/use-fn
+         (fn [event]
+           (dom/stop-propagation event)
+           (st/emit! (modal/hide))))
+
+        handle-apply
+        (mf/use-fn
+         (mf/deps imported-shortcuts all-shortcuts-raw)
+         (fn [event]
+           (dom/stop-propagation event)
+           (st/emit! (ss/import-custom-shortcuts imported-shortcuts all-shortcuts-raw))
+           (st/emit! (modal/hide))))]
+
+    [:div {:class (stl/css :modal-overlay)}
+     [:div {:class (stl/css :modal-dialog)}
+      [:> icon-button* {:class (stl/css :close-btn)
+                        :variant "ghost"
+                        :aria-label (tr "labels.close")
+                        :on-click handle-close-dialog
+                        :tooltip-class (stl/css :close-btn-tooltip)
+                        :icon i/close}]
+      [:div {:class (stl/css :modal-title)}
+       (tr "import-shortcuts.diff-modal-title")]
+
+      [:div {:class (stl/css :modal-content)}
+       [:div {:class (stl/css :modal-content-text)}
+        (tr "import-shortcuts.diff-modal-text")]
+
+       (if (seq diff-entries)
+         [:table {:class (stl/css :shortcuts-table)}
+          [:thead
+           [:tr {:class (stl/css :shortcuts-list-header)}
+            [:th {:class (stl/css :shortcut-header-name)}
+             (tr "restore-shortcuts.acction")]
+            [:th {:class (stl/css :shortcut-header-command)}
+             (tr "labels.current")]
+            [:th {:class (stl/css :shortcut-header-command)}
+             (tr "labels.import")]]]
+          [:tbody {:class (stl/css :shortcuts-list-body)}
+           (let [last-ctx* (volatile! nil)]
+             (for [entry diff-entries]
+               (let [{:keys [context key current imported customized?]} entry
+                     show-context-label? (not= @last-ctx* context)]
+                 (vreset! last-ctx* context)
+                 [:* {:key (dm/str (name context) "-" (name key) "-group")}
+                  (when show-context-label?
+                    [:tr {:key (dm/str "ctx-" (name context))
+                          :class (stl/css :context-separator)}
+                     [:td {:colSpan 3
+                           :class (stl/css :context-label)}
+                      (get context-name context)]])
+                  [:tr {:key (dm/str (name context) "-" (name key))
+                        :class (stl/css :shortcuts-list-item)}
+                   [:td {:class (stl/css :shortcut-name)}
+                    (ss/translation-keyname :sc key)]
+                   [:td {:class (stl/css :shortcut-command)}
+                    (if (str/blank? current)
+                      [:span {:class (stl/css :shortcut-empty)} "-"]
+                      [:> ss/shortcuts-keys* {:content current
+                                              :command key
+                                              :is-customized customized?
+                                              :light-shortcut true
+                                              :has-conflict? false}])]
+                   [:td {:class (stl/css :shortcut-command)}
+                    (if (str/blank? imported)
+                      [:span {:class (stl/css :shortcut-empty)} "-"]
+                      [:> ss/shortcuts-keys* {:content imported
+                                              :command key
+                                              :light-shortcut true
+                                              :is-customized true
+                                              :has-conflict? false}])]]])))]]
+         [:div {:class (stl/css :no-changes)}
+          (tr "import-shortcuts.no-changes")])]
+
+      [:div {:class (stl/css :modal-footer)}
+       [:div {:class (stl/css :action-buttons)}
+        [:> button* {:class (stl/css :cancel-button)
+                     :variant "secondary"
+                     :type "button"
+                     :on-click handle-close-dialog}
+         (tr "labels.cancel")]
+        [:> button* {:class (stl/css :cancel-button)
+                     :variant "primary"
+                     :type "button"
+                     :on-click handle-apply}
+         (tr "import-shortcuts.apply")]]]]]))
diff --git a/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.scss b/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.scss
new file mode 100644
index 0000000000..0d42b9d1a6
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/import_shortcuts_diff_modal.scss
@@ -0,0 +1,167 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+@use "ds/typography.scss" as t;
+@use "ds/_borders.scss" as *;
+@use "ds/spacing.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
+
+.modal-overlay {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  inset-inline-start: 0;
+  inset-block-start: 0;
+  block-size: 100%;
+  inline-size: 100%;
+  z-index: var(--z-index-set);
+  background-color: var(--overlay-color);
+  padding-inline-start: px2rem(272);
+}
+
+.modal-dialog {
+  position: relative;
+  padding: var(--sp-xxxl);
+  border-radius: $br-8;
+  background-color: var(--color-background-primary);
+  border: $b-2 solid var(--color-background-quaternary);
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  gap: var(--sp-xxxl);
+  min-inline-size: $sz-364;
+  min-block-size: $sz-192;
+  max-block-size: $sz-520;
+  inline-size: px2rem(584);
+  max-inline-size: $sz-712;
+}
+
+.modal-title {
+  @include t.use-typography("headline-medium");
+
+  color: var(--color-foreground-primary);
+  block-size: px2rem(26);
+}
+
+.close-btn {
+  position: absolute;
+  inset-block-start: px2rem(8);
+  inset-inline-end: px2rem(6);
+  block-size: $sz-32;
+  inline-size: $sz-28;
+}
+
+.close-btn-tooltip {
+  position: absolute;
+  inset-block-start: px2rem(8);
+  inset-inline-end: px2rem(6);
+}
+
+.modal-content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-l);
+  block-size: fit-content;
+  overflow-y: auto;
+}
+
+.modal-content-text {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-primary);
+}
+
+.modal-footer {
+  justify-self: end;
+  display: flex;
+  flex-direction: row;
+  gap: var(--sp-s);
+}
+
+.action-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--sp-s);
+}
+
+.shortcuts-table {
+  inline-size: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+.shortcuts-list-item,
+.shortcuts-list-header {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-secondary);
+  display: grid;
+  grid-template-columns: 35% 30% 35%;
+}
+
+.shortcuts-list-header {
+  border-block-end: $b-1 solid var(--color-foreground-secondary);
+  block-size: $sz-32;
+  text-align: start;
+  padding-block-end: var(--sp-s);
+}
+
+.shortcuts-list-body {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-s);
+}
+
+.shortcuts-list-item {
+  color: var(--color-foreground-primary);
+}
+
+.shortcuts-list-item:first-child {
+  padding-block-start: var(--sp-s);
+}
+
+.shortcut-header-name,
+.shortcut-header-command {
+  text-align: start;
+}
+
+.shortcut-name {
+  text-align: start;
+}
+
+.shortcut-command {
+  display: flex;
+  gap: var(--sp-s);
+  align-items: center;
+  justify-content: start;
+  text-align: start;
+  flex-wrap: wrap;
+}
+
+.shortcut-empty {
+  color: var(--color-foreground-secondary);
+}
+
+.context-separator {
+  border-block-end: none;
+}
+
+.context-label {
+  @include t.use-typography("title-small");
+
+  color: var(--color-foreground-secondary);
+  text-align: start;
+  padding-block: var(--sp-m) var(--sp-xxs);
+}
+
+.no-changes {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-secondary);
+  text-align: center;
+  padding-block: var(--sp-xl);
+}
diff --git a/frontend/src/app/main/ui/settings/integrations.cljs b/frontend/src/app/main/ui/settings/integrations.cljs
index 3151b73c31..d8c137561a 100644
--- a/frontend/src/app/main/ui/settings/integrations.cljs
+++ b/frontend/src/app/main/ui/settings/integrations.cljs
@@ -371,7 +371,7 @@
             :id      "token-delete"
             :handler handle-open-confirm-modal}])]
 
-    [:div {:class (stl/css :item)}
+    [:div {:class (stl/css :item) :data-id (str id)}
      [:> text* {:as "div"
                 :typography t/body-medium
                 :title name
@@ -640,10 +640,12 @@
       (dom/set-html-title (tr "title.settings.integrations"))
       (st/emit! (du/fetch-access-tokens)))
 
-    [:div {:class (stl/css :integrations)}
-     [:> heading* {:level 1
+    [:section {:class (stl/css :integrations)
+               :aria-labelledby "integrations-section-title"}
+     [:> heading* {:level 2
                    :typography t/title-large
-                   :class (stl/css :color-primary)}
+                   :class (stl/css :color-primary)
+                   :id "integrations-section-title"}
       (tr "integrations.title")]
 
      (when ^boolean mcp-enabled?
diff --git a/frontend/src/app/main/ui/settings/options.cljs b/frontend/src/app/main/ui/settings/options.cljs
index aca2ef130c..23932ba133 100644
--- a/frontend/src/app/main/ui/settings/options.cljs
+++ b/frontend/src/app/main/ui/settings/options.cljs
@@ -122,10 +122,15 @@
     (mf/use-effect
      #(dom/set-html-title (tr "title.settings.options")))
 
-    [:div {:class (stl/css :dashboard-settings)}
+    [:section {:class (stl/css :dashboard-settings)
+               :aria-labelledby "options-section-title"}
      [:*
       [:div {:class (stl/css :form-container) :data-testid "settings-form"}
-       [:h2 (tr "labels.settings")]
+       [:> heading* {:level 2
+                     :typography t/title-large
+                     :class (stl/css :color-primary)
+                     :id "options-section-title"}
+        (tr "labels.settings")]
        [:> options-form*]]
       (when (contains? cf/flags :render-switch)
         [:> webgl-settings* {:renderer renderer}])]]))
diff --git a/frontend/src/app/main/ui/settings/password.cljs b/frontend/src/app/main/ui/settings/password.cljs
index 301bff0d00..96d0003001 100644
--- a/frontend/src/app/main/ui/settings/password.cljs
+++ b/frontend/src/app/main/ui/settings/password.cljs
@@ -28,6 +28,14 @@
       (swap! form assoc-in [:extra-errors :password-1]
              {:message (tr "errors.email-as-password")})
 
+      :weak-password
+      (let [details (:details data)
+            options (when (seq details)
+                      (mapv tr details))]
+        (swap! form assoc-in [:extra-errors :password-1]
+               {:message (tr "errors.weak-password")
+                :options options}))
+
       (let [msg (tr "generic.error")]
         (st/emit! (ntf/error msg))))))
 
@@ -48,12 +56,14 @@
                   :on-error (partial on-error form)})]
     (st/emit! (udu/update-password params))))
 
-(def ^:private schema:password-form
+(def schema:password-form
   [:and
    [:map {:title "PasswordForm"}
     [:password-1 ::sm/password]
     [:password-2 ::sm/password]
-    [:password-old ::sm/password]]
+    ;; The old password is validated by the backend, so it only needs to be
+    ;; present here; it may predate the current minimum length policy.
+    [:password-old [::sm/text {:max 500}]]]
    [:fn {:error/code "errors.password-invalid-confirmation"
          :error/field :password-2}
     (fn [{:keys [password-1 password-2]}]
@@ -104,7 +114,8 @@
   (mf/with-effect []
     (dom/set-html-title (tr "title.settings.password")))
 
-  [:section {:class (stl/css :dashboard-settings)}
+  [:section {:class (stl/css :dashboard-settings)
+             :aria-labelledby "password-section-title"}
    [:div {:class (stl/css :form-container)}
-    [:h2 (tr "dashboard.password-change")]
+    [:h2 {:id "password-section-title"} (tr "dashboard.password-change")]
     [:> password-form*]]])
diff --git a/frontend/src/app/main/ui/settings/profile.cljs b/frontend/src/app/main/ui/settings/profile.cljs
index 124597a4e1..1fd133d794 100644
--- a/frontend/src/app/main/ui/settings/profile.cljs
+++ b/frontend/src/app/main/ui/settings/profile.cljs
@@ -143,8 +143,9 @@
   (mf/with-effect []
     (dom/set-html-title (tr "title.settings.profile")))
 
-  [:div {:class (stl/css :dashboard-settings)}
+  [:section {:class (stl/css :dashboard-settings)
+             :aria-labelledby "profile-section-title"}
    [:div {:class (stl/css :form-container)}
-    [:h2 (tr "labels.profile")]
+    [:h2 {:id "profile-section-title"} (tr "labels.profile")]
     [:> profile-photo-form*]
     [:> profile-form*]]])
diff --git a/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs
new file mode 100644
index 0000000000..f200bdd052
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs
@@ -0,0 +1,170 @@
+(ns app.main.ui.settings.restore-shortcuts-modal
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.i18n :refer [tr]]
+   [app.main.data.dashboard.shortcuts :as dsc]
+   [app.main.data.dashboard.shortcuts.customize :as customize]
+   [app.main.data.modal :as modal]
+   [app.main.data.shortcuts :as ds]
+   [app.main.data.viewer.shortcuts :as vsc]
+   [app.main.data.workspace.path.shortcuts :as psc]
+   [app.main.data.workspace.shortcuts :as wsc]
+   [app.main.store :as st]
+   [app.main.ui.ds.buttons.button :refer [button*]]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.foundations.assets.icon :as i]
+   [app.main.ui.shortcuts :as ss]
+   [app.util.dom :as dom]
+   [cuerdas.core :as str]
+   [rumext.v2 :as mf]))
+
+(def ^:private workspace-shortcuts-raw
+  (d/deep-merge psc/shortcuts
+                wsc/shortcuts))
+
+(def ^:private context->defaults
+  {:workspace workspace-shortcuts-raw
+   :dashboard dsc/shortcuts
+   :viewer    vsc/shortcuts})
+
+(defn extract-shortcut-keys [shortcut-key custom-shortcuts context]
+  (let [defaults                (get context->defaults context)
+        default-command         (:command (get defaults shortcut-key))
+
+        default-managed-list    (if (coll? default-command)
+                                  default-command
+                                  (conj () default-command))
+
+        default-chars-list      (map ds/split-sc default-managed-list)
+
+        default-last-element    (last default-chars-list)
+
+        default-short-char-list (if (= 1 (count default-chars-list))
+                                  default-chars-list
+                                  (drop-last default-chars-list))
+
+        ctx-customs             (get custom-shortcuts context {})
+        custom-val              (get ctx-customs shortcut-key)
+        current-command         (or custom-val default-command)
+        customized?             (and (some? custom-val) (seq custom-val) (not= custom-val default-command))
+
+        current-managed-list    (if (coll? current-command)
+                                  current-command
+                                  (conj () current-command))
+
+        current-chars-list      (map ds/split-sc current-managed-list)
+
+        current-last-element    (last current-chars-list)
+
+        current-short-char-list (if (= 1 (count current-chars-list))
+                                  current-chars-list
+                                  (drop-last current-chars-list))]
+    [default-last-element default-short-char-list current-last-element current-command current-short-char-list customized?]))
+
+(mf/defc restore-all-modal
+  {::mf/register modal/components
+   ::mf/register-as :restore-all-modal}
+  [{:keys [custom-shortcuts]}]
+  (let [handle-close-dialog (mf/use-fn
+                             (fn [event]
+                               (dom/stop-propagation event)
+                               (st/emit! (modal/hide))))
+
+        handle-accept-dialog (mf/use-fn
+                              (fn [event]
+                                (dom/stop-propagation event)
+                                (st/emit! (customize/reset-all-custom-shortcuts))
+                                (st/emit! (modal/hide))))]
+
+    [:div {:class (stl/css :modal-overlay)}
+     [:div {:class (stl/css :modal-dialog)}
+      [:> icon-button* {:class (stl/css :close-btn)
+                        :variant "ghost"
+                        :aria-label  (tr "labels.close")
+                        :on-click handle-close-dialog
+                        :tooltip-class (stl/css :close-btn-tooltip)
+                        :icon i/close}]
+      [:div {:class (stl/css :modal-title)}
+       (tr "restore-shortcuts.modal-title")]
+
+      [:div {:class (stl/css :modal-content)}
+       [:div {:class (stl/css :modal-content-text)}
+        (tr "restore-shortcuts.modal-text")]
+
+       [:table {:class (stl/css :shortcuts-table)}
+        [:thead
+         [:tr {:class (stl/css :shortcuts-list-header)}
+          [:th {:class (stl/css :shortcut-header-name)}
+           (tr "restore-shortcuts.acction")]
+          [:th {:class (stl/css :shortcut-header-command)}
+           (tr "labels.current")]
+          [:th {:class (stl/css :shortcut-header-command)}
+           (tr "labels.default")]]]
+        [:tbody {:class (stl/css :shortcuts-list-body)}
+         (for [context [:workspace :dashboard :viewer]
+               shortcut-key (keys (get custom-shortcuts context {}))]
+           (let [[default-last-element
+                  default-short-char-list
+                  current-last-element
+                  current-command
+                  current-short-char-list
+                  customized?] (extract-shortcut-keys shortcut-key custom-shortcuts context)
+                 current-penultimate     (last current-short-char-list)
+                 default-penultimate     (last default-short-char-list)
+                 command-class           (if customized? (stl/css :customized-command) (stl/css :default-command))]
+             [:tr {:key (dm/str (name context) "-" (name shortcut-key))
+                   :class (stl/css :shortcuts-list-item)}
+              [:td {:class (stl/css :shortcut-name)}
+               (ss/translation-keyname :sc shortcut-key)]
+              [:td {:class (stl/css :shortcut-command)}
+               (if (str/blank? current-command)
+                 [:span {:class (stl/css :shortcut-empty)} "-"]
+                 (for [chars current-short-char-list]
+                   [:* {:key (str/join chars)}
+                    (for [char chars]
+                      [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
+                                               :char char
+                                               :class command-class
+                                               :command shortcut-key}])
+                    (when (not= chars current-penultimate) [:span {:class (stl/css :space)} ","])]))
+               (when (not= current-last-element current-penultimate)
+                 [:*
+                  [:span {:class (stl/css :space)} (tr "shortcuts.or")]
+                  (for [char current-last-element]
+                    [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
+                                             :char char
+                                             :class command-class
+                                             :command shortcut-key}])])]
+
+              [:td {:class (stl/css :shortcut-command)}
+               (for [chars default-short-char-list]
+                 [:* {:key (str/join chars)}
+                  (for [char chars]
+                    [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
+                                             :class (stl/css :default-command)
+                                             :char char
+                                             :command shortcut-key}])
+                  (when (not= chars default-penultimate) [:span {:class (stl/css :space)} ","])])
+               (when (not= default-last-element default-penultimate)
+                 [:*
+                  [:span {:class (stl/css :space)} (tr "shortcuts.or")]
+                  (for [char default-last-element]
+                    [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
+                                             :class (stl/css :default-command)
+                                             :char char
+                                             :command shortcut-key}])])]]))]]]
+
+      [:div {:class (stl/css :modal-footer)}
+       [:div {:class (stl/css :action-buttons)}
+        [:> button* {:class (stl/css :cancel-button)
+                     :variant "secondary"
+                     :type "button"
+                     :on-click modal/hide!}
+         (tr "labels.cancel")]
+        [:> button* {:class (stl/css :cancel-button)
+                     :type "button"
+                     :variant "primary"
+                     :on-click handle-accept-dialog}
+         (tr "restore-shortcuts.restore")]]]]]))
\ No newline at end of file
diff --git a/frontend/src/app/main/ui/settings/restore_shortcuts_modal.scss b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.scss
new file mode 100644
index 0000000000..acfe0ee27f
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.scss
@@ -0,0 +1,154 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+@use "ds/typography.scss" as t;
+@use "ds/_borders.scss" as *;
+@use "ds/spacing.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
+
+.modal-overlay {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  inset-inline-start: 0;
+  inset-block-start: 0;
+  block-size: 100%;
+  inline-size: 100%;
+  z-index: var(--z-index-set);
+  background-color: var(--overlay-color);
+  padding-inline-start: px2rem(272);
+}
+
+.modal-dialog {
+  position: relative;
+  padding: var(--sp-xxxl);
+  border-radius: $br-8;
+  background-color: var(--color-background-primary);
+  border: $b-2 solid var(--color-background-quaternary);
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  gap: var(--sp-xxxl);
+  min-inline-size: $sz-364;
+  min-block-size: $sz-192;
+  max-block-size: $sz-520;
+  inline-size: $sz-500;
+  max-inline-size: $sz-712;
+}
+
+.modal-title {
+  @include t.use-typography("headline-medium");
+
+  color: var(--color-foreground-primary);
+  block-size: px2rem(26);
+}
+
+.close-btn {
+  position: absolute;
+  inset-block-start: px2rem(8);
+  inset-inline-end: px2rem(6);
+  block-size: $sz-32;
+  inline-size: $sz-28;
+}
+
+.close-btn-tooltip {
+  position: absolute;
+  inset-block-start: px2rem(8);
+  inset-inline-end: px2rem(6);
+}
+
+.modal-content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-l);
+  block-size: fit-content;
+}
+
+.modal-content-text {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-primary);
+}
+
+.modal-footer {
+  justify-self: end;
+  display: flex;
+  flex-direction: row;
+  gap: var(--sp-s);
+}
+
+.action-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--sp-s);
+}
+
+.shortcuts-table {
+  inline-size: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+.shortcuts-list-item,
+.shortcuts-list-header {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-secondary);
+  display: grid;
+  grid-template-columns: 40% 30% 30%;
+}
+
+.shortcuts-list-header {
+  border-block-end: $b-1 solid var(--color-foreground-secondary);
+  block-size: $sz-32;
+  text-align: start;
+  padding-block-end: var(--sp-s);
+}
+
+.shortcuts-list-body {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-s);
+}
+
+.shortcuts-list-item {
+  color: var(--color-foreground-primary);
+}
+
+.shortcuts-list-item:first-child {
+  padding-block-start: var(--sp-s);
+}
+
+.shortcut-header-name,
+.shortcut-header-command {
+  text-align: start;
+}
+
+.shortcut-command {
+  display: flex;
+  gap: var(--sp-s);
+  align-items: center;
+  justify-content: start;
+  text-align: start;
+  flex-wrap: wrap;
+}
+
+.default-command {
+  background-color: var(--color-background-tertiary);
+  color: var(--color-foreground-secondary);
+  border-radius: $br-6;
+}
+
+.customized-command {
+  background-color: var(--color-background-info);
+  color: var(--color-foreground-primary);
+  border-radius: $br-6;
+}
+
+.shortcut-empty {
+  color: var(--color-foreground-secondary);
+}
diff --git a/frontend/src/app/main/ui/settings/shortcuts.cljs b/frontend/src/app/main/ui/settings/shortcuts.cljs
new file mode 100644
index 0000000000..7800403adc
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/shortcuts.cljs
@@ -0,0 +1,537 @@
+(ns app.main.ui.settings.shortcuts
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.data :as d]
+   [app.common.i18n :refer [tr]]
+   [app.common.json :as json]
+   [app.common.schema :as sm]
+   [app.main.data.dashboard.shortcuts :as dsc]
+   [app.main.data.modal :as modal]
+   [app.main.data.notifications :as ntf]
+   [app.main.data.shortcuts :as ds]
+   [app.main.data.viewer.shortcuts :as vsc]
+   [app.main.data.workspace.path.shortcuts :as psc]
+   [app.main.data.workspace.shortcuts :as wsc]
+   [app.main.store :as st]
+   [app.main.ui.components.dropdown-menu :refer [dropdown-menu*
+                                                 dropdown-menu-item*]]
+   [app.main.ui.components.search-bar :refer [search-bar*]]
+   [app.main.ui.context :as ctx]
+   [app.main.ui.ds.buttons.button :refer [button*]]
+   [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
+   [app.main.ui.ds.foundations.typography :as t]
+   [app.main.ui.ds.foundations.typography.heading :refer [heading*]]
+   [app.main.ui.ds.foundations.typography.text :refer [text*]]
+   [app.main.ui.ds.layout.tab-switcher :refer [tab-switcher*]]
+   [app.main.ui.ds.product.empty-state :refer [empty-state*]]
+   [app.main.ui.settings.import-shortcuts-diff-modal]
+   [app.main.ui.settings.restore-shortcuts-modal]
+   [app.main.ui.shortcuts :as ss]
+   [app.util.dom :as dom]
+   [app.util.strings :refer [matches-search]]
+   [app.util.webapi :as wapi]
+   [beicon.v2.core :as rx]
+   [cuerdas.core :as str]
+   [malli.error :as me]
+   [rumext.v2 :as mf]))
+
+(mf/defc search-section*
+  [{:keys [filter-term on-search-term-change on-search-clear-click on-restore-all show-restore-all has-custom-shortcuts]}]
+  [:div {:class (stl/css :shortcuts-search-section)}
+   [:> search-bar* {:on-change on-search-term-change
+                    :on-clear on-search-clear-click
+                    :value filter-term
+                    :placeholder (tr "shortcuts.title")
+                    :icon-id i/search
+                    :auto-focus true}]
+   (when (and show-restore-all has-custom-shortcuts)
+     [:> button*
+      {:variant "secondary"
+       :on-click on-restore-all
+       :class (stl/css :restore-all-button)
+       :icon i/reload}
+      (tr "dashboard.restore-all-deleted-button")])])
+
+(defn- filter-shortcuts-tree
+  [tree shortcut-filter search-term]
+  (let [sorted-comp (when (sorted? tree)
+                      #(compare (name %1) (name %2)))
+        result (keep (fn [[k node]]
+                       (let [children (:children node)]
+                         (cond
+                           (map? children)
+                           (let [filtered-children
+                                 (filter-shortcuts-tree children shortcut-filter search-term)]
+                             (when (seq filtered-children)
+                               [k (assoc node :children filtered-children)]))
+
+                           (shortcut-filter k node search-term)
+                           [k node])))
+                     tree)]
+    (if sorted-comp
+      (into (sorted-map-by sorted-comp) result)
+      (into {} result))))
+
+(defn- collect-open-section-ids
+  [tree]
+  (letfn [(walk [nodes]
+            (mapcat
+             (fn [node]
+               (let [children (:children node)]
+                 (concat
+                  (when (:children node)
+                    [(:id node)])
+                  (when (map? children)
+                    (walk (vals children))))))
+             nodes))]
+    (->> (walk (vals tree))
+         (remove nil?)
+         set)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Imported shortcuts JSON validation
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private known-shortcut-keys
+  "Known shortcut keys per context, derived from the default shortcuts maps."
+  {:workspace (set (keys wsc/shortcuts))
+   :dashboard (set (keys dsc/shortcuts))
+   :viewer    (set (keys vsc/shortcuts))})
+
+(def ^:private schema:imported-shortcuts
+  "Malli schema for an imported custom-shortcuts payload.
+
+   The expected shape is a map of shortcut contexts to maps of shortcut-key -> command-string.
+   Only keys that exist in the default shortcuts for each context are accepted."
+  (letfn [(context-schema [ctx]
+            (into [:map {:closed true}]
+                  (map (fn [k] [k {:optional true} :string]))
+                  (get known-shortcut-keys ctx)))]
+    [:map {:closed true}
+     [:workspace {:optional true} (context-schema :workspace)]
+     [:dashboard {:optional true} (context-schema :dashboard)]
+     [:viewer {:optional true} (context-schema :viewer)]]))
+
+(defn- flatten-humanize
+  "Turns Malli's humanized explain output into a flat list of {:path :message} maps."
+  ([human] (flatten-humanize [] human))
+  ([prefix human]
+   (cond
+     (or (string? human) (symbol? human) (keyword? human))
+     [{:path (str/join "/" (map #(if (keyword? %) (name %) (str %)) prefix))
+       :message (str human)}]
+
+     (map? human)
+     (mapcat (fn [[k v]] (flatten-humanize (conj prefix k) v)) human)
+
+     (sequential? human)
+     (mapcat #(flatten-humanize prefix %) human)
+
+     :else [])))
+
+(defn validate-imported-shortcuts
+  "Validates an imported custom-shortcuts JSON payload.
+
+   Returns {:valid? true} when the payload conforms to the expected shape, or
+   {:valid? false :errors [{:path \"...\" :message \"...\"} ...]} otherwise.
+   Never throws for validation errors."
+  [data]
+  (try
+    (if-not (map? data)
+      {:valid? false
+       :errors [{:path ""
+                 :message "Expected a map of shortcut contexts"}]}
+      (let [explain (sm/explain schema:imported-shortcuts data)]
+        (if (nil? explain)
+          {:valid? true}
+          {:valid? false
+           :errors (-> explain me/humanize flatten-humanize vec)})))
+    (catch :default e
+      {:valid? false
+       :errors [{:path ""
+                 :message (str "Validation failed: " (.-message e))}]})))
+
+(mf/defc shortcuts-list*
+  [{:keys [shortcuts open-sections filter-term custom-shortcuts editable? manage-sections conflicts]}]
+  (let [sections (mf/with-memo [shortcuts]
+                   (keep (fn [section]
+                           (when (seq (get-in section [1 :children]))
+                             section))
+                         shortcuts))]
+    [:div {:class (stl/css :shortcuts-list)
+           :aria-label (tr "shortcuts.title")}
+     (for [section sections]
+       (let [[section-key _] section]
+         [:> ss/shortcut-section* {:key (name section-key)
+                                   :section section
+                                   :manage-sections manage-sections
+                                   :open-sections open-sections
+                                   :filter-term filter-term
+                                   :editable? editable?
+                                   :custom-shortcuts custom-shortcuts
+                                   :conflicts conflicts}]))]))
+
+(mf/defc shortcuts-tab-section*
+  [{:keys [shortcut-filter show-restore-all on-restore-all empty-str custom-shortcuts conflicts expand-all-by-default
+           open-sections update-open-sections]}]
+  (let [{:keys [all-shortcuts]} (mf/use-ctx ctx/shortcuts-ctx)
+
+        filter-term*     (mf/use-state "")
+        filter-term      (deref filter-term*)
+
+        section-has-content?
+        (fn [section]
+          (let [children (:children section)]
+            (if (and (= (count children) 1) (contains? children :none))
+              (seq (:children (:none children)))
+              (seq children))))
+
+        all-shortcuts           (mf/with-memo [all-shortcuts]
+                                  (into {} (filter (fn [[_ v]] (section-has-content? v)) all-shortcuts)))
+        filtered-shortcuts      (mf/with-memo [all-shortcuts shortcut-filter filter-term]
+                                  (filter-shortcuts-tree all-shortcuts shortcut-filter filter-term))
+
+        expand-all-sections
+        (fn []
+          (let [all-ids (collect-open-section-ids filtered-shortcuts)]
+            (update-open-sections (if (seq all-ids) (vec all-ids) [[:workspace]]))))
+
+        on-search-term-change
+        (mf/use-fn
+         (mf/deps all-shortcuts shortcut-filter)
+         (fn [term]
+           (reset! filter-term* term)
+           (if (str/blank? term)
+             (if expand-all-by-default
+               (expand-all-sections)
+               (update-open-sections [[:workspace]]))
+             (let [filtered-tree (filter-shortcuts-tree all-shortcuts shortcut-filter term)
+                   open-ids (collect-open-section-ids filtered-tree)]
+               (update-open-sections (vec open-ids))))))
+
+        on-search-clear-click
+        (mf/use-fn
+         (fn [_]
+           (reset! filter-term* "")
+           (if expand-all-by-default
+             (expand-all-sections)
+             (update-open-sections [[:workspace]]))))
+
+        manage-sections
+        (fn [item]
+          (fn [event]
+            (dom/stop-propagation event)
+            (let [is-present? (some #(= % item) open-sections)
+                  new-value (if is-present?
+                              (filterv (fn [element] (not= element item)) open-sections)
+                              (conj open-sections item))]
+              (update-open-sections new-value))))
+
+        has-custom-shortcuts (some #(seq (val %)) custom-shortcuts)
+
+        empty-str
+        (if (and has-custom-shortcuts (not (str/blank? filter-term)))
+          (tr "shortcuts.no-shortcuts")
+          empty-str)]
+
+    (mf/with-effect [filtered-shortcuts filter-term expand-all-by-default open-sections]
+      (when (and expand-all-by-default (str/blank? filter-term))
+        (let [all-ids (vec (collect-open-section-ids filtered-shortcuts))]
+          (when (and (seq all-ids) (not= all-ids open-sections))
+            (update-open-sections all-ids)))))
+
+    [:div {:class (stl/css :shortcuts-section)}
+     [:> search-section* {:filter-term filter-term
+                          :on-search-term-change on-search-term-change
+                          :on-search-clear-click on-search-clear-click
+                          :on-restore-all on-restore-all
+                          :show-restore-all show-restore-all
+                          :has-custom-shortcuts has-custom-shortcuts}]
+     (if (seq filtered-shortcuts)
+       [:> shortcuts-list* {:shortcuts filtered-shortcuts
+                            :open-sections open-sections
+                            :filter-term filter-term*
+                            :custom-shortcuts custom-shortcuts
+                            :editable? true
+                            :manage-sections manage-sections
+                            :conflicts conflicts}]
+
+       [:> empty-state* {:text empty-str
+                         :class (stl/css :shortcuts-empty-state)}])]))
+
+(mf/defc shortcuts-page*
+  [{:keys [profile]}]
+  (let [section*        (mf/use-state :all)
+        section         (deref section*)
+
+        show-menu* (mf/use-state false)
+        show-menu? (deref show-menu*)
+
+        open-menu
+        (mf/use-fn
+         (fn [event]
+           (dom/stop-propagation event)
+           (reset! show-menu* true)))
+
+        close-menu
+        (mf/use-fn
+         (fn [event]
+           (dom/stop-propagation event)
+           (reset! show-menu* false)))
+
+        input-ref (mf/use-ref nil)
+
+        tabs
+        (mf/with-memo []
+          [{:label (tr "labels.all")
+            :id "all"}
+           {:label (tr "shortcuts.personalized")
+            :data-testid "personalized"
+            :id "personalized"}
+           {:label (tr "shortcuts.disabled")
+            :data-testid "disabled"
+            :id "disabled"}])
+
+        handle-change-tab
+        (mf/use-fn
+         (fn [new-section]
+           (reset! section* (keyword new-section))))
+
+        open-sections-by-tab* (mf/use-state {})
+        open-sections-by-tab  (deref open-sections-by-tab*)
+
+        make-update-open-sections
+        (fn [tab-key]
+          (fn [new-val]
+            (swap! open-sections-by-tab* assoc tab-key new-val)))
+
+        custom-shortcuts                    (get-in profile [:props :custom-shortcuts])
+        has-custom-shortcuts                (some #(seq (val %)) custom-shortcuts)
+        path-shortcuts-custom               (ds/apply-custom-overrides
+                                             psc/shortcuts
+                                             custom-shortcuts
+                                             :workspace)
+        path-shortcuts-with-translation     (->> path-shortcuts-custom
+                                                 (ss/add-translation :sc)
+                                                 (into {}))
+        workspace-shortcuts-custom           (ds/apply-custom-overrides
+                                              wsc/shortcuts
+                                              custom-shortcuts
+                                              :workspace)
+        workspace-shortcuts-with-translation (->> workspace-shortcuts-custom
+                                                  (ss/add-translation :sc)
+                                                  (into {}))
+        dashboard-shortcuts-custom           (ds/apply-custom-overrides
+                                              dsc/shortcuts
+                                              custom-shortcuts :dashboard)
+        dashboard-shortcuts-with-translation (->> dashboard-shortcuts-custom
+                                                  (ss/add-translation :sc)
+                                                  (into {}))
+        viewer-shortcuts-custom              (ds/apply-custom-overrides
+                                              vsc/shortcuts
+                                              custom-shortcuts
+                                              :viewer)
+
+        viewer-shortcuts-with-translation    (->> viewer-shortcuts-custom
+                                                  (ss/add-translation :sc)
+                                                  (into {}))
+
+        all-shortcuts-raw                     (d/deep-merge
+                                               workspace-shortcuts-custom
+                                               path-shortcuts-custom
+                                               dashboard-shortcuts-custom
+                                               viewer-shortcuts-custom)
+
+        {:keys [all-shortcuts]}
+        (ss/build-all-shortcuts-without-basics
+         workspace-shortcuts-with-translation
+         path-shortcuts-with-translation
+         dashboard-shortcuts-with-translation
+         viewer-shortcuts-with-translation
+         :workspace-orig wsc/shortcuts
+         :path-orig psc/shortcuts
+         :dashboard-orig dsc/shortcuts
+         :viewer-orig vsc/shortcuts)
+
+        shortcuts-ctx-value
+        (mf/with-memo [custom-shortcuts]
+          {:workspace-sc-trans (d/deep-merge workspace-shortcuts-with-translation path-shortcuts-with-translation)
+           :dashboard-sc-trans dashboard-shortcuts-with-translation
+           :viewer-sc-trans viewer-shortcuts-with-translation
+           :all-shortcuts all-shortcuts
+           :all-sc-raw all-shortcuts-raw})
+
+        on-restore-all
+        (mf/use-fn
+         (mf/deps custom-shortcuts)
+         (fn [event]
+           (dom/stop-propagation event)
+           (st/emit! (modal/show {:type :restore-all-modal
+                                  :custom-shortcuts custom-shortcuts}))))
+
+        filter-all
+        (mf/with-memo []
+          (fn [_ shortcut search-term]
+            (or (str/blank? search-term)
+                (matches-search (:translation shortcut) search-term))))
+
+        filter-personalized
+        (mf/use-fn
+         (mf/deps custom-shortcuts)
+         (fn [shortcut-key shortcut search-term]
+           (let [shortcut-group (first (:section shortcut))
+                 group-map (get custom-shortcuts shortcut-group)
+                 group-map (if (map? group-map) group-map {})
+                 customized? (and (contains? group-map shortcut-key)
+                                  (not (str/blank? (get group-map shortcut-key))))]
+             (and customized?
+                  (or (str/blank? search-term)
+                      (matches-search (:translation shortcut) search-term))))))
+
+        filter-disabled
+        (mf/use-fn
+         (mf/deps custom-shortcuts)
+         (fn [shortcut-key shortcut search-term]
+           (let [shortcut-group (first (:section shortcut))
+                 group-map (get custom-shortcuts shortcut-group)
+                 group-map (if (map? group-map) group-map {})
+                 in-group? (contains? group-map shortcut-key)
+                 blank? (str/blank? (get group-map shortcut-key))]
+             (and in-group? blank?
+                  (or (str/blank? search-term)
+                      (matches-search (:translation shortcut) search-term))))))
+
+        on-import-file
+        (mf/use-fn
+         (fn [_]
+           (dom/click (mf/ref-val input-ref))))
+
+        shortcuts-json
+        (mf/with-memo
+          [custom-shortcuts]
+          (some-> custom-shortcuts
+                  (json/encode :key-fn d/name :indent 2)))
+
+        on-export
+        (mf/use-fn
+         (mf/deps shortcuts-json has-custom-shortcuts)
+         (fn []
+           (when has-custom-shortcuts
+             (->> (wapi/create-blob shortcuts-json "application/json")
+                  (dom/trigger-download "penpot-shortcuts.json")))))
+
+        on-file-selected
+        (mf/use-fn
+         (mf/deps all-shortcuts-raw custom-shortcuts)
+         (fn [event]
+           (let [file (-> (dom/get-target event)
+                          (dom/get-files)
+                          (first))]
+             (->> (wapi/read-file-as-text file)
+                  (rx/subs!
+                   (fn [content]
+                     (try
+                       (let [shortcuts (js->clj (.parse js/JSON content)
+                                                :keywordize-keys true)
+                             validation (validate-imported-shortcuts shortcuts)]
+                         (if (:valid? validation)
+                           (st/emit! (modal/show {:type :import-shortcuts-diff-modal
+                                                  :imported-shortcuts shortcuts
+                                                  :custom-shortcuts custom-shortcuts
+                                                  :all-shortcuts-raw all-shortcuts-raw}))
+                           (st/emit! (ntf/error (tr "errors.invalid-data")))))
+                       (catch :default _
+                         (st/emit! (ntf/error (tr "errors.invalid-data"))))))))
+
+             (-> (mf/ref-val input-ref)
+                 (dom/set-value! "")))))]
+
+    [:section {:class (stl/css :shortcuts-page)
+               :aria-label (tr "shortcuts.page")}
+     [:div {:class (stl/css :shortcuts-content)}
+      [:> heading* {:level 2
+                    :typography t/title-large
+                    :class (stl/css :page-title)}
+       (tr "label.shortcuts")]
+      [:> text* {:class (stl/css :shortcuts-description)
+                 :as "span"
+                 :typography t/body-small}
+       [:> icon* {:icon-id i/info
+                  :class (stl/css :shortcuts-description-icon)}]
+       (tr "shortcuts.reload-hint")]
+
+      [:> (mf/provider ctx/shortcuts-ctx) {:value shortcuts-ctx-value}
+       [:div {:class (stl/css :shortcuts-content)}
+        [:> tab-switcher* {:tabs tabs
+                           :selected (name section)
+                           :on-change handle-change-tab
+                           :class (stl/css :shortcuts-switcher)}
+         (case section
+           :all
+           [:> shortcuts-tab-section* {:shortcut-filter filter-all
+                                       :show-restore-all true
+                                       :empty-str (tr "shortcuts.no-shortcuts")
+                                       :on-restore-all on-restore-all
+                                       :custom-shortcuts custom-shortcuts
+                                       :open-sections (get open-sections-by-tab :all [[:workspace]])
+                                       :update-open-sections (make-update-open-sections :all)}]
+
+           :personalized
+           [:> shortcuts-tab-section* {:shortcut-filter filter-personalized
+                                       :show-restore-all true
+                                       :empty-str (tr "shortcuts.no-personalized")
+                                       :on-restore-all on-restore-all
+                                       :expand-all-by-default true
+                                       :custom-shortcuts custom-shortcuts
+                                       :open-sections (get open-sections-by-tab :personalized [[:workspace]])
+                                       :update-open-sections (make-update-open-sections :personalized)}]
+
+           :disabled
+           [:> shortcuts-tab-section* {:shortcut-filter filter-disabled
+                                       :show-restore-all true
+                                       :empty-str (tr "shortcuts.no-disabled")
+                                       :on-restore-all on-restore-all
+                                       :expand-all-by-default true
+                                       :custom-shortcuts custom-shortcuts
+                                       :open-sections (get open-sections-by-tab :disabled [[:workspace]])
+                                       :update-open-sections (make-update-open-sections :disabled)}])]]
+
+       [:div {:class (stl/css :shortcuts-page-footer)}
+        [:div {:class (stl/css :shortcuts-info)}
+         [:div {:class (stl/css :shortcuts-info-wrapper)}
+          [:div {:class (stl/css :dot-wrapper)}
+           [:div {:class (stl/css :shortcuts-customized-dot)}]]
+          [:p {:class (stl/css :shortcuts-text)}
+           (tr "shortcuts.personalized")]]
+
+         [:div {:class (stl/css :shortcuts-info-wrapper)}
+          [:> icon* {:class (stl/css :shortcuts-not-assigned-icon)
+                     :icon-id i/broken-link}]
+          [:p {:class (stl/css :shortcuts-text)}
+           (tr "shortcuts.disabled")]]]
+
+        [:div {:class (stl/css :export-wrapper)}
+
+         [:> button* {:variant "secondary"
+                      :on-click open-menu
+                      :icon i/import-export}
+          (tr "shortcuts.import-export")]
+         [:> dropdown-menu* {:show show-menu?
+                             :on-close close-menu
+                             :id "tokens-menu"
+                             :class (stl/css :import-export-menu)}
+          [:> dropdown-menu-item* {:class (stl/css :import-export-menu-item)
+                                   :on-click on-import-file}
+           [:div {:class (stl/css :import-menu-item)}
+            [:div (tr "labels.import")]]]
+          (when has-custom-shortcuts
+            [:> dropdown-menu-item* {:class (stl/css :import-export-menu-item)
+                                     :on-click on-export}
+             (tr "labels.export")])]]
+
+        [:input
+         {:type "file"
+          :accept ".json,application/json"
+          :ref input-ref
+          :style {:display "none"}
+          :on-change on-file-selected}]]]]]))
diff --git a/frontend/src/app/main/ui/settings/shortcuts.scss b/frontend/src/app/main/ui/settings/shortcuts.scss
new file mode 100644
index 0000000000..a3bfa3df78
--- /dev/null
+++ b/frontend/src/app/main/ui/settings/shortcuts.scss
@@ -0,0 +1,316 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+@use "ds/typography.scss" as t;
+@use "ds/_borders.scss" as *;
+@use "ds/spacing.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
+@use "ds/z-index.scss" as *;
+
+.shortcuts-page {
+  display: flex;
+  justify-content: center;
+
+  // box-sizing: border-box;
+  // min-block-size: 100%;
+  padding-block-end: px2rem(32);
+}
+
+.shortcuts-list {
+  @include t.use-typography("body-small");
+
+  display: flex;
+  flex-direction: column;
+  block-size: 100%;
+  padding: var(--sp-m);
+  overflow-y: auto;
+  color: var(--color-foreground-secondary);
+  min-block-size: px2rem(250);
+}
+
+.shortcuts-content {
+  display: flex;
+  flex-direction: column;
+  max-inline-size: px2rem(590);
+  inline-size: 100%;
+}
+
+.page-title {
+  color: var(--color-foreground-primary);
+  inline-size: 100%;
+  margin-block-start: px2rem(80);
+}
+
+.shortcuts-section {
+  margin-block-end: var(--sp-lg);
+}
+
+.shortcuts-search-section {
+  display: flex;
+  justify-content: center;
+  gap: var(--sp-xs);
+  padding-block-start: var(--sp-s);
+}
+
+.restore-all-button {
+  min-inline-size: px2rem(130);
+  max-inline-size: px2rem(300);
+  inline-size: fit-content;
+}
+
+// RESTORE ALL MODAL
+
+.modal-overlay {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  inset-inline-start: 0;
+  inset-block-start: 0;
+  block-size: 100%;
+  inline-size: 100%;
+  z-index: var(--z-index-set);
+  background-color: var(--overlay-color);
+}
+
+.modal-dialog {
+  position: relative;
+  padding: var(--sp-xxxl);
+  border-radius: $br-8;
+  background-color: var(--color-background-primary);
+  border: $b-2 solid var(--color-background-quaternary);
+  display: grid;
+  grid-template-rows: 0 auto 1fr;
+  gap: var(--sp-xxxl);
+  min-inline-size: $sz-364;
+  min-block-size: $sz-192;
+  max-block-size: $sz-520;
+  inline-size: $sz-500;
+  max-inline-size: $sz-712;
+}
+
+.modal-title {
+  @include t.use-typography("headline-medium");
+
+  color: var(--color-foreground-primary);
+  block-size: px2rem(26);
+}
+
+.close-btn {
+  position: absolute;
+  inset-block-start: px2rem(8);
+  inset-inline-end: px2rem(6);
+  block-size: $sz-32;
+  inline-size: $sz-28;
+}
+
+.modal-content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-l);
+  block-size: fit-content;
+}
+
+.modal-content-text {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-primary);
+}
+
+.modal-footer {
+  justify-self: end;
+  display: flex;
+  flex-direction: row;
+  gap: var(--sp-s);
+}
+
+.action-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--sp-s);
+}
+
+.shortcuts-table {
+  inline-size: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+}
+
+.shortcuts-list-item,
+.shortcuts-list-header {
+  @include t.use-typography("body-medium");
+
+  color: var(--color-foreground-secondary);
+  display: grid;
+  grid-template-columns: 40% 30% 30%;
+}
+
+.shortcuts-list-header {
+  border-block-end: $b-1 solid var(--color-foreground-secondary);
+  block-size: $sz-32;
+  text-align: start;
+  padding-block-end: var(--sp-s);
+}
+
+.shortcuts-list-body {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-s);
+}
+
+.shortcuts-list-item {
+  color: var(--color-foreground-primary);
+}
+
+.shortcuts-list-item:first-child {
+  padding-block-start: var(--sp-s);
+}
+
+.shortcut-header-name,
+.shortcut-header-command {
+  text-align: start;
+}
+
+.shortcut-command {
+  display: flex;
+  gap: var(--sp-s);
+  align-items: center;
+  justify-content: start;
+  text-align: start;
+  flex-wrap: wrap;
+}
+
+.default-command {
+  @include t.use-typography("body-small");
+
+  color: var(--color-foreground-secondary);
+  background-color: var(--color-background-tertiary);
+  padding: px2rem(6) var(--sp-xs);
+}
+
+.shortcuts-page-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--sp-s);
+  margin-block-start: auto;
+  padding-block: var(--sp-m) var(--sp-s);
+  position: fixed;
+  bottom: 0;
+  background-color: var(--app-background);
+  min-inline-size: px2rem(590);
+}
+
+.shortcuts-info {
+  @include t.use-typography("body-small");
+
+  display: flex;
+  gap: var(--sp-m);
+  align-items: center;
+  color: var(--color-foreground-secondary);
+}
+
+.shortcuts-customized-dot,
+.shortcuts-conflict-dot {
+  inline-size: px2rem(4);
+  block-size: px2rem(4);
+  border-radius: 50%;
+  background-color: var(--color-accent-info);
+}
+
+.shortcuts-conflict-dot {
+  background-color: var(--color-accent-error);
+}
+
+.shortcuts-info-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: var(--sp-xxs);
+}
+
+.dot-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  block-size: px2rem(16);
+  inline-size: px2rem(16);
+}
+
+.shortcuts-text {
+  @include t.use-typography("body-small");
+
+  color: var(--color-foreground-secondary);
+  margin: 0;
+}
+
+.shortcuts-not-assigned-icon {
+  margin-inline-end: var(--sp-xs);
+}
+
+.export-wrapper {
+  position: relative;
+}
+
+.import-export-menu {
+  box-shadow: 0 0 px2rem(12) 0 var(--color-shadow-dark);
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-xs);
+  position: absolute;
+  padding: var(--sp-xs);
+  border-radius: $br-8;
+  z-index: var(--z-index-dropdown);
+  color: var(--color-foreground-primary);
+  background-color: var(--color-background-tertiary);
+  border: $b-2 solid var(--color-background-quaternary);
+  inset-block-start: calc(-1 * px2rem(6));
+  inset-inline-end: 0;
+  translate: 0 -100%;
+  inline-size: px2rem(192);
+  margin: 0;
+}
+
+.import-export-menu-item {
+  @include t.use-typography("body-medium");
+
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  block-size: $sz-28;
+  inline-size: 100%;
+  padding: px2rem(6);
+  border-radius: $br-8;
+  cursor: pointer;
+
+  &:hover {
+    background-color: var(--color-background-quaternary);
+    color: var(--color-foreground-primary);
+  }
+}
+
+.import-export-menu-item-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.shortcuts-empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  block-size: px2rem(250);
+}
+
+.shortcuts-description {
+  color: var(--color-foreground-secondary);
+  display: flex;
+  align-items: center;
+  gap: var(--sp-xs);
+  padding: var(--sp-s) 0;
+  margin-block-end: var(--sp-l);
+}
diff --git a/frontend/src/app/main/ui/settings/sidebar.cljs b/frontend/src/app/main/ui/settings/sidebar.cljs
index 94c634004f..3ddff8f862 100644
--- a/frontend/src/app/main/ui/settings/sidebar.cljs
+++ b/frontend/src/app/main/ui/settings/sidebar.cljs
@@ -48,6 +48,9 @@
 (def ^:private go-settings-notifications
   #(st/emit! (rt/nav :settings-notifications)))
 
+(def ^:private go-settings-shortcuts
+  #(st/emit! (rt/nav :settings-shortcuts)))
+
 (defn- show-release-notes
   [event]
   (let [version (:main cf/version)]
@@ -66,6 +69,7 @@
         subscription?  (= section :settings-subscription)
         integrations?  (= section :settings-integrations)
         notifications? (= section :settings-notifications)
+        shortcuts?     (= section :settings-shortcuts)
         team-id        (or (dtm/get-last-team-id)
                            (:default-team-id profile))
 
@@ -83,7 +87,8 @@
 
      [:hr {:class (stl/css :sidebar-separator)}]
 
-     [:div {:class (stl/css :sidebar-content-section)}
+     [:nav {:class (stl/css :sidebar-content-section)
+            :aria-label (tr "labels.settings")}
       [:ul {:class (stl/css :sidebar-nav-settings)}
        [:li {:class (stl/css-case :current profile?
                                   :settings-item true)
@@ -100,6 +105,12 @@
              :on-click go-settings-notifications}
         [:span {:class (stl/css :element-title)} (tr "labels.notifications")]]
 
+       (when (contains? cf/flags :custom-shortcuts)
+         [:li {:class (stl/css-case :current shortcuts?
+                                    :settings-item true)
+               :on-click go-settings-shortcuts}
+          [:span {:class (stl/css :element-title)} (tr "label.shortcuts")]])
+
        [:li {:class (stl/css-case :current options?
                                   :settings-item true)
              :on-click go-settings-options
@@ -137,7 +148,7 @@
 (mf/defc sidebar*
   {::mf/wrap [mf/memo]}
   [{:keys [profile section]}]
-  [:div {:class (stl/css :dashboard-sidebar :settings)}
+  [:aside {:class (stl/css :dashboard-sidebar :settings)}
    [:> sidebar-content* {:profile profile
                          :section section}]
    [:> profile-section* {:profile profile}]])
diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs
index e1b13d9ce8..98626cda7d 100644
--- a/frontend/src/app/main/ui/settings/subscription.cljs
+++ b/frontend/src/app/main/ui/settings/subscription.cljs
@@ -72,8 +72,14 @@
      (when benefits-title
        [:h5 {:class (stl/css :benefits-title)} benefits-title])
      [:ul {:class (stl/css :benefits-list)}
-      (for [benefit benefits]
-        [:li {:key (dm/str benefit) :class (stl/css :benefit)} benefit])]
+      (for [[index benefit] (map-indexed vector benefits)]
+        [:li {:key (dm/str index "-" benefit) :class (stl/css :benefit)}
+         (if (map? benefit)
+           [:*
+            [:span {:class (stl/css :benefit-label)} (:label benefit)]
+            " "
+            (:description benefit)]
+           benefit)])]
 
      (when has-cta-button
        [:> button* {:variant "primary"
@@ -187,21 +193,31 @@
                                   (rt/encode-url))
                    href       (dm/str "payments/subscriptions/create?type=unlimited&show="
                                       add-payment-details? "&quantity="
-                                      min-members "&returnUrl=" return-url)]
+                                      min-members "&returnUrl=" return-url)
+                   event-name (if subscribe-to-trial
+                                "create-trial-subscription"
+                                "create-subscription")
+                   subscription-mode (if subscribe-to-trial "trial" "paid")]
                (reset! form nil)
-               (st/emit! (ev/event {::ev/name "create-trial-subscription"
+               (st/emit! (ev/event {::ev/name event-name
                                     :type "unlimited"
-                                    :quantity min-members})
+                                    :quantity min-members
+                                    :subscription-mode subscription-mode})
                          (rt/nav-raw :href href))))))
 
         subscribe-to-enterprise
         (mf/use-fn
          (fn []
-           (st/emit! (ev/event {::ev/name "create-trial-subscription"
-                                :type "enterprise"}))
-           (let [return-url (-> (rt/get-current-href) (rt/encode-url))
+           (let [event-name (if subscribe-to-trial
+                              "create-trial-subscription"
+                              "create-subscription")
+                 subscription-mode (if subscribe-to-trial "trial" "paid")
+                 return-url (-> (rt/get-current-href) (rt/encode-url))
                  href (dm/str "payments/subscriptions/create?type=enterprise&returnUrl=" return-url)]
-             (st/emit! (rt/nav-raw :href href)))))
+             (st/emit! (ev/event {::ev/name event-name
+                                  :type "enterprise"
+                                  :subscription-mode subscription-mode})
+                       (rt/nav-raw :href href)))))
 
         handle-accept-dialog
         (mf/use-fn
@@ -218,7 +234,10 @@
         handle-close-dialog
         (mf/use-fn
          (fn []
-           (st/emit! (ev/event {::ev/name "close-subscription-modal"}))
+           (when (= subscription-type "unlimited")
+             (st/emit! (ev/event {::ev/name "close-subscription-modal"
+                                  ::ev/origin "subscriptions:unlimited"
+                                  :product "unlimited"})))
            (modal/hide!)))
 
         on-submit
@@ -438,7 +457,13 @@
         (-> profile :props :subscription)
 
         subscription-type
-        (if (and (contains? cf/flags :nitrate) nitrate?) (:type nitrate-license) (get-subscription-type subscription))
+        (if (and (contains? cf/flags :admin-console) nitrate?) (:type nitrate-license) (get-subscription-type subscription))
+
+        subscription-name
+        (cond
+          nitrate?                         (tr "subscription.settings.enterprise")
+          (= subscription-type "unlimited") (tr "subscription.settings.unlimited")
+          (= subscription-type "enterprise") (tr "subscription.settings.enterprise"))
 
         subscription-is-trial?
         (= (:status subscription) "trialing")
@@ -470,6 +495,14 @@
                  href (dm/str "payments/subscriptions/show?returnUrl=" returnUrl)]
              (st/emit! (rt/nav-raw :href href)))))
 
+        go-to-nitrate-payments
+        (mf/use-fn
+         (fn []
+           (st/emit! (ev/event {::ev/name "open-subscription-management"
+                                ::ev/origin "settings"
+                                :section "nitrate:enterprise"}))
+           (dnt/go-to-nitrate-billing)))
+
         open-subscription-modal
         (mf/use-fn
          (mf/deps subscription-editors nitrate-license)
@@ -477,7 +510,11 @@
            (st/emit! (ev/event {::ev/name "open-subscription-modal"
                                 ::ev/origin "settings"}))
            (if (= subscription-type "nitrate")
-             (st/emit! (dnt/show-nitrate-popup :nitrate-dialog {:nitrate-license nitrate-license}))
+             (st/emit! (dnt/show-nitrate-popup
+                        :nitrate-dialog
+                        {:nitrate-license nitrate-license
+                         :event-origin "settings:plan-confirmation-modal"
+                         :subscription-start-origin "settings"}))
              (st/emit!
               (modal/show :management-dialog
                           {:subscription-type subscription-type
@@ -487,10 +524,11 @@
         open-contact-sales-modal
         (mf/use-fn
          (mf/deps nitrate-license)
-         (fn [current-subscription subscription-type]
+         (fn [current-subscription subscription-type & [has-billing-access?]]
            (if (= current-subscription "unlimited")
              (st/emit! (dnt/show-nitrate-popup :nitrate-dialog {:nitrate-license nitrate-license :show-contact-sales-option true}))
-             (st/emit! (modal/show :nitrate-contact-sales-dialog {:subscription-type subscription-type})))))
+             (st/emit! (modal/show :nitrate-contact-sales-dialog {:subscription-type subscription-type
+                                                                  :has-billing-access? has-billing-access?})))))
 
         open-cancel-contact-sales-modal
         (mf/use-fn
@@ -562,30 +600,31 @@
                                                  (tr "subscription.settings.enterprise")))}))
            (rt/nav :settings-subscription {} {::rt/replace true})))))
 
-    [:section {:class (stl/css :dashboard-section)}
+    [:section {:class (stl/css :dashboard-section)
+               :aria-labelledby "subscription-section-title"}
      [:div {:class (stl/css :dashboard-content)}
-      [:h2 {:class (stl/css :title-section)} (tr "subscription.labels")]
-
+      [:h2 {:id "subscription-section-title" :class (stl/css :title-section)} (tr "subscription.labels")]
 
       [:div {:class (stl/css :your-subscription)}
        [:h3 {:class (stl/css :plan-section-title)} (tr "subscription.settings.section-plan")]
        (if nitrate?
-         ;; TODO add translations for this texts when we have the definitive ones
-         [:> plan-card* {:card-title "Enterprise"
-                         :card-title-icon i/character-b
+         [:> plan-card* {:card-title (tr "subscription.settings.enterprise")
                          :cancel-at (when (:cancel-at nitrate-license)
                                       (tr "nitrate.subscription.active-until" (ct/format-inst (:cancel-at nitrate-license) "d MMMM, yyyy")))
-                         :benefits-title "Loren ipsum",
-                         :benefits ["Loren ipsum",
-                                    "Loren ipsum",
-                                    "Loren ipsum"]
-                         :cta-text-with-icon (when (not (:manual nitrate-license)) "Admin Console")
+                         :benefits-title (tr "subscription.settings.benefits.nitrate-unlimited-benefits")
+                         :benefits [{:label (tr "subscription.settings.enterprise.nitrate.multi-organization-management")
+                                     :description (tr "subscription.settings.enterprise.nitrate.support-team")}
+                                    {:label (tr "subscription.settings.enterprise.nitrate.enterprise-security")
+                                     :description (tr "subscription.settings.enterprise.nitrate.native-sso")}
+                                    {:label (tr "subscription.settings.enterprise.nitrate.advanced-control")
+                                     :description (tr "subscription.settings.enterprise.nitrate.plugin-whitelisting")}]
+                         :cta-text-with-icon (when (not (:manual nitrate-license)) (tr "subscription.settings.admin-console"))
                          :cta-link-with-icon (when (not (:manual nitrate-license)) dnt/go-to-nitrate-ac)
                          :cta-text (if (and (:licenses connectivity) (not (:manual nitrate-license)))
                                      (tr "subscription.settings.manage-your-subscription")
                                      (tr "nitrate.subscription.settings.manual-cancel"))
                          :cta-link (if (and (:licenses connectivity) (not (:manual nitrate-license)))
-                                     dnt/go-to-nitrate-billing
+                                     go-to-nitrate-payments
                                      open-cancel-contact-sales-modal)
                          :code-action (when (:manual nitrate-license) :renovate)
                          :current-plan true}]
@@ -660,7 +699,7 @@
                       :icon-id "crown"
                       :size "m"}]
            [:span {:class (stl/css :membership-date)}
-            (tr "subscription.settings.support-us-since" subscribed-since)]])
+            (tr "subscription.settings.subscribed-since" subscription-name subscribed-since)]])
 
         [:div {:class (stl/css :membership)}
          [:> icon* {:class (stl/css :penpot-member)
@@ -674,7 +713,7 @@
        (when (not= subscription-type "professional")
          [:> plan-card* {:card-title (tr "subscription.settings.professional")
                          :price-value "$0"
-                         :price-period (tr "subscription.settings.price-editor-month")
+                         :price-period (tr "subscription.settings.price-user-month")
                          :benefits [(if cf/saas?
                                       (tr "subscription.settings.professional.storage-benefit")
                                       (tr "subscription.settings.professional.selfhost.control-over-data")),
@@ -685,10 +724,9 @@
                                       (tr "subscription.settings.professional.teams-editors-benefit")
                                       (tr "subscription.settings.professional.selfhost.community-support"))]
                          :cta-text (tr "subscription.settings.subscribe")
-                         :cta-link (if (and (contains? cf/flags :nitrate) nitrate? (= subscription-type "nitrate"))
-                                     (if (and (:licenses connectivity) (not (:manual nitrate-license)))
-                                       dnt/go-to-nitrate-billing
-                                       open-cancel-contact-sales-modal)
+                         :cta-link (if (and (contains? cf/flags :admin-console) nitrate?)
+                                     #(open-contact-sales-modal subscription-type "Professional"
+                                                                (and (:licenses connectivity) (not (:manual nitrate-license))))
                                      go-to-payments)
                          :cta-text-with-icon (tr "subscription.settings.more-information")
                          :cta-link-with-icon go-to-pricing-page
@@ -698,20 +736,20 @@
          [:> plan-card* {:card-title (tr "subscription.settings.unlimited")
                          :card-title-icon i/character-u
                          :price-value "$7"
-                         :price-period (tr "subscription.settings.price-editor-month")
+                         :price-period (tr "subscription.settings.price-user-month")
                          :benefits-title (tr "subscription.settings.benefits.all-professional-benefits")
                          :benefits [(tr "subscription.settings.unlimited.storage-benefit"),
                                     (tr "subscription.settings.unlimited.autosave-benefit"),
                                     (tr "subscription.settings.unlimited.bill")]
                          :cta-text (if (:type subscription) (tr "subscription.settings.subscribe") (tr "subscription.settings.try-it-free"))
-                         :cta-link (if (and (contains? cf/flags :nitrate) nitrate?) #(open-contact-sales-modal subscription-type "Unlimited") #(open-subscription-modal "unlimited" subscription))
+                         :cta-link (if (and (contains? cf/flags :admin-console) nitrate?) #(open-contact-sales-modal subscription-type "Unlimited") #(open-subscription-modal "unlimited" subscription))
                          :cta-text-with-icon (tr "subscription.settings.more-information")
                          :cta-link-with-icon go-to-pricing-page
                          :recommended (= subscription-type "professional")
                          :show-button-cta (= subscription-type "professional")
                          :current-plan false}])
 
-       (when (and (not= subscription-type "enterprise") cf/saas? (not (contains? cf/flags :nitrate)))
+       (when (and (not= subscription-type "enterprise") cf/saas? (not (contains? cf/flags :admin-console)))
          [:> plan-card* {:card-title (tr "subscription.settings.enterprise")
                          :card-title-icon i/character-e
                          :price-value "$950"
@@ -727,18 +765,21 @@
                          :show-button-cta (= subscription-type "professional")
                          :current-plan false}])
 
-       ;; TODO add translations for this texts when we have the definitive ones
-       (when (and (contains? cf/flags :nitrate) (not nitrate?))
-         [:> plan-card* {:card-title "Enterprise"
-                         :card-title-icon i/character-n
+       (when (and (contains? cf/flags :admin-console) (not nitrate?))
+         [:> plan-card* {:card-title (tr "subscription.settings.enterprise")
                          :price-value "$25"
                          :price-period (tr "subscription.settings.organization-member-month")
-                         :benefits-title (tr "subscription.settings.benefits.all-unlimited-benefits")
-                         :benefits ["Crea organizaciones y añade personas, que usarán Penpot con las reglas que configures."
-                                    "Acceso exclusivo a la Admin Console"
-                                    "Lorem ipsum"]
-                         :cta-text (if nitrate-license (tr "subscription.settings.subscribe") "Try 14 days for free")
-                         :cta-link (if (= subscription-type "unlimited") #(open-contact-sales-modal subscription-type "Nitrate") #(open-subscription-modal "nitrate" subscription))
+                         :benefits-title (tr "subscription.settings.benefits.nitrate-unlimited-benefits")
+                         :benefits [{:label (tr "subscription.settings.enterprise.nitrate.multi-organization-management")
+                                     :description (tr "subscription.settings.enterprise.nitrate.support-team")}
+                                    {:label (tr "subscription.settings.enterprise.nitrate.enterprise-security")
+                                     :description (tr "subscription.settings.enterprise.nitrate.native-sso")}
+                                    {:label (tr "subscription.settings.enterprise.nitrate.advanced-control")
+                                     :description (tr "subscription.settings.enterprise.nitrate.plugin-whitelisting")}]
+                         :cta-text (if nitrate-license (tr "subscription.settings.subscribe") (tr "nitrate.form.free-trial-button"))
+                         :cta-link (if (= subscription-type "unlimited")
+                                     #(open-contact-sales-modal subscription-type (tr "subscription.current-plan.nitrate"))
+                                     #(open-subscription-modal "nitrate" subscription))
                          :cta-text-with-icon (tr "subscription.settings.more-information")
                          :cta-link-with-icon go-to-pricing-page
                          :code-action :activate
@@ -749,18 +790,27 @@
 (mf/defc subscribe-nitrate-dialog
   {::mf/register modal/components
    ::mf/register-as :nitrate-dialog}
-  [{:keys [nitrate-license show-contact-sales-option] :as connectivity}]
+  [{:keys [nitrate-license show-contact-sales-option event-origin subscription-start-origin] :as connectivity}]
   ;; TODO add translations for this texts when we have the definitive ones
   (let [online? (:licenses connectivity)
         handle-close-dialog
         (mf/use-fn
          (fn []
+           (st/emit! (ev/event {::ev/name "close-subscription-modal"
+                                ::ev/origin "nitrate:plan-confirmation-modal"
+                                :product "nitrate:enterprise"}))
            (modal/hide!)))
 
         on-subscribe-click
         (mf/use-fn
          (fn []
-           (dnt/go-to-buy-nitrate-license "monthly" (rt/get-current-href))))]
+           (dnt/go-to-buy-nitrate-license
+            "monthly"
+            (rt/get-current-href)
+            dnt/go-to-subscription-url
+            event-origin
+            (if nitrate-license "paid" "trial")
+            subscription-start-origin)))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-dialog)}
@@ -768,17 +818,18 @@
        [:> icon* {:icon-id "close"
                   :size "m"}]]
       [:div {:class (stl/css :modal-title :subscription-title :nitrate-subscription)}
-       "Subscribe to the Enterprise plan"]
+       (tr "nitrate.form.title")]
 
       (if (and online? (not show-contact-sales-option))
         [:div {:class (stl/css :modal-content)}
 
          [:*
+          [:div {:class (stl/css :modal-text)} (tr "nitrate.form.enterprise-intro" ":")]
           [:div {:class (stl/css :modal-text :price-text)}
            [:span {:class (stl/css :price-value)} "25$"]
-           (tr "nitrate.form.enterprise.price")]
+           " / " (tr "subscription.settings.organization-member-month")]
           [:div {:class (stl/css :modal-text)}
-           "You won’t be charged right now. Payment will be processed at the end of the trial. Cancel anytime."]
+           (tr "nitrate.form.enterprise-description")]
 
           [:div {:class (stl/css :modal-footer)}
            [:div {:class (stl/css :action-buttons)}
@@ -791,13 +842,11 @@
             [:input
              {:class (stl/css :primary-button)
               :type "button"
-              :value (if nitrate-license (tr "subscription.settings.subscribe") "TRY 14 DAYS FOR FREE")
+              :value (if nitrate-license (tr "subscription.settings.subscribe") (tr "nitrate.form.free-trial-button"))
               :on-click on-subscribe-click}]]]]]
         [:div {:class (stl/css :modal-content :modal-contact-content)}
          [:div {:class (stl/css :modal-text)}
-          "Lorem ipsum lorem ipsum Lorem ipsum lorem ipsum Lorem ipsum lorem ipsum"]
-         [:div {:class (stl/css :modal-text)}
-          (if nitrate-license "Contact us to upgrade to Nitrate:" "Contact us to try Nitrate for 14 days:")]
+          (tr "nitrate.form.enterprise-intro" ".") " " (if nitrate-license (tr "nitrate.form.contact-us-upgrade") (tr "nitrate.form.contact-us-free-trial"))]
          [:div {:class (stl/css :modal-text)}
           [:a {:class (stl/css :cta-button) :href "mailto:sales@penpot.app"}
            "sales@penpot.app"]]])]]))
@@ -805,11 +854,17 @@
 (mf/defc nitrate-contact-sales-dialog
   {::mf/register modal/components
    ::mf/register-as :nitrate-contact-sales-dialog}
-  [{:keys [subscription-type]}]
+  [{:keys [subscription-type has-billing-access?]}]
   (let [handle-close-dialog
         (mf/use-fn
          (fn []
-           (modal/hide!)))]
+           (modal/hide!)))
+
+        handle-continue-click
+        (mf/use-fn
+         (fn []
+           (modal/hide!)
+           (dnt/go-to-nitrate-billing)))]
 
     [:div {:class (stl/css :modal-overlay)}
      [:div {:class (stl/css :modal-dialog)}
@@ -817,25 +872,33 @@
        [:> icon* {:icon-id "close"
                   :size "m"}]]
       [:div {:class (stl/css :modal-title :subscription-title)}
-       (dm/str "Switch to " subscription-type " plan?")]
+       (tr "nitrate.contact-sales.title" subscription-type)]
       [:div {:class (stl/css :modal-content)}
        [:div {:class (stl/css :modal-text-medium)}
-        "When you downgrade:"]
+        (tr "nitrate.contact-sales.downgrade-title")]
        [:ul {:class (stl/css :downgrade-list)}
-        [:li {:class (stl/css :downgrade-item)} "Your organization will be deleted."]
-        [:li {:class (stl/css :downgrade-item)} "The teams, projects and files will no longer be part of any organization but they will remain available."]
-        [:li {:class (stl/css :downgrade-item)} "Your total storage, auto-version history, and file recovery period will be limited."]]
+        [:li {:class (stl/css :downgrade-item)} (tr "nitrate.contact-sales.downgrade-organization-deleted")]
+        [:li {:class (stl/css :downgrade-item)} (tr "nitrate.contact-sales.downgrade-teams-available")]
+        [:li {:class (stl/css :downgrade-item)} (tr "nitrate.contact-sales.downgrade-storage-limited")]]
 
-       [:div {:class (stl/css :downgrade-warning)}
-        "To switch to this plan, please contact our sales team.
-We’ll help you update your subscription and ensure everything is set up correctly."]
-       [:div {:class (stl/css :action-buttons)}
-        [:> button* {:variant "secondary"
-                     :type "button"
-                     :on-click handle-close-dialog} (tr "ds.confirm-cancel")]
-        [:> button* {:variant "primary"
-                     :type "button"
-                     :on-click #(dom/open-new-window "mailto:sales@penpot.app?subject=Switch%20to%20the%20Unlimited%20plan")} "Contact sales"]]]]]))
+       (if has-billing-access?
+         [:div {:class (stl/css :action-buttons)}
+          [:> button* {:variant "secondary"
+                       :type "button"
+                       :on-click handle-close-dialog} (tr "ds.confirm-cancel")]
+          [:> button* {:variant "primary"
+                       :type "button"
+                       :on-click handle-continue-click} (tr "labels.continue")]]
+         [:*
+          [:div {:class (stl/css :downgrade-warning)}
+           (tr "nitrate.contact-sales.downgrade-contact-info")]
+          [:div {:class (stl/css :action-buttons)}
+           [:> button* {:variant "secondary"
+                        :type "button"
+                        :on-click handle-close-dialog} (tr "ds.confirm-cancel")]
+           [:> button* {:variant "primary"
+                        :type "button"
+                        :on-click #(dom/open-new-window (dm/str "mailto:sales@penpot.app?subject=Switch%20to%20the%20" subscription-type "%20plan"))} (tr "nitrate.contact-sales.button")]]])]]]))
 
 (mf/defc nitrate-cancel-contact-sales-dialog
   {::mf/register modal/components
@@ -846,7 +909,7 @@ We’ll help you update your subscription and ensure everything is set up correc
 
         mailto-url
         (dm/str "mailto:sales@penpot.net"
-                "?subject=Request%20to%20Cancel%20Nitrate%20Subscription"
+                "?subject=Request%20to%20Cancel%20Enterprise%20Subscription"
                 "&body=Hello%2C%0A%0A"
                 "I%20would%20like%20to%20cancel%20my%20Enterprise%20subscription.%0A"
                 "Account%20email%3A%20" encoded-email ".%0A%0AThank%20you.")
@@ -862,15 +925,15 @@ We’ll help you update your subscription and ensure everything is set up correc
        [:> icon* {:icon-id "close"
                   :size "m"}]]
       [:div {:class (stl/css :modal-title :subscription-title)}
-       "Cancel subscription"]
+       (tr "nitrate.subscription.settings.manual-cancel")]
 
       [:div {:class (stl/css :modal-content)}
        [:div {:class (stl/css :modal-text-medium)}
-        "To cancel your Nitrate subscription, please contact us at:"]
+        (tr "nitrate.subscription.settings.manual-contact-us")]
        [:a {:class (stl/css :cta-link) :href "mailto:sales@penpot.net"}
         "sales@penpot.net"]
        [:div {:class (stl/css :action-buttons)}
         [:> button* {:class (stl/css :button-full-width)
                      :variant "primary"
                      :type "button"
-                     :on-click #(dom/open-new-window mailto-url)} "Contact us"]]]]]))
+                     :on-click #(dom/open-new-window mailto-url)} (tr "labels.contact-us")]]]]]))
diff --git a/frontend/src/app/main/ui/settings/subscription.scss b/frontend/src/app/main/ui/settings/subscription.scss
index 26853b6e65..6130d7e3a3 100644
--- a/frontend/src/app/main/ui/settings/subscription.scss
+++ b/frontend/src/app/main/ui/settings/subscription.scss
@@ -150,9 +150,10 @@
 }
 
 .benefits-list {
-  list-style-position: inside;
+  list-style-position: outside;
   list-style-type: disc;
   margin-block: 0;
+  margin-inline: var(--sp-l);
 }
 
 .benefits-title,
@@ -162,6 +163,10 @@
   color: var(--color-foreground-secondary);
 }
 
+.benefit-label {
+  font-weight: 600;
+}
+
 .other-subscriptions {
   margin-block-start: px2rem(52);
 }
@@ -437,7 +442,7 @@
   align-items: center;
   display: flex;
   gap: var(--sp-s);
-  margin-block-end: px2rem(34);
+  margin-block: var(--sp-xl);
 }
 
 .price-value {
diff --git a/frontend/src/app/main/ui/shortcuts.cljs b/frontend/src/app/main/ui/shortcuts.cljs
new file mode 100644
index 0000000000..4499eac9ed
--- /dev/null
+++ b/frontend/src/app/main/ui/shortcuts.cljs
@@ -0,0 +1,731 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.main.ui.shortcuts
+  (:require-macros [app.main.style :as stl])
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.config :as cf]
+   [app.main.data.dashboard.shortcuts.customize :as customize]
+   [app.main.data.profile :as du]
+   [app.main.data.shortcuts :as ds]
+   [app.main.store :as st]
+   [app.main.ui.context :as ctx]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
+   [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
+   [app.main.ui.ds.notifications.context-notification :refer [context-notification*]]
+   [app.main.ui.ds.tooltip.tooltip :refer [tooltip*]]
+   [app.util.dom :as dom]
+   [app.util.i18n :refer [tr]]
+   [app.util.strings :refer [matches-search]]
+   [cuerdas.core :as str]
+   [goog.events :as events]
+   [rumext.v2 :as mf]))
+
+(def ^:private modifier-keys
+  #{"Control" "Shift" "Alt" "Meta"})
+
+(def ^:private key-name-map
+  {"ArrowUp"    "up"
+   "ArrowDown"  "down"
+   "ArrowLeft"  "left"
+   "ArrowRight" "right"
+   "Escape"     "escape"
+   "Enter"      "enter"
+   "Backspace"  "backspace"
+   "Delete"     "del"
+   "Tab"        "tab"
+   " "          "space"})
+
+(defn- keyboard-event->mousetrap
+  [^js event]
+  (let [parts (cond-> []
+                (and (.-ctrlKey event)
+                     (not (cf/check-platform? :macos)))
+                (conj "ctrl")
+
+                (and (.-metaKey event)
+                     (cf/check-platform? :macos))
+                (conj "command")
+
+                (.-altKey event)
+                (conj "alt")
+
+                (.-shiftKey event)
+                (conj "shift"))
+        key   (.-key event)
+        key   (if (contains? modifier-keys key)
+                nil
+                (or (get key-name-map key)
+                    (.toLowerCase key)))]
+    (when key
+      (str/join "+" (conj parts key)))))
+
+(defn- keyboard-event->display-parts
+  [^js event]
+  (let [parts (cond-> []
+                (and (.-ctrlKey event)
+                     (not (cf/check-platform? :macos)))
+                (conj "ctrl")
+
+                (and (.-metaKey event)
+                     (cf/check-platform? :macos))
+                (conj "command")
+
+                (.-altKey event)
+                (conj "alt")
+
+                (.-shiftKey event)
+                (conj "shift"))
+        key   (.-key event)]
+    (if (contains? modifier-keys key)
+      {:modifiers parts :finalized? false}
+      {:modifiers parts
+       :final-key (or (get key-name-map key) (.toLowerCase key))
+       :finalized? true})))
+
+(defn translation-keyname
+  [type keyname]
+  (let [translat-pre (case type
+                       :sc      "shortcuts."
+                       :sec     "shortcut-section."
+                       :sub-sec "shortcut-subsection.")]
+    (tr (str translat-pre (d/name keyname)))))
+
+(defn- find-conflict
+  [new-command all-shortcuts current-key]
+  (let [command-index (ds/build-command-index all-shortcuts)]
+    (when-let [conflicting-key (get command-index new-command)]
+      (when (not= conflicting-key current-key)
+        {:key  conflicting-key
+         :name (translation-keyname :sc conflicting-key)}))))
+
+(def ^:private import-contexts
+  [:workspace :dashboard :viewer])
+
+(defn- import-context-group
+  "Imports a single context group from the payload, disabling any default
+   shortcut whose command collides with a newly imported one, and any
+   previously-imported entry in the same batch with a duplicate command."
+  [group all-shortcuts]
+  (reduce
+   (fn [acc [command recorded-command]]
+     (let [default-conflict (find-conflict recorded-command all-shortcuts command)
+           acc-conflict     (some (fn [[k v]]
+                                    (when (and (not= k command) (= v recorded-command))
+                                      k))
+                                  acc)]
+       (cond-> (assoc acc command recorded-command)
+         (:key default-conflict)
+         (assoc (:key default-conflict) "")
+         acc-conflict
+         (assoc acc-conflict ""))))
+   {}
+   group))
+
+(defn import-custom-shortcuts
+  [shortcuts all-shortcuts]
+  (let [current-customs (or (get-in shortcuts [:profile :props :custom-shortcuts])
+                            (get-in @st/state [:profile :props :custom-shortcuts])
+                            {})
+
+        new-customs (reduce
+                     (fn [acc ctx]
+                       (if (contains? shortcuts ctx)
+                         (assoc acc ctx (import-context-group (get shortcuts ctx) all-shortcuts))
+                         acc))
+                     current-customs
+                     import-contexts)]
+
+    (du/update-profile-props {:custom-shortcuts new-customs})))
+
+(defn add-translation
+  [type item]
+  (map (fn [[k v]] [k (assoc v :translation (translation-keyname type k))]) item))
+
+(defn shortcuts->subsections
+  [shortcuts]
+  (let [subsections (into #{} (mapcat :subsections) (vals shortcuts))
+        subsections (vec (sort-by name subsections))
+        get-sc-by-subsection
+        (fn [subsection [k v]]
+          (when (some #(= subsection %) (:subsections v)) {k v}))
+        reduce-sc
+        (fn [acc subsection]
+          (let [shortcuts-by-subsection (into {} (keep (partial get-sc-by-subsection subsection) shortcuts))]
+            (assoc acc subsection {:children shortcuts-by-subsection})))]
+    (reduce reduce-sc (sorted-map-by (fn [a b] (compare (name a) (name b)))) subsections)))
+
+(defn build-all-shortcuts
+  [workspace-sc dashboard-sc viewer-sc]
+  (let [walk (fn walk [element parent-id]
+               (if (nil? element)
+                 element
+                 (let [sorted-comp (when (sorted? element)
+                                     #(compare (name %1) (name %2)))
+                       rec-fn (fn [[k item]]
+                                (let [item-id (if (nil? parent-id)
+                                                [k]
+                                                (conj parent-id k))]
+                                  [k (assoc item :id item-id :children (walk (:children item) item-id))]))]
+                   (if sorted-comp
+                     (into (sorted-map-by sorted-comp) (map rec-fn element))
+                     (into {} (map rec-fn element))))))
+        sorted-map-fn #(sorted-map-by (fn [a b] (compare (name a) (name b))))
+        ws-subs (->> (shortcuts->subsections workspace-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+
+        db-subs (->> (shortcuts->subsections dashboard-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+        vw-subs (->> (shortcuts->subsections viewer-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+        basics  (into {} (concat (:children (:basics ws-subs))
+                                 (:children (:basics db-subs))
+                                 (:children (:basics vw-subs))))
+        ws-subs (dissoc ws-subs :basics)
+        db-subs (dissoc db-subs :basics)
+        vw-subs (dissoc vw-subs :basics)
+        all     {:basics    {:children {:none {:children basics}}
+                             :translation (tr "shortcut-section.basics")}
+                 :workspace {:children ws-subs
+                             :translation (tr "shortcut-section.workspace")}
+                 :dashboard {:children db-subs
+                             :translation (tr "shortcut-section.dashboard")}
+                 :viewer    {:children vw-subs
+                             :translation (tr "shortcut-section.viewer")}}
+        all     (walk all nil)
+        all-sc-names (map #(translation-keyname :sc %)
+                          (concat (keys workspace-sc)
+                                  (keys dashboard-sc)
+                                  (keys viewer-sc)))
+        all-sub-names (map #(translation-keyname :sub-sec %)
+                           (concat (keys ws-subs)
+                                   (keys db-subs)
+                                   (keys vw-subs)))
+        all-section-names (map #(translation-keyname :sec %) (keys all))]
+    {:all-shortcuts all
+     :all-sc-names all-sc-names
+     :all-sub-names all-sub-names
+     :all-section-names all-section-names}))
+
+(defn build-all-shortcuts-without-basics
+  [workspace-sc path-sc dashboard-sc viewer-sc
+   & {:keys [workspace-orig path-orig dashboard-orig viewer-orig]}]
+  (let [original-commands (into {}
+                                (concat
+                                 (map (fn [[k v]] [k (:command v)]) workspace-orig)
+                                 (map (fn [[k v]] [k (:command v)]) path-orig)
+                                 (map (fn [[k v]] [k (:command v)]) dashboard-orig)
+                                 (map (fn [[k v]] [k (:command v)]) viewer-orig)))
+        walk (fn walk [element parent-id]
+               (if (nil? element)
+                 element
+                 (let [sorted-comp (when (sorted? element)
+                                     #(compare (name %1) (name %2)))
+                       rec-fn (fn [[k item]]
+                                (let [item-id (if (nil? parent-id)
+                                                [k]
+                                                (conj parent-id k))
+                                      item (if (:command item)
+                                             (assoc item :original-command
+                                                    (or (:original-command item)
+                                                        (get original-commands k (:command item))))
+                                             item)]
+                                  [k (assoc item :id item-id :children (walk (:children item) item-id))]))]
+                   (if sorted-comp
+                     (into (sorted-map-by sorted-comp) (map rec-fn element))
+                     (into {} (map rec-fn element))))))
+        sorted-map-fn #(sorted-map-by (fn [a b] (compare (name a) (name b))))
+        ws-subs (->> (shortcuts->subsections workspace-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+
+        pt-subs (->> (shortcuts->subsections path-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+        db-subs (->> (shortcuts->subsections dashboard-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+        vw-subs (->> (shortcuts->subsections viewer-sc)
+                     (add-translation :sub-sec)
+                     (into (sorted-map-fn)))
+        ws-subs  (dissoc ws-subs :basics)
+        pt-subs  (dissoc pt-subs :basics)
+        db-subs  (dissoc db-subs :basics)
+        vw-subs  (dissoc vw-subs :basics)
+        ws-subs  (merge ws-subs pt-subs)
+        all      {:workspace {:children ws-subs
+                              :translation (tr "shortcut-section.workspace")}
+                  :dashboard {:children db-subs
+                              :translation (tr "shortcut-section.dashboard")}
+                  :viewer    {:children vw-subs
+                              :translation (tr "shortcut-section.viewer")}}
+        all      (walk all nil)
+        all-sc-names (map #(translation-keyname :sc %)
+                          (concat (keys workspace-sc)
+                                  (keys path-sc)
+                                  (keys dashboard-sc)
+                                  (keys viewer-sc)))
+        all-sub-names (map #(translation-keyname :sub-sec %)
+                           (concat (keys ws-subs)
+                                   (keys db-subs)
+                                   (keys vw-subs)))
+        all-section-names (map #(translation-keyname :sec %) (keys all))]
+    {:all-shortcuts all
+     :all-sc-names all-sc-names
+     :all-sub-names all-sub-names
+     :all-section-names all-section-names}))
+
+(mf/defc converted-chars*
+  [{:keys [char command class]}]
+  (let [modified-keys {:up    ds/up-arrow
+                       :down  ds/down-arrow
+                       :left  ds/left-arrow
+                       :right ds/right-arrow
+                       :plus "+"}
+        macos-keys    {:command "\u2318"
+                       :option  "\u2325"
+                       :alt     "\u2325"
+                       :delete  "\u232B"
+                       :del     "\u232B"
+                       :shift   "\u21E7"
+                       :control "\u2303"
+                       :esc     "\u238B"
+                       :enter   "\u23CE"}
+        is-macos?     (cf/check-platform? :macos)
+        char          (if (contains? modified-keys (keyword char)) ((keyword char) modified-keys) char)
+        char          (if (and is-macos? (contains? macos-keys (keyword char))) ((keyword char) macos-keys) char)
+        unique-key    (str (d/name command) "-" char)]
+    [:span {:class [class (stl/css :key)]
+            :key unique-key} char]))
+
+(mf/defc shortcuts-keys*
+  [{:keys [content command is-customized has-conflict? light-shortcut]}]
+  (let [managed-list    (if (coll? content)
+                          content
+                          (conj () content))
+        chars-list      (map ds/split-sc managed-list)
+        last-element    (last chars-list)
+        short-char-list (if (= 1 (count chars-list))
+                          chars-list
+                          (drop-last chars-list))
+        penultimate     (last short-char-list)]
+    [:span {:class (stl/css :keys)}
+     (for [chars short-char-list]
+       [:* {:key (str/join chars)}
+        (for [char chars]
+          [:> converted-chars* {:key (dm/str char "-" (name command))
+                                :char char
+                                :command command
+                                :class (cond
+                                         has-conflict? (stl/css :conflict-key)
+                                         is-customized (stl/css :customized-key)
+                                         light-shortcut (stl/css :light-key))}])
+
+        (when (not= chars penultimate) [:span {:class (stl/css :space)} ","])])
+     (when (not= last-element penultimate)
+       [:*
+        [:span {:class (stl/css :space)} (tr "shortcuts.or")]
+        (for [char last-element]
+          [:> converted-chars* {:key (dm/str char "-" (name command))
+                                :char char
+                                :command command
+                                :class (cond
+                                         has-conflict? (stl/css :conflict-key)
+                                         is-customized (stl/css :customized-key)
+                                         light-shortcut (stl/css :light-key))}])])]))
+
+(mf/defc shortcut-row-editable*
+  [{:keys [elements custom-shortcuts command-translate conflicts section-key]}]
+  (let [{:keys [workspace-sc-trans dashboard-sc-trans viewer-sc-trans]} (mf/use-ctx ctx/shortcuts-ctx)
+        section-shortcuts (case section-key
+                            (:workspace :path) workspace-sc-trans
+                            :dashboard dashboard-sc-trans
+                            :viewer viewer-sc-trans
+                            workspace-sc-trans)
+        sc-by-translate  (first (filter #(= (:translation (second %)) command-translate) elements))
+        [command  command-info] sc-by-translate
+        content                (or (:show-command command-info) (:command command-info))
+        group-map              (if (= section-key :basics)
+                                 (merge (get custom-shortcuts :workspace)
+                                        (get custom-shortcuts :dashboard)
+                                        (get custom-shortcuts :viewer))
+                                 (get custom-shortcuts section-key))
+        group-map              (if (map? group-map) group-map {})
+        customized?            (contains? group-map command)
+        has-conflict?          (contains? conflicts command)
+        is-editing*            (mf/use-state false)
+        is-editing             (deref is-editing*)
+
+        recording-ref          (mf/use-ref nil)
+
+        display-parts*         (mf/use-state nil)
+        display-parts          (deref display-parts*)
+
+        recorded-command*      (mf/use-state nil)
+        recorded-command       (deref recorded-command*)
+
+        conflict*              (mf/use-state nil)
+        conflict               (deref conflict*)
+
+        reset-notification*    (mf/use-state nil)
+        reset-notification     (deref reset-notification*)
+
+        reset-pending*         (mf/use-state false)
+        reset-pending          (deref reset-pending*)
+
+        clean-editing-state
+        (fn []
+          (reset! is-editing* false)
+          (reset! display-parts* nil)
+          (reset! recorded-command* nil)
+          (reset! conflict* nil)
+          (reset! reset-notification* nil)
+          (reset! reset-pending* false))
+
+        effective-section-key (if (= section-key :basics) :workspace section-key)
+
+        on-reset-shortcut
+        (mf/use-fn
+         (mf/deps effective-section-key command-info)
+         (fn [_]
+           (let [original-cmd (:original-command command-info)]
+             (reset! reset-pending* true)
+             (reset! recorded-command* original-cmd)
+             (reset! reset-notification* original-cmd)
+             (reset! conflict* nil)
+             (reset! display-parts* nil))))
+
+        start-editing
+        (mf/use-fn
+         (fn [_]
+           (reset! is-editing* true)
+           (reset! display-parts* nil)
+           (reset! recorded-command* nil)
+           (reset! conflict* nil)))
+
+        stop-editing
+        (mf/use-fn
+         (fn [event]
+           (dom/stop-propagation event)
+           (clean-editing-state)))
+
+        disabled-shortcut
+        (mf/use-fn
+         (mf/deps command effective-section-key)
+         (fn [event]
+           (dom/prevent-default event)
+           (st/emit! (customize/set-custom-shortcut
+                      command
+                      ""
+                      nil
+                      effective-section-key))
+           (clean-editing-state)))
+
+        save-fn
+        (mf/use-fn
+         (mf/deps recorded-command conflict command effective-section-key)
+         (fn [event]
+           (dom/prevent-default event)
+           (when recorded-command
+             (if (deref reset-pending*)
+               (st/emit! (customize/reset-custom-shortcut command recorded-command effective-section-key))
+               (st/emit! (customize/set-custom-shortcut
+                          command
+                          recorded-command
+                          (:key conflict)
+                          effective-section-key))))
+           (clean-editing-state)))
+
+        on-editable-container-blur
+        (mf/use-fn
+         (fn [e]
+           (when-not (.contains (.-currentTarget e)
+                                (.-relatedTarget e))
+             (clean-editing-state))))]
+
+    (mf/with-effect [is-editing]
+      (when is-editing
+        (some-> (mf/ref-val recording-ref) (dom/focus!))))
+
+    (mf/with-effect [display-parts]
+      (when (some? display-parts)
+        (reset! reset-notification* nil)
+        (reset! reset-pending* false)))
+
+    (mf/with-effect [is-editing]
+      (when is-editing
+        (letfn [(on-keydown [^js event]
+                  (.preventDefault event)
+                  (.stopPropagation event)
+                  (let [recorded-command (keyboard-event->mousetrap event)
+                        parts   (keyboard-event->display-parts event)]
+                    (reset! display-parts* parts)
+                    (when recorded-command
+                      (reset! recorded-command* recorded-command)
+                      (reset! conflict* (find-conflict recorded-command section-shortcuts command)))))]
+          (->> (events/listen (mf/ref-val recording-ref) "keydown" on-keydown)
+               (partial events/unlistenByKey)))))
+
+
+    [:li {:class (stl/css-case :shortcuts-name-editable true
+                               :shortcuts-editing is-editing
+                               :customized customized?)
+          :data-customized (str customized?)
+          :data-conflict (str has-conflict?)
+          :aria-label command-translate
+          :key command-translate}
+     [:button {:on-click start-editing
+               :disabled is-editing
+               :aria-label (dm/str "Edit " command-translate)
+               :class (stl/css-case :shortcut-button-editable true
+                                    :shortcut-button-editing is-editing)}
+      [:span {:class (stl/css :command-name)
+              :id (dm/str command-translate "-label")}
+       command-translate]
+      [:div {:class (stl/css :shortcut-actions)
+             :aria-labelledby (dm/str command-translate "-label")}
+       (if (and customized? (str/blank? content))
+         [:> icon* {:icon-id i/broken-link
+                    :size "s"
+                    :class (stl/css :shortcut-detach-icon)}]
+
+         (if has-conflict?
+           (let [conflicting-key (get conflicts command)
+                 conflict-name   (translation-keyname :sc conflicting-key)]
+             [:> tooltip* {:content (tr  "shortcuts.overwritten-by" conflict-name)
+                           :id (dm/str (name command) "-conflict-tooltip")
+                           :class (stl/css :option-text)}
+              [:> shortcuts-keys* {:content content
+                                   :command command
+                                   :is-customized customized?
+                                   :has-conflict? has-conflict?}]])
+           [:> shortcuts-keys* {:content content
+                                :command command
+                                :is-customized customized?
+                                :has-conflict? has-conflict?}]))]]
+     (when is-editing
+       [:div {:class (stl/css :shortcut-editing)
+              :ref recording-ref
+              :tab-index 0
+              :on-blur on-editable-container-blur}
+        [:div {:class (stl/css :shortcut-recording-area)}
+         (if (nil? display-parts)
+           [:span {:class (stl/css :shortcut-placeholder)}
+            (tr "shortcuts.key-combo")]
+           [:span {:class (stl/css :shortcut-recorded-keys)}
+            (for [mod (:modifiers display-parts)]
+              [:span {:class (stl/css-case :key true
+                                           :customized-key customized?) :key mod} mod])
+            (when (:final-key display-parts)
+              [:span {:class (stl/css-case :key true
+                                           :customized-key customized?)} (:final-key display-parts)])
+            (when-not (:finalized? display-parts)
+              [:span {:class (stl/css :recording-ellipsis)} "..."])])]
+        (when-let [default-cmd reset-notification]
+          [:> context-notification* {:level :info :class (stl/css :modal-reset-msg)}
+           (tr "shortcuts.edit-modal.reset-pending")
+           [:> shortcuts-keys* {:content default-cmd
+                                :command (keyword "default")
+                                :is-customized false
+                                :has-conflict? false}]])
+
+        (when (and recorded-command (not reset-pending))
+          (if conflict
+            [:> context-notification* {:level :warning :class (stl/css :modal-error-msg)}
+             (tr "shortcuts.edit-modal.conflict" (:name conflict))]
+            [:> context-notification* {:level :success :class (stl/css :modal-success-msg)}
+             (tr "shortcuts.edit-modal.success")]))
+        [:div {:class (stl/css :edit-buttons)}
+         [:div {:class (stl/css :confirmation-buttons)}
+          [:> icon-button* {:variant "secondary"
+                            :aria-label (tr "labels.cancel")
+                            :on-click stop-editing
+                            :icon i/close
+                            :icon-size "m"}]
+          [:> icon-button* {:variant "primary"
+                            :aria-label (tr "labels.save")
+                            :on-click save-fn
+                            :icon i/tick
+                            :icon-size "m"}]]
+         [:div {:class (stl/css :confirmation-buttons)}
+          [:> icon-button* {:variant "secondary"
+                            :aria-label (tr "shortcuts.disable")
+                            :on-click (fn [e]
+                                        (dom/stop-propagation e)
+                                        (disabled-shortcut command))
+                            :icon i/broken-link
+                            :icon-size "m"}]
+          (when customized?
+            [:> icon-button* {:variant "secondary"
+                              :aria-label (tr "shortcuts.reset")
+                              :on-click (fn [e]
+                                          (dom/stop-propagation e)
+                                          (on-reset-shortcut command))
+                              :icon i/reload
+                              :icon-size "m"}])]]])]))
+
+(mf/defc shortcut-row*
+  [{:keys [elements filter-term is-match-section is-match-subsection
+           editable? custom-shortcuts section-key conflicts hidden subsection-name]}]
+  (let [shortcut-translations (->> elements vals (map :translation) sort)
+        match-shortcut?       (some #(matches-search % filter-term) shortcut-translations)
+        filtered              (if (and (or is-match-section is-match-subsection) (not match-shortcut?))
+                                shortcut-translations
+                                (filter #(matches-search % filter-term) shortcut-translations))
+        sorted-filtered       (sort filtered)
+        trigger-ref            (mf/use-ref nil)]
+
+    [:ul {:class (stl/css :sub-menu)
+          :id (dm/str (d/name subsection-name) "-subsection")
+          :hidden hidden}
+     (for [command-translate sorted-filtered]
+       (let [sc-by-translate  (first (filter #(= (:translation (second %)) command-translate) elements))
+             [command  command-info] sc-by-translate
+             content                (or (:show-command command-info) (:command command-info))
+             group-map              (if (= section-key :basics)
+                                      (merge (get custom-shortcuts :workspace)
+                                             (get custom-shortcuts :dashboard)
+                                             (get custom-shortcuts :viewer))
+                                      (get custom-shortcuts section-key))
+             group-map              (if (map? group-map) group-map {})
+             customized?            (contains? group-map command)
+             has-conflict?          (contains? conflicts command)]
+         (if editable?
+           [:> shortcut-row-editable* {:elements elements
+                                       :custom-shortcuts custom-shortcuts
+                                       :section-key section-key
+                                       :key command-translate
+                                       :command-translate command-translate
+                                       :conflicts conflicts}]
+           [:li {:class (stl/css-case :shortcuts-name true
+                                      :customized customized?)
+                 :data-customized (str customized?)
+                 :data-conflict (str has-conflict?)
+                 :aria-label command-translate
+                 :key command-translate}
+            [:span {:class (stl/css :command-name)
+                    :id (dm/str command-translate "-label")}
+             command-translate]
+            [:div {:class (stl/css :shortcut-actions)
+                   :aria-labelledby (dm/str command-translate "-label")}
+             (if (and customized? (str/blank? content))
+               [:> tooltip* {:content (tr "shortcuts.disabled-shortcut")
+                             :trigger-ref trigger-ref
+                             :id (dm/str command-translate "-tooltip")
+                             :class (stl/css :option-text)}
+                [:> icon* {:icon-id i/broken-link
+                           :aria-labelledby (dm/str command-translate "-tooltip")
+                           :size "s"
+                           :ref trigger-ref
+                           :class (stl/css :shortcut-detach-icon)}]]
+               (if has-conflict?
+                 (let [conflicting-key (get conflicts command)
+                       conflict-name   (translation-keyname :sc conflicting-key)]
+                   [:> tooltip* {:content (tr "shortcuts.overwritten-by" conflict-name)
+                                 :id (dm/str (name command) "-conflict-tooltip")
+                                 :class (stl/css :option-text)}
+                    [:> shortcuts-keys* {:content content
+                                         :command command
+                                         :is-customized customized?
+                                         :has-conflict? has-conflict?}]])
+                 [:> shortcuts-keys* {:content content
+                                      :command command
+                                      :is-customized customized?
+                                      :has-conflict? has-conflict?}]))]])))]))
+
+
+(mf/defc section-title*
+  [{:keys [name is-visible is-sub on-click]}]
+  (let [handle-key-down
+        (fn [event]
+          (when (or (= "Enter" (.-key event))
+                    (= " " (.-key event)))
+            (.preventDefault event)
+            (on-click event)))]
+    [:button {:class (if is-sub
+                       (stl/css :subsection-title)
+                       (stl/css :section-title))
+              :on-click on-click
+              :on-key-down handle-key-down
+              :aria-expanded is-visible
+              :aria-controls (dm/str (str/lower name) (if is-sub "-subsection" "-section"))}
+     [:> icon* {:icon-id (if is-visible i/arrow-down i/arrow-right)
+                :size "s"
+                :aria-hidden true}]
+     [:span {:class (if is-sub
+                      (stl/css :subsection-name)
+                      (stl/css :section-name))} name]]))
+
+(mf/defc shortcut-subsection*
+  [{:keys [subsections manage-sections filter-term is-match-section open-sections
+           editable? custom-shortcuts section-key conflicts hidden]}]
+  (if (= :none (first (keys subsections)))
+    [:> shortcut-row* {:elements (:children (:none subsections))
+                       :filter-term filter-term
+                       :is-match-section is-match-section
+                       :is-match-subsection true
+                       :editable? editable?
+                       :hidden hidden
+                       :custom-shortcuts custom-shortcuts
+                       :section-key section-key
+                       :conflicts conflicts}]
+
+    [:ul {:class (stl/css :subsection-menu)
+          :hidden hidden
+          :id (dm/str (name section-key) "-section")}
+     (let [sorted-subs (sort-by (fn [[_ v]] (:translation v)) subsections)]
+       (for [[sub-name sub-info] sorted-subs]
+         (let [visible? (some #(= % (:id sub-info)) open-sections)]
+           [:li {:key (name sub-name)}
+            [:h4
+             [:> section-title* {:name (:translation sub-info)
+                                 :is-visible visible?
+                                 :is-sub true
+                                 :on-click (manage-sections (:id sub-info))}]]
+
+            [:> shortcut-row* {:elements (:children sub-info)
+                               :subsection-name sub-name
+                               :filter-term filter-term
+                               :is-match-section is-match-section
+                               :is-match-subsection true
+                               :editable? editable?
+                               :hidden (not visible?)
+                               :custom-shortcuts custom-shortcuts
+                               :section-key section-key
+                               :conflicts conflicts}]])))]))
+
+
+
+(mf/defc shortcut-section*
+  [{:keys [section manage-sections open-sections filter-term
+           editable? custom-shortcuts conflicts]}]
+  (let [[section-key section-info] section
+        section-id          (:id section-info)
+        section-translation (:translation section-info)
+        subsections         (:children section-info)
+        visible?            (some #(= % section-id) open-sections)]
+    [:div {:class (stl/css :section)}
+     [:h3 {:class (stl/css :section-header)}
+      [:> section-title* {:name section-translation
+                          :is-visible visible?
+                          :is-sub false
+                          :on-click (manage-sections section-id)}]]
+
+     [:> shortcut-subsection* {:subsections subsections
+                               :open-sections open-sections
+                               :manage-sections manage-sections
+                               :is-match-section false
+                               :filter-term filter-term
+                               :editable? editable?
+                               :hidden (not visible?)
+                               :custom-shortcuts custom-shortcuts
+                               :section-key section-key
+                               :conflicts conflicts}]]))
diff --git a/frontend/src/app/main/ui/shortcuts.scss b/frontend/src/app/main/ui/shortcuts.scss
new file mode 100644
index 0000000000..7d582e4e71
--- /dev/null
+++ b/frontend/src/app/main/ui/shortcuts.scss
@@ -0,0 +1,219 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) KALEIDOS INC Sucursal en España SL
+
+@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_borders.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
+@use "ds/mixins.scss" as *;
+@use "ds/typography.scss" as t;
+
+.section {
+  margin: 0;
+}
+
+.section-header {
+  padding: 0;
+}
+
+.section-title,
+.subsection-title {
+  @include t.use-typography("title-small");
+
+  display: flex;
+  align-items: center;
+  margin: 0;
+  padding: var(--sp-s) 0;
+  color: var(--color-foreground-secondary);
+  cursor: pointer;
+  border: none;
+  background: none;
+
+  .subsection-name,
+  .section-name {
+    padding-inline-start: var(--sp-xs);
+  }
+
+  &:hover {
+    color: var(--color-foreground-primary);
+  }
+}
+
+.subsection-title {
+  text-transform: none;
+  padding-inline-start: var(--sp-m);
+}
+
+.subsection-menu {
+  margin-block-end: var(--sp-s);
+}
+
+.sub-menu {
+  margin-block-end: var(--sp-s);
+}
+
+.shortcuts-name {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  inline-size: 100%;
+  min-block-size: $sz-32;
+  padding: px2rem(6);
+  margin-block-end: var(--sp-s);
+  border-radius: $br-8;
+  background-color: var(--color-background-tertiary);
+}
+
+.command-name {
+  @include t.use-typography("body-small");
+
+  margin-inline-start: var(--sp-xxs);
+  color: var(--color-foreground-primary);
+  flex: 1;
+  min-inline-size: 0;
+  text-align: start;
+}
+
+// Editable rows
+
+.shortcuts-name-editable {
+  inline-size: 100%;
+  min-block-size: $sz-32;
+  padding: px2rem(6);
+  margin-block-end: var(--sp-s);
+  border-radius: $br-8;
+  background-color: var(--color-background-tertiary);
+
+  &:hover {
+    background-color: var(--color-background-quaternary);
+  }
+}
+
+.shortcuts-editing {
+  background-color: var(--color-background-quaternary);
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-s);
+
+  &:focus-within {
+    border: $b-1 solid var(--color-accent-primary);
+  }
+}
+
+.shortcut-button-editable {
+  border: none;
+  background: none;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  inline-size: 100%;
+}
+
+.shortcut-button-editing {
+  gap: var(--sp-s);
+}
+
+.shortcut-editing {
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-s);
+  outline: none;
+}
+
+.shortcut-recording-area {
+  inline-size: 100%;
+  padding: px2rem(24);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--color-background-tertiary);
+  border-radius: $br-8;
+  border: $b-1 dashed var(--color-foreground-secondary);
+}
+
+.shortcut-actions {
+  display: flex;
+  align-items: center;
+  gap: var(--sp-xxs);
+}
+
+.edit-buttons {
+  display: flex;
+  align-items: center;
+  transition: opacity 0.15s ease;
+  justify-content: space-between;
+  flex-direction: row-reverse;
+}
+
+.confirmation-buttons {
+  display: flex;
+  align-items: center;
+  gap: var(--sp-s);
+  justify-content: flex-end;
+}
+
+.keys {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: var(--sp-xxs);
+}
+
+.key {
+  @include t.use-typography("body-small");
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-transform: capitalize;
+  block-size: px2rem(20);
+  padding: px2rem(2) px2rem(6);
+  border-radius: $br-6;
+  color: var(--color-foreground-primary);
+  background-color: var(--color-background-primary);
+}
+
+.customized-key {
+  background-color: var(--color-background-info);
+  color: var(--color-foreground-primary);
+}
+
+.conflict-key {
+  background-color: var(--color-background-error);
+  color: var(--color-foreground-error);
+}
+
+.light-key {
+  background-color: var(--color-background-tertiary);
+  color: var(--color-foreground-secondary);
+}
+
+.space {
+  margin: 0 var(--sp-xxs);
+  color: var(--color-foreground-secondary);
+}
+
+.shortcut-placeholder {
+  @include t.use-typography("body-small");
+
+  color: var(--color-foreground-secondary);
+}
+
+.shortcut-recorded-keys {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: var(--sp-xxs);
+}
+
+.shortcut-detach-icon {
+  color: var(--color-foreground-secondary);
+}
+
+.recording-ellipsis {
+  color: var(--color-foreground-secondary);
+}
diff --git a/frontend/src/app/main/ui/static.cljs b/frontend/src/app/main/ui/static.cljs
index cdc839ef79..9e6dfa68f0 100644
--- a/frontend/src/app/main/ui/static.cljs
+++ b/frontend/src/app/main/ui/static.cljs
@@ -10,9 +10,7 @@
    ["rxjs" :as rxjs]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
-   [app.common.pprint :as pp]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.main.data.auth :refer [is-authenticated?]]
    [app.main.data.common :as dcm]
    [app.main.errors :as errors]
@@ -25,10 +23,10 @@
    [app.main.ui.auth.register :as register]
    [app.main.ui.dashboard.sidebar :refer [sidebar*]]
    [app.main.ui.ds.buttons.button :refer [button*]]
+   [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
    [app.main.ui.ds.foundations.assets.icon :refer [icon*] :as i]
    [app.main.ui.ds.foundations.assets.raw-svg :refer [raw-svg*]]
    [app.main.ui.ds.product.loader :refer [loader*]]
-   [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.viewer.header :as viewer.header]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
@@ -60,7 +58,7 @@
       (when profile-id
         [:div {:class (stl/css :go-back-wrapper)}
          [:> icon* {:icon-id i/arrow :class (stl/css :back-arrow)}] [:span (tr "not-found.no-permission.go-dashboard")]])]
-     [:div {:class (stl/css :deco-before)} deprecated-icon/logo-error-screen]
+     [:div {:class (stl/css :deco-before)} [:> raw-svg* {:id "logo-error-screen"}]]
      (when-not profile-id
        [:button {:class (stl/css :login-header)
                  :on-click on-nav-root}
@@ -71,7 +69,7 @@
 
      [:div {:class (stl/css :deco-after2)}
       [:span (tr "labels.copyright-period")]
-      deprecated-icon/logo-error-screen
+      [:> raw-svg* {:id "logo-error-screen"}]
       [:span (tr "not-found.made-with-love")]]]))
 
 (mf/defc invalid-token
@@ -147,11 +145,14 @@
     [:div {:class (stl/css :overlay)}
      [:div {:class (stl/css :dialog-login)}
       [:div {:class (stl/css :modal-close)}
-       [:button {:class (stl/css :modal-close-button)
-                 :on-click on-nav-root}
-        deprecated-icon/close]]
+       [:> icon-button* {:variant "ghost"
+                         :aria-label (tr "labels.close")
+                         :on-click on-nav-root
+                         :icon i/close}]]
       [:div {:class (stl/css :login)}
-       [:div {:class (stl/css :logo)} deprecated-icon/logo]
+       [:div {:class (stl/css :logo)}
+        [:> raw-svg*  {:id "penpot-logo"
+                       :class (stl/css :logo-icon)}]]
 
        (case @current-section
          :login
@@ -214,8 +215,10 @@
     [:div {:class (stl/css :overlay)}
      [:div {:class (stl/css :dialog)}
       [:div {:class (stl/css :modal-close)}
-       [:button {:class (stl/css :modal-close-button) :on-click on-close}
-        deprecated-icon/close]]
+       [:> icon-button* {:variant "ghost"
+                         :aria-label (tr "labels.close")
+                         :on-click on-close
+                         :icon i/close}]]
       [:div {:class (stl/css :dialog-title)} title]
       (for [[index content] (d/enumerate content)]
         [:div {:key index} content])
@@ -224,7 +227,7 @@
          [:button {:class (stl/css :cancel-button)
                    :on-click on-close}
           cancel-text])
-       [:button {:on-click on-click} button-text]]]]))
+       [:> button* {:variant "primary" :on-click on-click} button-text]]]]))
 
 (mf/defc request-access*
   [{:keys [file-id team-id is-default is-workspace profile]}]
@@ -317,7 +320,7 @@
      [:div {:class (stl/css :main-message)} (tr "labels.bad-gateway.main-message")]
      [:div {:class (stl/css :desc-message)} (tr "labels.bad-gateway.desc-message")]
      [:div {:class (stl/css :sign-info)}
-      [:button {:on-click handle-retry} (tr "labels.retry")]]]))
+      [:> button* {:variant "primary" :on-click handle-retry} (tr "labels.retry")]]]))
 
 (mf/defc service-unavailable*
   []
@@ -326,7 +329,7 @@
      [:div {:class (stl/css :main-message)} (tr "labels.service-unavailable.main-message")]
      [:div {:class (stl/css :desc-message)} (tr "labels.service-unavailable.desc-message")]
      [:div {:class (stl/css :sign-info)}
-      [:button {:on-click on-click} (tr "labels.retry")]]]))
+      [:> button* {:variant "primary" :on-click on-click} (tr "labels.retry")]]]))
 
 (mf/defc nitrate-unavailable*
   []
@@ -348,53 +351,6 @@
       [:> button* {:variant "primary" :on-click on-reload}
        (tr "labels.reload-page")]]]))
 
-(defn- generate-report
-  [data]
-  (try
-    (let [team-id    (:current-team-id @st/state)
-          profile-id (:profile-id @st/state)
-
-          trace      (:app.main.errors/trace data)
-          instance   (:app.main.errors/instance data)]
-      (with-out-str
-        (println "Hint:    " (or (:hint data) (ex-message instance) "--"))
-        (println "Prof ID: " (str (or profile-id "--")))
-        (println "Team ID: " (str (or team-id "--")))
-        (println "URI:     " cf/public-uri)
-
-        (when-let [file-id (:file-id data)]
-          (println "File ID:" (str file-id)))
-
-        (println)
-
-        (println "Data:")
-        (loop [data data]
-          (-> (d/without-qualified data)
-              (dissoc :explain)
-              (d/update-when :data (constantly "(...)"))
-              (pp/pprint {:level 8 :length 10}))
-
-          (println)
-
-          (when-let [explain (:explain data)]
-            (print explain))
-
-          (when (and (= :server-error (:type data))
-                     (contains? data :data))
-            (recur (:data data))))
-
-        (println "Trace:")
-        (println trace)
-        (println)
-
-        (println "Last events:")
-        (pp/pprint @st/last-events {:length 200})
-
-        (println)))
-    (catch :default cause
-      (.error js/console "error on generating report.txt" cause)
-      nil)))
-
 (mf/defc internal-error*
   [{:keys [on-reset report] :as props}]
   (let [report-uri (mf/use-ref nil)
@@ -521,7 +477,7 @@
      is-workspace
      [:div {:class (stl/css :workspace)}
       [:div {:class (stl/css :workspace-left)}
-       deprecated-icon/logo-icon
+       [:> raw-svg* {:id "penpot-logo-icon"}]
        [:div
         [:div {:class (stl/css :project-name)} (tr "not-found.no-permission.project-name")]
         [:div {:class (stl/css :file-name)} (tr "not-found.no-permission.penpot-file")]]]
diff --git a/frontend/src/app/main/ui/static.scss b/frontend/src/app/main/ui/static.scss
index d1588ffcf0..9f87bd9d3d 100644
--- a/frontend/src/app/main/ui/static.scss
+++ b/frontend/src/app/main/ui/static.scss
@@ -4,18 +4,20 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_borders.scss" as *;
+@use "ds/_sizes.scss" as *;
 @use "./ds/typography.scss" as t;
 
 .exception-layout {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
   background-color: var(--color-background-secondary);
 }
 
 .nitrate-unavailable-layout {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -57,61 +59,45 @@
   color: var(--color-foreground-secondary);
 }
 
-.deco-before,
-.deco-after {
-  position: absolute;
-  left: calc(50% - deprecated.$s-40);
-
-  svg {
-    position: absolute;
-    fill: var(--color-foreground-secondary);
-    height: 1537px;
-    width: deprecated.$s-80;
-  }
-}
-
 .deco-before {
-  height: 34vh;
-  top: 0;
-
-  svg {
-    bottom: 0;
-  }
+  position: absolute;
+  inset-inline-start: calc(50% - $sz-40);
+  block-size: 34vh;
+  inset-block-start: 0;
 }
 
-.deco-after {
-  height: 34vh;
-  bottom: 0;
+// SVG inside deco-before — no class available on the raw element
+.deco-before svg {
+  position: absolute;
+  block-size: 1537px;
+  inline-size: px2rem(80);
+  inset-block-end: 0;
+}
 
-  svg {
-    top: 0;
-  }
+// SVG inside deco-after2 — no class available on the raw element
+.deco-after2 svg {
+  block-size: 1537px;
+  inline-size: px2rem(80);
 }
 
 .deco-after2 {
   display: flex;
   justify-content: center;
-  gap: deprecated.$s-8;
-  width: 100%;
-  height: 34vh;
+  gap: var(--sp-s);
+  inline-size: 100%;
+  block-size: 34vh;
   position: absolute;
-  left: 0;
-  bottom: 0;
+  inset-inline-start: 0;
+  inset-block-end: 0;
   color: var(--color-foreground-primary);
 
-  svg {
-    fill: var(--color-foreground-secondary);
-    height: 1537px;
-    width: deprecated.$s-80;
-  }
-
   span {
     display: flex;
     flex-direction: column;
     justify-content: flex-end;
-    height: 100%;
-    width: 25%;
-    padding-bottom: deprecated.$s-28;
+    block-size: 100%;
+    inline-size: 25%;
+    padding-block-end: px2rem(28);
 
     &:first-child {
       text-align: right;
@@ -121,7 +107,7 @@
 
 .exception-header {
   color: var(--color-foreground-secondary);
-  padding: deprecated.$s-24 deprecated.$s-32;
+  padding: var(--sp-xxl) var(--sp-xxxl);
   position: fixed;
   background: none;
   border: none;
@@ -132,8 +118,8 @@
 
 .penpot-logo {
   fill: var(--color-foreground-primary);
-  width: deprecated.$s-48;
-  height: deprecated.$s-48;
+  inline-size: $sz-48;
+  block-size: $sz-48;
 }
 
 .back-arrow {
@@ -144,38 +130,48 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  gap: deprecated.$s-8;
-  margin-left: deprecated.$s-12;
-  font-size: deprecated.$fs-14;
+  gap: var(--sp-s);
+  margin-inline-start: var(--sp-m);
+  font-size: 0.875rem;
 }
 
 .login-header {
-  @extend %button-primary;
+  @include t.use-typography("headline-small");
 
-  padding: deprecated.$s-8 deprecated.$s-16;
-  font-size: deprecated.$fs-11;
+  background: none;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--color-accent-primary);
+  border: $b-1 solid var(--color-accent-primary);
+  color: var(--color-background-secondary);
+  border-radius: $br-8;
+  min-block-size: $sz-32;
+  padding: var(--sp-s) var(--sp-l);
   position: fixed;
-  right: 0;
-  margin: deprecated.$s-40 deprecated.$s-32;
+  inset-inline-end: 0;
+  margin: $sz-40 $sz-32;
+  text-transform: uppercase;
 }
 
 .exception-content {
   display: flex;
-  height: 100%;
+  block-size: 100%;
   justify-content: center;
-  width: 100%;
+  inline-size: 100%;
+}
 
-  .container {
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-    gap: deprecated.$s-16;
-    height: 34vh;
-    justify-content: center;
-    margin-top: 33vh;
-    text-align: center;
-    width: deprecated.$s-640;
-  }
+.exception-content .container {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  gap: var(--sp-l);
+  block-size: 34vh;
+  justify-content: center;
+  margin-block-start: 33vh;
+  text-align: center;
+  inline-size: px2rem(640);
 }
 
 .main-message {
@@ -206,209 +202,194 @@
 
 .sign-info {
   text-align: center;
-
-  button {
-    @extend %button-primary;
-
-    text-transform: uppercase;
-    padding: deprecated.$s-8 deprecated.$s-16;
-    font-size: deprecated.$fs-11;
-  }
-}
-
-.image {
-  svg {
-    fill: var(--color-foreground-primary);
-  }
 }
 
 .workspace {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
   display: flex;
   justify-content: space-between;
   background-color: var(--color-canvas);
   position: relative;
+}
 
-  .workspace-left,
-  .workspace-right {
-    padding: deprecated.$s-12;
-    width: deprecated.$s-276;
-    height: 100%;
-    background-color: var(--color-background-primary);
-    display: flex;
-    gap: deprecated.$s-4;
+.workspace .workspace-left,
+.workspace .workspace-right {
+  padding: var(--sp-m);
+  inline-size: px2rem(276);
+  block-size: 100%;
+  background-color: var(--color-background-primary);
+  display: flex;
+  gap: var(--sp-xs);
 
-    svg {
-      width: 2rem;
-      height: 2rem;
-      fill: var(--icon-foreground-hover);
-    }
-
-    .project-name {
-      @include deprecated.uppercase-title-typography;
-
-      color: var(--title-foreground-color);
-    }
-
-    .file-name {
-      @include deprecated.small-title-typography;
-
-      text-transform: none;
-      color: var(--title-foreground-color-hover);
-    }
+  svg {
+    inline-size: 2rem;
+    block-size: 2rem;
+    fill: var(--color-foreground-primary);
   }
 }
 
+.workspace .workspace-left .project-name,
+.workspace .workspace-right .project-name {
+  @include t.use-typography("headline-small");
+
+  color: var(--color-foreground-secondary);
+}
+
+.workspace .workspace-left .file-name,
+.workspace .workspace-right .file-name {
+  @include t.use-typography("title-small");
+
+  color: var(--color-foreground-primary);
+  text-transform: none;
+}
+
 .dashboard {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
+}
 
-  .dashboard-sidebar {
-    width: deprecated.$s-300;
-    height: 100%;
-  }
+.dashboard .dashboard-sidebar {
+  inline-size: px2rem(300);
+  block-size: 100%;
 }
 
 .viewer {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
 }
 
+// TODO: `.login-container` appears unused in CLJS — verify before removal
+// .login-container {
+//   inline-size: 100%;
+//   background-color: var(--color-background-error);
+// }
+
 .overlay {
-  width: 100%;
-  height: 100%;
+  inline-size: 100%;
+  block-size: 100%;
   position: absolute;
-  top: 0;
-  left: 0;
+  inset-block-start: 0;
+  inset-inline-start: 0;
   z-index: 100;
   background-color: rgb(0 0 0 / 0.65);
   display: flex;
   justify-content: center;
   align-items: center;
+}
 
-  .dialog,
-  .dialog-login {
-    width: 556px;
-    background-color: var(--color-background-primary);
-    border-radius: deprecated.$s-8;
+.overlay .dialog,
+.overlay .dialog-login {
+  inline-size: 556px;
+  background-color: var(--color-background-primary);
+  border-radius: $br-8;
+  display: flex;
+  flex-direction: column;
+  align-content: stretch;
+  padding: $sz-36;
+  color: var(--color-foreground-secondary);
+  position: relative;
+}
+
+.modal-close {
+  position: absolute;
+  inset-block-start: $sz-16;
+  inset-inline-end: $sz-16;
+}
+
+.overlay .dialog .dialog-title,
+.overlay .dialog-login .dialog-title {
+  font-size: 1.25rem;
+}
+
+.overlay .dialog .sign-info,
+.overlay .dialog-login .sign-info {
+  display: flex;
+  justify-content: flex-end;
+  margin-block-start: var(--sp-xxxl);
+}
+
+.overlay .dialog .sign-info,
+.overlay .dialog-login .sign-info {
+  .cancel-button {
+    background: none;
+    cursor: pointer;
     display: flex;
-    flex-direction: column;
-    align-content: stretch;
-    padding: deprecated.$s-36;
-    color: var(--modal-text-foreground-color);
-
-    .modal-close {
-      text-align: right;
-
-      .modal-close-button {
-        background: none;
-        border: none;
-        cursor: pointer;
-
-        svg {
-          cursor: pointer;
-          width: deprecated.$s-24;
-          height: deprecated.$s-24;
-          fill: var(--modal-text-foreground-color);
-          stroke: var(--modal-text-foreground-color);
-        }
-      }
-    }
-
-    .dialog-title {
-      font-size: deprecated.$fs-20;
-    }
-
-    .sign-info {
-      display: flex;
-      justify-content: flex-end;
-      margin-top: deprecated.$s-32;
-
-      button {
-        @extend %button-primary;
-
-        text-transform: uppercase;
-        padding: deprecated.$s-8 deprecated.$s-16;
-        font-size: deprecated.$fs-11;
-      }
-
-      .cancel-button {
-        @extend %button-secondary;
-
-        text-transform: uppercase;
-        padding: deprecated.$s-8 deprecated.$s-16;
-        font-size: deprecated.$fs-11;
-        margin-right: deprecated.$s-16;
-      }
-    }
-  }
-
-  .dialog {
-    gap: deprecated.$s-12;
-  }
-
-  .login {
-    gap: 0;
-    padding: 0 deprecated.$s-36 deprecated.$s-72 deprecated.$s-36;
-
-    .logo {
-      margin-bottom: deprecated.$s-40;
-
-      svg {
-        fill: var(--color-foreground-primary);
-        width: deprecated.$s-120;
-        height: deprecated.$s-40;
-      }
-    }
-
-    .logo-title {
-      font-size: deprecated.$fs-20;
-      color: var(--title-foreground-color-hover);
-      margin-bottom: deprecated.$s-4;
-    }
-
-    .logo-subtitle {
-      font-size: deprecated.$fs-14;
-      color: var(--title-foreground-color-hover);
-      margin-bottom: deprecated.$s-24;
-    }
-
-    .change-section {
-      width: 100%;
-      text-align: center;
-
-      a {
-        color: var(--link-foreground-color);
-      }
-    }
-
-    hr {
-      margin: deprecated.$s-20 0;
-      border-top: solid deprecated.$s-1 var(--modal-separator-background-color);
-    }
-
-    .separator {
-      margin: deprecated.$s-20 0;
-    }
-
-    form {
-      div {
-        margin-bottom: deprecated.$s-8;
-      }
-    }
+    justify-content: center;
+    align-items: center;
+    border-radius: $br-8;
+    background-color: var(--color-background-tertiary);
+    border: $b-1 solid var(--color-background-tertiary);
+    color: var(--color-foreground-secondary);
+    padding: var(--sp-s) var(--sp-l);
+    font-size: 0.688rem;
+    text-transform: uppercase;
+    margin-inline-end: var(--sp-l);
   }
 }
 
-.login-container {
-  width: 100%;
-  background-color: var(--color-background-error);
+.overlay .dialog {
+  gap: var(--sp-m);
+}
+
+.overlay .login {
+  gap: 0;
+  padding: 0 var(--sp-l) px2rem(72) var(--sp-l);
+}
+
+.overlay .login .logo {
+  margin-block-end: $sz-40;
+}
+
+.logo-icon {
+  fill: var(--color-foreground-primary);
+  inline-size: $sz-120;
+  block-size: $sz-40;
+}
+
+.overlay .login .logo-title {
+  font-size: 1.25rem;
+  color: var(--color-foreground-primary);
+  margin-block-end: var(--sp-xs);
+}
+
+.overlay .login .logo-subtitle {
+  font-size: 0.875rem;
+  color: var(--color-foreground-primary);
+  margin-block-end: var(--sp-xxl);
+}
+
+.overlay .login .change-section {
+  inline-size: 100%;
+  text-align: center;
+
+  // Native <a> inside change-section — no class available
+  a {
+    color: var(--color-accent-primary);
+  }
+}
+
+// Native <hr> inside login — no class available
+.overlay .login hr {
+  margin: var(--sp-xl) 0;
+  border-block-start: solid $b-1 solid var(--color-background-quaternary);
+}
+
+.overlay .login .separator {
+  margin: var(--sp-xl) 0;
+}
+
+// Native <form> and <div> inside login — no class available
+.overlay .login form {
+  div {
+    margin-block-end: var(--sp-s);
+  }
 }
 
 .buttons-container {
   display: flex;
-
-  .retry-btn {
-    margin-inline-start: var(--sp-xxl);
-  }
+}
+
+.buttons-container .retry-btn {
+  margin-inline-start: var(--sp-xxl);
 }
diff --git a/frontend/src/app/main/ui/viewer.cljs b/frontend/src/app/main/ui/viewer.cljs
index 2f997ac7ee..b1ae49b3b6 100644
--- a/frontend/src/app/main/ui/viewer.cljs
+++ b/frontend/src/app/main/ui/viewer.cljs
@@ -406,7 +406,7 @@
            (when (not (dom/fullscreen?))
              (st/emit! (dv/exit-fullscreen)))))]
 
-    (hooks/use-shortcuts ::viewer sc/shortcuts)
+    (hooks/use-shortcuts ::viewer sc/shortcuts :viewer)
     (when (nil? page)
       (ex/raise :type :not-found))
 
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index 5aa885e9a9..278663bbcb 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -47,7 +47,6 @@
    [app.main.ui.workspace.webgl-unavailable-modal]
    [app.util.debug :as dbg]
    [app.util.dom :as dom]
-   [app.util.globals :as globals]
    [app.util.i18n :as i18n :refer [tr]]
    [goog.events :as events]
    [okulary.core :as l]
@@ -180,7 +179,7 @@
 
     (mf/with-effect []
       (let [focus-out #(st/emit! (dw/workspace-focus-lost))
-            key       (events/listen globals/window "blur" focus-out)]
+            key       (events/listen js/window "blur" focus-out)]
         (partial events/unlistenByKey key)))
 
     (mf/with-effect [file-id page-id]
@@ -262,7 +261,7 @@
       (let [handle-wasm-render
             (fn [_]
               (reset! first-frame-rendered? true))
-            listener-key (events/listen globals/document "penpot:wasm:render" handle-wasm-render)]
+            listener-key (events/listen js/document "penpot:wasm:render" handle-wasm-render)]
         (fn []
           (events/unlistenByKey listener-key))))
 
diff --git a/frontend/src/app/main/ui/workspace.scss b/frontend/src/app/main/ui/workspace.scss
index 6eeeac9bc9..c0630368b8 100644
--- a/frontend/src/app/main/ui/workspace.scss
+++ b/frontend/src/app/main/ui/workspace.scss
@@ -4,14 +4,16 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/mixins.scss" as *;
 
 .workspace {
-  @extend %new-scrollbar;
+  @include custom-scrollbar($include-selection: false, $include-placeholder: false);
 
-  width: 100vw;
-  height: 100vh;
-  max-height: 100vh;
+  inline-size: 100vw;
+  block-size: 100vh;
+  max-block-size: 100vh;
   user-select: none;
   display: grid;
   grid-template: "left-sidebar viewport right-sidebar" 1fr / auto 1fr auto;
@@ -34,19 +36,19 @@
 }
 
 .history-debug-overlay {
-  bottom: 0;
-  max-height: deprecated.$s-500;
-  width: deprecated.$s-500;
+  inset-block-end: 0;
+  max-block-size: $sz-500;
+  inline-size: $sz-500;
   overflow-y: auto;
   position: absolute;
-  z-index: deprecated.$z-index-modal;
+  z-index: var(--z-index-set);
 }
 
 .workspace-viewport {
   overflow: hidden;
   transition: none;
   display: grid;
-  grid-template-rows: deprecated.$s-20 1fr;
-  grid-template-columns: deprecated.$s-20 1fr;
+  grid-template-rows: px2rem(20) 1fr;
+  grid-template-columns: px2rem(20) 1fr;
   flex: 1;
 }
diff --git a/frontend/src/app/main/ui/workspace/colorpicker.cljs b/frontend/src/app/main/ui/workspace/colorpicker.cljs
index c886629871..0498e2d656 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker.cljs
@@ -489,7 +489,7 @@
                (tr "media.choose-image")
                [:& file-uploader
                 {:input-id "fill-image-upload"
-                 :accept "image/jpeg,image/png"
+                 :accept dwm/accept-image-types
                  :multi false
                  :ref fill-image-ref
                  :on-selected on-fill-image-selected}]]])
@@ -607,7 +607,7 @@
              :top top-offset
              :maxHeight max-height-top}))))
 
-(defn- group-sets
+(defn group-sets
   "Groups sets by their parent path (everything before the last '/') if present.
    The set name is always the last part of the path.
 
@@ -777,6 +777,10 @@
         (mf/with-memo [tokens-lib active-sets-names color-tokens]
           (some-> tokens-lib
                   (ctob/get-sets)
+                  ;; Show highest-precedence (last-defined) sets first in the
+                  ;; picker; the Tokens panel itself keeps definition order.
+                  ;; https://github.com/penpot/penpot/issues/10552
+                  (reverse)
                   (add-tokens-to-sets)
                   (filter-active-sets active-sets-names)
                   (filter-non-empty-sets)
@@ -784,7 +788,7 @@
                   (combine-groups-with-resolved  color-tokens)))]
 
     (mf/with-effect []
-      (st/emit! (st/emit! (dsc/push-shortcuts ::colorpicker sc/shortcuts)))
+      (st/emit! (st/emit! (dsc/push-shortcuts ::colorpicker sc/shortcuts :workspace)))
       (fn []
         (st/emit! (dsc/pop-shortcuts ::colorpicker))
         (when (and @dirty? @last-change on-close)
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/color_tokens.cljs b/frontend/src/app/main/ui/workspace/colorpicker/color_tokens.cljs
index 01079db8ee..56042f6285 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/color_tokens.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/color_tokens.cljs
@@ -17,11 +17,13 @@
    [app.main.data.workspace.tokens.library-edit :as dwtl]
    [app.main.refs :as refs]
    [app.main.store :as st]
+   [app.main.ui.context :as ctx]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
    [app.main.ui.ds.controls.input :refer [input*]]
    [app.main.ui.ds.foundations.assets.icon :as i]
    [app.main.ui.ds.tooltip :refer [tooltip*]]
    [app.main.ui.ds.utilities.swatch :refer [swatch*]]
+   [app.main.ui.hooks :as hooks]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [cuerdas.core :as str]
@@ -267,31 +269,39 @@
 
 (mf/defc token-section*
   {}
-  [{:keys [combined-tokens color-origin on-token-change applied-token] :rest props}]
-  (let [sets (set (mapv label-group-or-set combined-tokens))
-        filter-term* (mf/use-state "")
-        filter-term (deref filter-term*)
-        open-sets* (mf/use-state sets)
-        open-sets  (deref open-sets*)
+  [{:keys [combined-tokens color-origin on-token-change applied-token]}]
+  (let [filter-term* (mf/use-state "")
+        filter-term  (deref filter-term*)
+
+        file-id      (mf/use-ctx ctx/current-file-id)
+
+        collapsed-sets* (hooks/use-persisted-state ::collapsed-sets {})
+        collapsed-sets  (get (deref collapsed-sets*) file-id #{})
 
         toggle-sets-open
         (mf/use-fn
-         (mf/deps open-sets)
+         (mf/deps collapsed-sets file-id)
          (fn [name]
-           (if (contains? open-sets name)
-             (swap! open-sets* disj name)
-             (swap! open-sets* conj name))))
+           (swap! collapsed-sets*
+                  (fn [m]
+                    (let [current (get m file-id #{})]
+                      (if (contains? current name)
+                        (update m file-id disj name)
+                        (update m file-id (fnil conj #{}) name)))))))
 
         on-filter-tokens
         (mf/use-fn
-         (mf/deps filter-term)
+         (mf/deps filter-term file-id)
          (fn [event]
-           (let [value (-> event (dom/get-target)
+           (let [value (-> event
+                           (dom/get-target)
                            (dom/get-value))]
              (reset! filter-term* value)
-             (reset! open-sets* sets))))
+             (swap! collapsed-sets* assoc file-id #{}))))
+
         filtered-combined (filter-combined-tokens combined-tokens filter-term)
         sorted-tokens     (sort-combined-tokens filtered-combined)]
+
     (if (seq combined-tokens)
       [:div {:class (stl/css :color-tokens-section)}
        [:> input* {:placeholder (tr "workspace.tokens.search-by-token")
@@ -306,7 +316,7 @@
           (for [combined-sets sorted-tokens]
             (let  [name (label-group-or-set combined-sets)]
               [:> set-section*
-               {:collapsed (not (contains?  open-sets name))
+               {:collapsed (contains? collapsed-sets name)
                 :key (str "set-" name)
                 :toggle-sets-open toggle-sets-open
                 :color-origin color-origin
@@ -316,4 +326,3 @@
                 :group-or-set combined-sets}]))]
          [:> token-empty-state*])]
       [:> token-empty-state*])))
-
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/gradients.cljs b/frontend/src/app/main/ui/workspace/colorpicker/gradients.cljs
index ff8b733433..7d1c7f14cc 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/gradients.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/gradients.cljs
@@ -233,6 +233,7 @@
          (mf/deps on-add-stop-preview)
          (fn [^js e]
            (let [offset (-> (event->offset e)
+                            (mth/clamp 0 1)
                             (mth/precision 2))]
              (when on-add-stop-preview
                (on-add-stop-preview offset)))))
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
index 0de95be8ff..5e01c95785 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
@@ -108,7 +108,8 @@
              gradient-text]])
 
          image
-         [:span (tr "media.image")]
+         [:span {:class (stl/css :color-row-colorpicker-label)}
+          (:name image)]
 
          color
          (if name
@@ -124,7 +125,8 @@
                opacity-text])])
 
          :else
-         [:span (tr "labels.other")])]]]))
+         [:span {:class (stl/css :color-row-colorpicker-label)}
+          (tr "labels.other")])]]]))
 
 ;; ---------------------------------------------------------------------------
 ;; Grouped color list
diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index d79a194163..bd2758a02c 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -56,9 +56,14 @@
 
 (mf/defc menu-entry*
   {::mf/private true}
-  [{:keys [title shortcut on-click on-pointer-enter on-pointer-leave
+  [{:keys [title shortcut shortcut-key on-click on-pointer-enter on-pointer-leave
            on-unmount children is-selected icon disabled value]}]
-  (let [submenu-ref (mf/use-ref nil)
+  (let [cs              (mf/deref refs/custom-shortcuts)
+        customized?     (and shortcut-key
+                             (let [c (get-in cs [:workspace shortcut-key])]
+                               (and c (not= c ""))))
+
+        submenu-ref (mf/use-ref nil)
         hovering?   (mf/use-ref false)
 
         on-click'
@@ -101,7 +106,7 @@
      (constantly on-unmount))
 
     (if icon
-      [:li {:class (stl/css :icon-menu-item)
+      [:li {:class (stl/css :menu-item-icon)
             :disabled disabled
             :data-value value
             :ref set-dom-node
@@ -109,33 +114,36 @@
             :on-pointer-enter on-pointer-enter
             :on-pointer-leave on-pointer-leave}
        [:span
-        {:class (stl/css :icon-wrapper)}
-        (if is-selected [:span {:class (stl/css :selected-icon)}
-                         [:> icon* {:icon-id i/tick :size "s"}]]
-            [:span {:class (stl/css :selected-icon)}])
-        [:span {:class (stl/css :shape-icon)}
+        {:class (stl/css :menu-item-icon-group)}
+        (if is-selected
+          [:span {:class (stl/css :icon)}
+           [:> icon* {:icon-id i/tick :size "s"}]]
+          [:span {:class (stl/css :icon)}])
+        [:span {:class (stl/css :icon)}
          [:> icon* {:icon-id icon :size "s"}]]]
-       [:span {:class (stl/css :title)} title]]
-      [:li {:class (stl/css :context-menu-item)
+       [:span {:class (stl/css :menu-item-title)} title]]
+
+      [:li {:class (stl/css :menu-item)
             :disabled disabled
             :ref set-dom-node
             :data-value value
             :on-click on-click'
             :on-pointer-enter on-pointer-enter
             :on-pointer-leave on-pointer-leave}
-       [:span {:class (stl/css :title)} title]
+       [:span {:class (stl/css :menu-item-title)} title]
        (when shortcut
          [:span   {:class (stl/css :shortcut)}
           (for [[idx sc] (d/enumerate (scd/split-sc shortcut))]
             [:span {:key (dm/str shortcut "-" idx)
-                    :class (stl/css :shortcut-key)} sc])])
+                    :class (stl/css-case :shortcut-key true
+                                         :customized-key customized?)} sc])])
 
        (when (> (count children) 1)
-         [:span {:class (stl/css :submenu-icon)}
+         [:span {:class (stl/css :icon)}
           [:> icon* {:icon-id i/arrow :size "s"}]])
 
        (when (> (count children) 1)
-         [:ul {:class (stl/css :workspace-context-submenu)
+         [:ul {:class (stl/css :submenu)
                :ref submenu-ref
                :style {:display "none" :left 250}
                :on-context-menu prevent-default}
@@ -149,7 +157,10 @@
 (mf/defc context-menu-edit*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [multiple?         (> (count shapes) 1)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        multiple?         (> (count shapes) 1)
 
         do-copy           #(st/emit! (dw/copy-selected))
         do-copy-link      #(st/emit! (dw/copy-link-to-clipboard))
@@ -163,28 +174,35 @@
         enabled-paste-props* (mf/use-state false)
 
         handle-copy-css
-        (mf/use-callback #(st/emit! (dw/copy-selected-css)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-selected-css)))
 
         handle-copy-css-nested
-        (mf/use-callback #(st/emit! (dw/copy-selected-css-nested)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-selected-css-nested)))
 
         handle-copy-props
-        (mf/use-callback #(st/emit! (dw/copy-selected-props)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-selected-props)))
 
         handle-paste-props
-        (mf/use-callback #(st/emit! (dw/paste-selected-props)))
+        (mf/use-fn
+         #(st/emit! (dw/paste-selected-props)))
 
         handle-copy-svg
-        (mf/use-callback #(st/emit! (dw/copy-selected-svg)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-selected-svg)))
 
         handle-copy-text
-        (mf/use-callback #(st/emit! (dw/copy-selected-text)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-selected-text)))
 
         handle-copy-as-image
-        (mf/use-callback #(st/emit! (dw/copy-as-image)))
+        (mf/use-fn
+         #(st/emit! (dw/copy-as-image)))
 
         handle-hover-copy-paste
-        (mf/use-callback
+        (mf/use-fn
          (fn []
            (->> (clipboard/from-navigator)
                 (rx/mapcat #(.text %))
@@ -207,19 +225,24 @@
        [:> menu-entry* {:title (tr "workspace.shape.menu.copy-id")
                         :on-click do-copy-id}])
      [:> menu-entry* {:title (tr "workspace.shape.menu.copy")
-                      :shortcut (sc/get-tooltip :copy)
+                      :shortcut (get-tt :copy)
+                      :shortcut-key :copy
                       :on-click do-copy}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.copy-link")
-                      :shortcut (sc/get-tooltip :copy-link)
+                      :shortcut (get-tt :copy-link)
+                      :shortcut-key :copy-link
                       :on-click do-copy-link}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.cut")
-                      :shortcut (sc/get-tooltip :cut)
+                      :shortcut (get-tt :cut)
+                      :shortcut-key :cut
                       :on-click do-cut}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.paste")
-                      :shortcut (sc/get-tooltip :paste)
+                      :shortcut (get-tt :paste)
+                      :shortcut-key :paste
                       :on-click do-paste}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.duplicate")
-                      :shortcut (sc/get-tooltip :duplicate)
+                      :shortcut (get-tt :duplicate)
+                      :shortcut-key :duplicate
                       :on-click do-duplicate}]
 
      [:> menu-entry* {:title (tr "workspace.shape.menu.copy-paste-as")
@@ -242,11 +265,13 @@
                        :on-click handle-copy-text}]
 
       [:> menu-entry* {:title (tr "workspace.shape.menu.copy-props")
-                       :shortcut (sc/get-tooltip :copy-props)
+                       :shortcut (get-tt :copy-props)
+                       :shortcut-key :copy-props
                        :disabled multiple?
                        :on-click handle-copy-props}]
       [:> menu-entry* {:title (tr "workspace.shape.menu.paste-props")
-                       :shortcut (sc/get-tooltip :paste-props)
+                       :shortcut (get-tt :paste-props)
+                       :shortcut-key :paste-props
                        :disabled (and (cf/check-browser? :chrome) (not @enabled-paste-props*))
                        :on-click handle-paste-props}]]
 
@@ -255,7 +280,10 @@
 (mf/defc context-menu-layer-position*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [do-bring-forward  (mf/use-fn #(st/emit! (dw/vertical-order-selected :up)))
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        do-bring-forward  (mf/use-fn #(st/emit! (dw/vertical-order-selected :up)))
         do-bring-to-front (mf/use-fn #(st/emit! (dw/vertical-order-selected :top)))
         do-send-backward  (mf/use-fn #(st/emit! (dw/vertical-order-selected :down)))
         do-send-to-back   (mf/use-fn #(st/emit! (dw/vertical-order-selected :bottom)))
@@ -284,16 +312,20 @@
                            :on-unmount (on-unmount (:id object))
                            :icon (usi/get-shape-icon object)}])])
      [:> menu-entry* {:title (tr "workspace.shape.menu.forward")
-                      :shortcut (sc/get-tooltip :bring-forward)
+                      :shortcut (get-tt :bring-forward)
+                      :shortcut-key :bring-forward
                       :on-click do-bring-forward}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.front")
-                      :shortcut (sc/get-tooltip :bring-front)
+                      :shortcut (get-tt :bring-front)
+                      :shortcut-key :bring-front
                       :on-click do-bring-to-front}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.backward")
-                      :shortcut (sc/get-tooltip :bring-backward)
+                      :shortcut (get-tt :bring-backward)
+                      :shortcut-key :bring-backward
                       :on-click do-send-backward}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.back")
-                      :shortcut (sc/get-tooltip :bring-back)
+                      :shortcut (get-tt :bring-back)
+                      :shortcut-key :bring-back
                       :on-click do-send-to-back}]
 
      [:> menu-separator* {}]]))
@@ -301,22 +333,30 @@
 (mf/defc context-menu-flip*
   {::mf/private true}
   []
-  (let [do-flip-vertical #(st/emit! (dw/flip-vertical-selected))
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        do-flip-vertical #(st/emit! (dw/flip-vertical-selected))
         do-flip-horizontal #(st/emit! (dw/flip-horizontal-selected))]
     [:*
      [:> menu-entry* {:title (tr "workspace.shape.menu.flip-vertical")
-                      :shortcut (sc/get-tooltip :flip-vertical)
+                      :shortcut (get-tt :flip-vertical)
+                      :shortcut-key :flip-vertical
                       :on-click do-flip-vertical}]
 
      [:> menu-entry* {:title (tr "workspace.shape.menu.flip-horizontal")
-                      :shortcut (sc/get-tooltip :flip-horizontal)
+                      :shortcut (get-tt :flip-horizontal)
+                      :shortcut-key :flip-horizontal
                       :on-click do-flip-horizontal}]
      [:> menu-separator* {}]]))
 
 (mf/defc context-menu-thumbnail*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [single?    (= (count shapes) 1)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        single?    (= (count shapes) 1)
         has-frame? (some cfh/frame-shape? shapes)
         do-toggle-thumbnail #(st/emit! (dw/toggle-file-thumbnail-selected))]
     (when (and single? has-frame?)
@@ -325,25 +365,33 @@
          [:> menu-entry* {:title (tr "workspace.shape.menu.thumbnail-remove")
                           :on-click do-toggle-thumbnail}]
          [:> menu-entry* {:title (tr "workspace.shape.menu.thumbnail-set")
-                          :shortcut (sc/get-tooltip :thumbnail-set)
+                          :shortcut (get-tt :thumbnail-set)
+                          :shortcut-key :thumbnail-set
                           :on-click do-toggle-thumbnail}])
        [:> menu-separator* {}]])))
 
 (mf/defc context-menu-rename*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [do-rename #(st/emit! (dw/start-rename-selected))]
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        do-rename #(st/emit! (dw/start-rename-selected))]
     (when (= (count shapes) 1)
       [:*
        [:> menu-separator* {}]
        [:> menu-entry* {:title (tr "workspace.shape.menu.rename")
-                        :shortcut (sc/get-tooltip :rename)
+                        :shortcut (get-tt :rename)
+                        :shortcut-key :rename
                         :on-click do-rename}]])))
 
 (mf/defc context-menu-group*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [multiple?       (> (count shapes) 1)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        multiple?       (> (count shapes) 1)
         single?         (= (count shapes) 1)
 
         objects         (deref refs/workspace-page-objects)
@@ -371,44 +419,56 @@
        [:*
         (when (or has-bool? has-group? has-mask? has-frame?)
           [:> menu-entry* {:title (tr "workspace.shape.menu.ungroup")
-                           :shortcut (sc/get-tooltip :ungroup)
+                           :shortcut (get-tt :ungroup)
+                           :shortcut-key :ungroup
                            :on-click do-remove-group}])
 
         [:> menu-entry* {:title (tr "workspace.shape.menu.group")
-                         :shortcut (sc/get-tooltip :group)
+                         :shortcut (get-tt :group)
+                         :shortcut-key :group
                          :on-click do-create-group}]
 
         (when (or multiple? (and is-group? (not has-mask?)) is-bool?)
           [:> menu-entry* {:title (tr "workspace.shape.menu.mask")
-                           :shortcut (sc/get-tooltip :mask)
+                           :shortcut (get-tt :mask)
+                           :shortcut-key :mask
                            :on-click do-mask-group}])
 
         (when has-mask?
           [:> menu-entry* {:title (tr "workspace.shape.menu.unmask")
-                           :shortcut (sc/get-tooltip :unmask)
+                           :shortcut (get-tt :unmask)
+                           :shortcut-key :unmask
                            :on-click do-unmask-group}])
 
         [:> menu-entry* {:title (tr "workspace.shape.menu.create-artboard-from-selection")
-                         :shortcut (sc/get-tooltip :artboard-selection)
+                         :shortcut (get-tt :artboard-selection)
+                         :shortcut-key :artboard-selection
                          :on-click do-create-artboard-from-selection}]
         [:> menu-separator* {}]])]))
 
 (mf/defc context-focus-mode-menu*
   {::mf/private true}
   []
-  (let [focus (mf/deref refs/workspace-focus-selected)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        focus (mf/deref refs/workspace-focus-selected)
         do-toggle-focus-mode #(st/emit! (dw/toggle-focus-mode))]
 
     [:> menu-entry* {:title (if (empty? focus)
                               (tr "workspace.focus.focus-on")
                               (tr "workspace.focus.focus-off"))
-                     :shortcut (sc/get-tooltip :toggle-focus-mode)
+                     :shortcut (get-tt :toggle-focus-mode)
+                     :shortcut-key :toggle-focus-mode
                      :on-click do-toggle-focus-mode}]))
 
 (mf/defc context-menu-path*
   {::mf/private true}
   [{:keys [shapes objects disable-flatten disable-booleans]}]
-  (let [multiple?            (> (count shapes) 1)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        multiple?            (> (count shapes) 1)
         single?              (= (count shapes) 1)
 
         has-group?           (->> shapes (d/seek cfh/group-shape?))
@@ -446,7 +506,8 @@
     [:*
      (when (and single? (not is-frame?))
        [:> menu-entry* {:title (tr "workspace.shape.menu.edit")
-                        :shortcut (sc/get-tooltip :start-editing)
+                        :shortcut (get-tt :start-editing)
+                        :shortcut-key :start-editing
                         :on-click do-start-editing}])
 
      (when-not (or disable-flatten has-frame? has-path?)
@@ -464,16 +525,20 @@
                 (or multiple? (and single? (or is-group? is-bool?))))
        [:> menu-entry* {:title (tr "workspace.shape.menu.path")}
         [:> menu-entry* {:title (tr "workspace.shape.menu.union")
-                         :shortcut (sc/get-tooltip :bool-union)
+                         :shortcut (get-tt :bool-union)
+                         :shortcut-key :bool-union
                          :on-click (make-do-bool :union)}]
         [:> menu-entry* {:title (tr "workspace.shape.menu.difference")
-                         :shortcut (sc/get-tooltip :bool-difference)
+                         :shortcut (get-tt :bool-difference)
+                         :shortcut-key :bool-difference
                          :on-click (make-do-bool :difference)}]
         [:> menu-entry* {:title (tr "workspace.shape.menu.intersection")
-                         :shortcut (sc/get-tooltip :bool-intersection)
+                         :shortcut (get-tt :bool-intersection)
+                         :shortcut-key :bool-intersection
                          :on-click (make-do-bool :intersection)}]
         [:> menu-entry* {:title (tr "workspace.shape.menu.exclude")
-                         :shortcut (sc/get-tooltip :bool-exclude)
+                         :shortcut (get-tt :bool-exclude)
+                         :shortcut-key :bool-exclude
                          :on-click (make-do-bool :exclude)}]
 
         (when (and single? is-bool? (not disable-flatten))
@@ -485,7 +550,10 @@
 (mf/defc context-menu-layer-options*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [ids (mapv :id shapes)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        ids (mapv :id shapes)
         do-show-shape #(st/emit! (dw/update-shape-flags ids {:hidden false}))
         do-hide-shape #(st/emit! (dw/update-shape-flags ids {:hidden true}))
         do-lock-shape #(st/emit! (dw/update-shape-flags ids {:blocked true}))
@@ -493,18 +561,22 @@
     [:*
      (if (every? :hidden shapes)
        [:> menu-entry* {:title (tr "workspace.shape.menu.show")
-                        :shortcut (sc/get-tooltip :toggle-visibility)
+                        :shortcut (get-tt :toggle-visibility)
+                        :shortcut-key :toggle-visibility
                         :on-click do-show-shape}]
        [:> menu-entry* {:title (tr "workspace.shape.menu.hide")
-                        :shortcut (sc/get-tooltip :toggle-visibility)
+                        :shortcut (get-tt :toggle-visibility)
+                        :shortcut-key :toggle-visibility
                         :on-click do-hide-shape}])
 
      (if (every? :blocked shapes)
        [:> menu-entry* {:title (tr "workspace.shape.menu.unlock")
-                        :shortcut (sc/get-tooltip :toggle-lock)
+                        :shortcut (get-tt :toggle-lock)
+                        :shortcut-key :toggle-lock
                         :on-click do-unlock-shape}]
        [:> menu-entry* {:title (tr "workspace.shape.menu.lock")
-                        :shortcut (sc/get-tooltip :toggle-lock)
+                        :shortcut (get-tt :toggle-lock)
+                        :shortcut-key :toggle-lock
                         :on-click do-lock-shape}])]))
 
 (mf/defc context-menu-prototype*
@@ -531,7 +603,10 @@
 (mf/defc context-menu-layout*
   {::mf/private true}
   [{:keys [shapes]}]
-  (let [single?      (= (count shapes) 1)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        single?      (= (count shapes) 1)
         objects      (deref refs/workspace-page-objects)
         any-in-copy? (some true? (map #(ctn/has-any-copy-parent? objects %) shapes))
 
@@ -566,28 +641,35 @@
           [:> menu-separator* {}]
           (if has-flex?
             [:> menu-entry* {:title (tr "workspace.shape.menu.remove-flex")
-                             :shortcut (sc/get-tooltip :toggle-layout-flex)
+                             :shortcut (get-tt :toggle-layout-flex)
+                             :shortcut-key :toggle-layout-flex
                              :on-click on-remove-layout}]
             [:> menu-entry* {:title (tr "workspace.shape.menu.remove-grid")
-                             :shortcut (sc/get-tooltip :toggle-layout-grid)
+                             :shortcut (get-tt :toggle-layout-grid)
+                             :shortcut-key :toggle-layout-grid
                              :on-click on-remove-layout}])]
 
          (when (or single? (not any-is-variant?))
            [:div
             [:> menu-separator* {}]
             [:> menu-entry* {:title (tr "workspace.shape.menu.add-flex")
-                             :shortcut (sc/get-tooltip :toggle-layout-flex)
+                             :shortcut (get-tt :toggle-layout-flex)
+                             :shortcut-key :toggle-layout-flex
                              :value "flex"
                              :on-click on-add-layout}]
             [:> menu-entry* {:title (tr "workspace.shape.menu.add-grid")
-                             :shortcut (sc/get-tooltip :toggle-layout-grid)
+                             :shortcut (get-tt :toggle-layout-grid)
+                             :shortcut-key :toggle-layout-grid
                              :value "grid"
                              :on-click on-add-layout}]])))]))
 
 (mf/defc context-menu-component*
   {:mf/private true}
   [{:keys [shapes]}]
-  (let [single?                    (= (count shapes) 1)
+  (let [custom-shortcuts           (mf/deref refs/custom-shortcuts)
+        get-tt                     #(sc/get-effective-tooltip % custom-shortcuts)
+
+        single?                    (= (count shapes) 1)
         objects                    (deref refs/workspace-page-objects)
         can-make-component         (every? true? (map #(ctn/valid-shape-for-component? objects %) shapes))
         components-menu-entries    (cmm/generate-components-menu-entries shapes)
@@ -609,7 +691,8 @@
         [:> menu-separator* {}]
 
         [:> menu-entry* {:title (tr "workspace.shape.menu.create-component")
-                         :shortcut (sc/get-tooltip :create-component-variant)
+                         :shortcut (get-tt :create-component-variant)
+                         :shortcut-key :create-component-variant
                          :on-click do-add-component}]
         (when (not single?)
           [:> menu-entry* {:title (tr "workspace.shape.menu.create-multiple-components")
@@ -619,17 +702,19 @@
        [:*
         [:> menu-separator*]
         (for [entry (filter some? components-menu-entries)]
-          [:> menu-entry* {:key (:title entry)
-                           :title (:title entry)
-                           :shortcut (when (contains? entry :shortcut)
-                                       (sc/get-tooltip (:shortcut entry)))
-                           :on-click (:action entry)}])])
+          (let [sc-key (:shortcut entry)]
+            [:> menu-entry* {:key (:title entry)
+                             :title (:title entry)
+                             :shortcut (when sc-key (get-tt sc-key))
+                             :shortcut-key sc-key
+                             :on-click (:action entry)}]))])
 
      (when variant-container?
        [:*
         [:> menu-separator*]
         [:> menu-entry* {:title (tr "workspace.shape.menu.add-variant")
-                         :shortcut (sc/get-tooltip :create-component-variant)
+                         :shortcut (get-tt :create-component-variant)
+                         :shortcut-key :create-component-variant
                          :on-click do-add-variant}]])
 
      (when (and (not single?) all-main? (not any-variant?))
@@ -660,11 +745,15 @@
 (mf/defc context-menu-delete*
   {::mf/private true}
   []
-  (let [do-delete #(st/emit! (dw/delete-selected))]
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        do-delete #(st/emit! (dw/delete-selected))]
     [:*
      [:> menu-separator* {}]
      [:> menu-entry* {:title (tr "workspace.shape.menu.delete")
-                      :shortcut (sc/get-tooltip :delete)
+                      :shortcut (get-tt :delete)
+                      :shortcut-key :delete
                       :on-click do-delete}]]))
 
 (mf/defc shape-context-menu*
@@ -742,7 +831,10 @@
 
 (mf/defc viewport-context-menu*
   []
-  (let [focus      (mf/deref refs/workspace-focus-selected)
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
+
+        focus      (mf/deref refs/workspace-focus-selected)
         read-only? (mf/use-ctx ctx/workspace-read-only?)
         do-paste   #(st/emit! (dw/paste-from-clipboard))
         do-hide-ui #(st/emit! (-> (dw/toggle-layout-flag :hide-ui)
@@ -751,15 +843,18 @@
     [:*
      (when-not ^boolean read-only?
        [:> menu-entry* {:title (tr "workspace.shape.menu.paste")
-                        :shortcut (sc/get-tooltip :paste)
+                        :shortcut (get-tt :paste)
+                        :shortcut-key :paste
                         :on-click do-paste}])
      [:> menu-entry* {:title (tr "workspace.shape.menu.hide-ui")
-                      :shortcut (sc/get-tooltip :hide-ui)
+                      :shortcut (get-tt :hide-ui)
+                      :shortcut-key :hide-ui
                       :on-click do-hide-ui}]
 
      (when (d/not-empty? focus)
        [:> menu-entry* {:title (tr "workspace.focus.focus-off")
-                        :shortcut (sc/get-tooltip :toggle-focus-mode)
+                        :shortcut (get-tt :toggle-focus-mode)
+                        :shortcut-key :toggle-focus-mode
                         :on-click do-toggle-focus-mode}])]))
 
 (mf/defc grid-track-context-menu*
@@ -925,8 +1020,8 @@
                      (dwg/remove-guide guide))))]
 
     [:*
-     [:li {:class (stl/css :context-menu-item :guide-color-label)}
-      [:span {:class (stl/css :title)}
+     [:li {:class (stl/css :menu-item :guide-color-label)}
+      [:span {:class (stl/css :menu-item-title)}
        (tr "workspace.context-menu.guides.change-color")]]
      [:li {:class (stl/css :guide-color-swatches)}
       (for [color guide-color-presets]
@@ -965,13 +1060,13 @@
 
     [:& dropdown {:show (boolean mdata)
                   :on-close #(st/emit! dw/hide-context-menu)}
-     [:div {:class (stl/css :workspace-context-menu)
+     [:div {:class (stl/css :menu-wrapper)
             :ref dropdown-ref
             :style {:top top :left left}
             :data-testid "context-menu"
             :on-context-menu prevent-default}
 
-      [:ul {:class (stl/css :context-list)}
+      [:ul {:class (stl/css :menu)}
        (if ^boolean read-only?
          [:> viewport-context-menu* {:mdata mdata}]
          (case (:kind mdata)
diff --git a/frontend/src/app/main/ui/workspace/context_menu.scss b/frontend/src/app/main/ui/workspace/context_menu.scss
index 212a7ae562..a2fe8c1b73 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/context_menu.scss
@@ -4,141 +4,136 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils" as *;
+@use "ds/_sizes" as *;
+@use "ds/_borders" as *;
+@use "ds/spacing" as *;
+@use "ds/typography" as *;
+@use "ds/z-index" as *;
 
-.workspace-context-menu {
+.menu-wrapper {
   position: absolute;
-  top: deprecated.$s-40;
-  left: deprecated.$s-736;
-  z-index: deprecated.$z-index-4;
+  inset-block-start: $sz-40;
+  inset-inline-start: px2rem(736);
+  z-index: var(--z-index-dropdown);
 }
 
-.context-list,
-.workspace-context-submenu {
-  @include deprecated.menu-shadow;
-
+.menu,
+.submenu {
+  box-shadow: 0 0 0.75rem 0 var(--color-shadow-dark);
   display: grid;
-  width: deprecated.$s-240;
-  padding: deprecated.$s-4;
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-2 solid var(--panel-border-color);
-  background-color: var(--menu-background-color);
-  max-height: 100vh;
+  inline-size: px2rem(240);
+  padding: var(--sp-xs);
+  border-radius: $br-8;
+  border: $b-2 solid var(--color-background-quaternary);
+  background-color: var(--color-background-tertiary);
+  max-block-size: 100vh;
   overflow-y: auto;
 }
 
-.workspace-context-submenu {
+.submenu {
   position: absolute;
 }
 
-.separator {
-  height: deprecated.$s-12;
-}
+.menu-item {
+  --menu-item-bg-color: var(--color-background-tertiary);
+  --menu-item-title-color: var(--color-foreground-primary);
+  --menu-item-shortcut-color: var(--color-foreground-secondary);
+  --menu-item-shortcut-border-color: transparent;
 
-.context-menu-item {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: deprecated.$s-28;
-  width: 100%;
-  padding: deprecated.$s-6;
-  border-radius: deprecated.$br-8;
-  cursor: pointer;
-
-  .title {
-    @include deprecated.body-small-typography;
-
-    color: var(--menu-foreground-color);
-  }
-
-  .shortcut {
-    @include deprecated.flex-center;
-
-    gap: deprecated.$s-2;
-    color: var(--menu-shortcut-foreground-color);
-
-    .shortcut-key {
-      @include deprecated.body-small-typography;
-      @include deprecated.flex-center;
-
-      height: deprecated.$s-20;
-      padding: deprecated.$s-2 deprecated.$s-6;
-      border-radius: deprecated.$br-6;
-      background-color: var(--menu-shortcut-background-color);
-    }
-  }
-
-  .submenu-icon svg {
-    @extend %button-icon-small;
-
-    stroke: var(--menu-foreground-color);
-  }
+  block-size: $sz-28;
+  inline-size: 100%;
+  padding: px2rem(6);
+  border-radius: $br-8;
+  background-color: var(--menu-item-bg-color);
+  border: $b-1 solid var(--menu-item-shortcut-border-color);
 
   &:hover {
-    background-color: var(--menu-background-color-hover);
-
-    .title {
-      color: var(--menu-foreground-color-hover);
-    }
-
-    .shortcut {
-      color: var(--menu-shortcut-foreground-color-hover);
-    }
+    --menu-item-title-color: var(--color-foreground-primary);
+    --menu-item-bg-color: var(--color-background-quaternary);
+    --menu-item-shortcut-color: var(--color-foreground-primary);
   }
 
   &:focus {
-    border: 1px solid var(--menu-border-color-focus);
-    background-color: var(--menu-background-color-focus);
+    --menu-item-bg-color: var(--color-background-tertiary);
+    --menu-item-shortcut-border-color: var(--color-accent-primary);
   }
 }
 
-.icon-menu-item {
+.menu-item-icon {
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  height: deprecated.$s-28;
-  padding: deprecated.$s-6;
-  border-radius: deprecated.$br-8;
+  gap: px2rem(6);
+  block-size: $sz-28;
+  padding: px2rem(6);
+  border-radius: $br-8;
 
   &:hover {
-    background-color: var(--menu-background-color-hover);
-  }
-
-  span.title {
-    margin-left: deprecated.$s-6;
-  }
-
-  .selected-icon {
-    svg {
-      @extend %button-icon-small;
-
-      stroke: var(--menu-foreground-color);
-    }
-  }
-
-  .shape-icon {
-    margin-left: deprecated.$s-2;
-
-    svg {
-      @extend %button-icon-small;
-
-      stroke: var(--menu-foreground-color);
-    }
-  }
-
-  .icon-wrapper {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    margin: 0;
+    background-color: var(--color-background-quaternary);
   }
 }
 
-.icon-menu-item[disabled],
-.context-menu-item[disabled] {
+.menu-item-icon[disabled],
+.menu-item[disabled] {
   pointer-events: none;
   opacity: 0.6;
 }
 
+.menu-item-icon-group {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: var(--sp-xxs);
+}
+
+.menu-item-title {
+  @include use-typography("body-small");
+
+  color: var(--menu-item-title-color);
+}
+
+.shortcut {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: var(--sp-xxs);
+  color: var(--menu-item-shortcut-color);
+}
+
+.shortcut-key {
+  @include use-typography("body-small");
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  block-size: px2rem(20);
+  padding: var(--sp-xxs) px2rem(6);
+  border-radius: $br-6;
+  background-color: var(--color-background-primary);
+
+  &.customized-key {
+    background-color: var(--color-background-info);
+    color: var(--color-foreground-primary);
+  }
+}
+
+.icon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  inline-size: $sz-16;
+  color: var(--color-foreground-primary);
+  stroke-width: 1.33px;
+}
+
+.separator {
+  block-size: $sz-12;
+}
+
 .guide-color-label {
   cursor: default;
   pointer-events: none;
@@ -147,21 +142,21 @@
 .guide-color-swatches {
   display: flex;
   flex-wrap: wrap;
-  gap: deprecated.$s-6;
-  padding: deprecated.$s-4 deprecated.$s-6 deprecated.$s-8;
+  gap: px2rem(6);
+  padding: var(--sp-xs) px2rem(6) var(--sp-s);
   list-style: none;
 }
 
 .guide-color-swatch {
-  width: deprecated.$s-20;
-  height: deprecated.$s-20;
+  inline-size: px2rem(20);
+  block-size: px2rem(20);
   border-radius: 50%;
   cursor: pointer;
   flex-shrink: 0;
   box-sizing: border-box;
-  border: deprecated.$s-2 solid var(--panel-border-color);
+  border: $b-2 solid var(--color-background-quaternary);
 
   &.selected {
-    border: deprecated.$s-2 solid var(--menu-foreground-color);
+    border: $b-2 solid var(--color-foreground-primary);
   }
 }
diff --git a/frontend/src/app/main/ui/workspace/main_menu.cljs b/frontend/src/app/main/ui/workspace/main_menu.cljs
index 7a33b98024..bb2c6a2d88 100644
--- a/frontend/src/app/main/ui/workspace/main_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/main_menu.cljs
@@ -51,11 +51,15 @@
 (mf/defc shortcuts*
   {::mf/private true}
   [{:keys [id]}]
-  [:span {:class (stl/css :shortcut)}
-   (for [sc (scd/split-sc (sc/get-tooltip id))]
-     [:span {:class (stl/css :shortcut-key)
-             :key sc}
-      sc])])
+  (let [custom-shortcuts (mf/deref refs/custom-shortcuts)
+        customized?      (let [c (get-in custom-shortcuts [:workspace id])]
+                           (and c (not= c "")))]
+    [:span {:class (stl/css :shortcut)}
+     (for [sc (scd/split-sc (sc/get-effective-tooltip id custom-shortcuts))]
+       [:span {:class (stl/css-case :shortcut-key true
+                                    :customized-key customized?)
+               :key sc}
+        sc])]))
 
 (mf/defc help-info-menu*
   {::mf/private true
@@ -982,6 +986,19 @@
                        ::ev/origin "workspace:menu"})
             (modal/show :plugin-management {}))))
 
+        show-shortcuts
+        (mf/use-fn
+         (mf/deps layout)
+         (fn [event]
+           (dom/stop-propagation event)
+           (reset! show-menu* false)
+           (reset! selected-sub-menu* nil)
+           (when (contains? layout :collapse-left-sidebar)
+             (st/emit! (dw/toggle-layout-flag :collapse-left-sidebar)))
+           (st/emit!
+            (-> (dw/toggle-layout-flag :shortcuts)
+                (vary-meta assoc ::ev/origin "workspace-menu")))))
+
         subscription           (:subscription (:props profile))
         subscription-type      (get-subscription-type subscription)]
 
@@ -1148,6 +1165,7 @@
                               :toggle-flag toggle-flag
                               :toggle-theme toggle-theme
                               :toggle-render toggle-render
+                              :show-shortcuts show-shortcuts
                               :on-close close-sub-menu}]
 
        :plugins
diff --git a/frontend/src/app/main/ui/workspace/main_menu.scss b/frontend/src/app/main/ui/workspace/main_menu.scss
index 610e7e45cc..83a724622e 100644
--- a/frontend/src/app/main/ui/workspace/main_menu.scss
+++ b/frontend/src/app/main/ui/workspace/main_menu.scss
@@ -25,14 +25,13 @@
 
 .menu {
   top: $sz-48;
-  left: calc(var(--right-sidebar-width) - $sz-40);
+  left: calc(var(--left-sidebar-width) - px2rem(44));
   inline-size: $sz-192;
 }
 
 .sub-menu {
-  left: calc(var(--right-sidebar-width) + $sz-154);
-  min-width: $sz-284;
-  width: 115%;
+  left: calc(var(--left-sidebar-width) + px2rem(150));
+  min-width: $sz-364;
 
   &.pos-1 {
     top: calc($sz-16 + $sz-32);
@@ -182,3 +181,8 @@
   border-radius: $br-6;
   background-color: var(--menu-shortcut-background-color);
 }
+
+.customized-key {
+  background-color: var(--color-background-info);
+  color: var(--color-foreground-primary);
+}
diff --git a/frontend/src/app/main/ui/workspace/palette.cljs b/frontend/src/app/main/ui/workspace/palette.cljs
index 11ba417e9b..7b5d5250cc 100644
--- a/frontend/src/app/main/ui/workspace/palette.cljs
+++ b/frontend/src/app/main/ui/workspace/palette.cljs
@@ -51,9 +51,12 @@
 
 (mf/defc palette*
   [{:keys [layout on-change-size]}]
-  (let [color-palette? (:colorpalette layout)
-        text-palette?  (:textpalette layout)
-        hide-palettes? (:hide-palettes layout)
+  (let [color-palette?   (:colorpalette layout)
+        text-palette?    (:textpalette layout)
+        hide-palettes?   (:hide-palettes layout)
+
+        custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
 
         read-only?     (mf/use-ctx ctx/workspace-read-only?)
         container      (mf/use-ref nil)
@@ -179,16 +182,16 @@
         [:ul {:class (dm/str size-classname " " (stl/css-case :palette-btn-list true
                                                               :hidden-bts hide-palettes?))}
          [:li {:class (stl/css :palette-item)}
-          [:button {:title (tr "workspace.toolbar.color-palette" (sc/get-tooltip :toggle-colorpalette))
-                    :aria-label (tr "workspace.toolbar.color-palette" (sc/get-tooltip :toggle-colorpalette))
+          [:button {:title (tr "workspace.toolbar.color-palette" (get-tt :toggle-colorpalette))
+                    :aria-label (tr "workspace.toolbar.color-palette" (get-tt :toggle-colorpalette))
                     :class (stl/css-case :palette-btn true
                                          :selected color-palette?)
                     :on-click on-select-color-palette}
            deprecated-icon/drop-icon]]
 
          [:li {:class (stl/css :palette-item)}
-          [:button {:title (tr "workspace.toolbar.text-palette" (sc/get-tooltip :toggle-textpalette))
-                    :aria-label (tr "workspace.toolbar.text-palette" (sc/get-tooltip :toggle-textpalette))
+          [:button {:title (tr "workspace.toolbar.text-palette" (get-tt :toggle-textpalette))
+                    :aria-label (tr "workspace.toolbar.text-palette" (get-tt :toggle-textpalette))
                     :class (stl/css-case :palette-btn true
                                          :selected text-palette?)
                     :on-click on-select-text-palette}
diff --git a/frontend/src/app/main/ui/workspace/right_header.cljs b/frontend/src/app/main/ui/workspace/right_header.cljs
index 947113c5f9..ff5e6a2152 100644
--- a/frontend/src/app/main/ui/workspace/right_header.cljs
+++ b/frontend/src/app/main/ui/workspace/right_header.cljs
@@ -40,8 +40,10 @@
   {::mf/wrap [mf/memo]
    ::mf/wrap-props false}
   [{:keys [zoom on-increase on-decrease on-zoom-reset on-zoom-fit on-zoom-selected]}]
-  (let [open*           (mf/use-state false)
-        open?           (deref open*)
+  (let [open*            (mf/use-state false)
+        open?            (deref open*)
+        custom-shortcuts (mf/deref refs/custom-shortcuts)
+        get-tt           #(sc/get-effective-tooltip % custom-shortcuts)
 
         open-dropdown
         (mf/use-fn
@@ -97,14 +99,14 @@
              :on-click on-zoom-fit}
         (tr "workspace.header.zoom-fit-all")
         [:span {:class (stl/css :shortcuts)}
-         (for [sc (scd/split-sc (sc/get-tooltip :fit-all))]
+         (for [sc (scd/split-sc (get-tt :fit-all))]
            [:span {:class (stl/css :shortcut-key)
                    :key (str "zoom-fit-" sc)} sc])]]
        [:li {:class (stl/css :zoom-option)
              :on-click on-zoom-selected}
         (tr "workspace.header.zoom-selected")
         [:span {:class (stl/css :shortcuts)}
-         (for [sc (scd/split-sc (sc/get-tooltip :zoom-selected))]
+         (for [sc (scd/split-sc (get-tt :zoom-selected))]
            [:span {:class (stl/css :shortcut-key)
                    :key (str "zoom-selected-" sc)} sc])]]]]]))
 
@@ -118,6 +120,9 @@
         read-only?        (mf/use-ctx ctx/workspace-read-only?)
         selected-drawtool (mf/deref refs/selected-drawing-tool)
 
+        custom-shortcuts  (mf/deref refs/custom-shortcuts)
+        get-tt            #(sc/get-effective-tooltip % custom-shortcuts)
+
         on-increase       (mf/use-fn #(st/emit! (dw/increase-zoom nil)))
         on-decrease       (mf/use-fn #(st/emit! (dw/decrease-zoom nil)))
         on-zoom-reset     (mf/use-fn #(st/emit! dw/reset-zoom))
@@ -211,8 +216,8 @@
         :on-zoom-selected on-zoom-selected}]]
 
      [:div {:class (stl/css :comments-section)}
-      [:button {:title (tr "workspace.toolbar.comments" (sc/get-tooltip :add-comment))
-                :aria-label (tr "workspace.toolbar.comments" (sc/get-tooltip :add-comment))
+      [:button {:title (tr "workspace.toolbar.comments" (get-tt :add-comment))
+                :aria-label (tr "workspace.toolbar.comments" (get-tt :add-comment))
                 :class (stl/css-case :comments-btn true
                                      :selected (= selected-drawtool :comments))
                 :on-click toggle-comments
@@ -239,7 +244,7 @@
         deprecated-icon/share])
 
      [:a {:class (stl/css :viewer-btn)
-          :title (tr "workspace.header.viewer" (sc/get-tooltip :open-viewer))
+          :title (tr "workspace.header.viewer" (get-tt :open-viewer))
           :on-click nav-to-viewer}
       deprecated-icon/play]]))
 
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
index 3eca4f72fd..536febb61b 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
@@ -55,7 +55,7 @@
       nil)))
 
 (defn- styles-fn [shape styles content]
-  (let [data (if (= (.getText ^js content) "")
+  (let [data (if (and content (= (.getText ^js content) ""))
                (-> ^js (.getData content)
                    (.toJS)
                    (js->clj :keywordize-keys true))
@@ -221,7 +221,12 @@
                   state                (-> (ted/insert-text state text style)
                                            (handle-change))]
               (st/emit! (dwt/update-editor-state shape state))))
-          "handled")]
+          "handled")
+
+        handle-drop
+        (fn [_ _ drag-type]
+          (when (= drag-type "internal")
+            "handled"))]
 
     (mf/use-layout-effect on-mount)
 
@@ -246,6 +251,7 @@
        :handle-return handle-return
        :strip-pasted-styles true
        :handle-pasted-text handle-pasted-text
+       :handle-drop handle-drop
        :custom-style-fn (partial styles-fn shape)
        :block-renderer-fn #(render-block % shape)
        :ref on-editor
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs
index b5a16d2f5d..68da4e80b4 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/v2_editor.cljs
@@ -86,9 +86,11 @@
         canvas-node
         (mf/ref-val canvas-ref)
 
-        ;; Gets the default font from the workspace refs.
+        ;; Gets the default font from the workspace refs. Ignore it when the
+        ;; remembered font is no longer installed, falling back to the built-in
+        ;; default so a new text shape never inherits a missing font.
         default-font
-        (deref refs/default-font)
+        (fonts/valid-default-font (deref refs/default-font))
 
         style-defaults
         (styles/get-style-defaults
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/v3_editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/v3_editor.cljs
index 84e786d8cf..d872d684a8 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/v3_editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/v3_editor.cljs
@@ -99,6 +99,18 @@
     (or (.-isComposing native)
         (= 229 (.-keyCode event)))))
 
+(defn- input-surface-class
+  "Class list for the contenteditable capture surface.
+
+  Mousetrap's `stopCallback` drops every keystroke whose target is
+  contentEditable, so without the `mousetrap` class (as in V1/V2) the text
+  shortcuts (Ctrl+B, Ctrl+I, …) never reach the dispatcher."
+  [rotation]
+  (dm/str "mousetrap "
+          (cur/get-dynamic "text" rotation)
+          " "
+          (stl/css :text-editor-container)))
+
 (mf/defc text-editor*
   "Contenteditable element positioned over the text shape to capture input events."
   [{:keys [shape]}]
@@ -113,6 +125,11 @@
         ;; `input`. See on-before-input / on-input.
         pending-replace-ref (mf/use-ref 0)
 
+        ;; Tracks an in-flight pointer drag-selection so `on-pointer-move` only
+        ;; repaints the selection overlay while a drag is active (mirrors the
+        ;; WASM `is_pointer_selection_active` guard), not on every hover move.
+        dragging-ref (mf/use-ref false)
+
         fallback-fonts    (wasm.api/fonts-from-text-content (:content shape) false)
         fallback-families (map (fn [font]
                                  (font-family-from-font-id (:font-id font))) fallback-fonts)
@@ -157,7 +174,7 @@
              (when (some? data)
                (text-editor/text-editor-composition-update data)
                (sync-wasm-text-editor-content!)
-               (wasm.api/request-render "text-composition"))
+               (wasm.api/request-render-preserving-target "text-composition"))
              (reset-input-node (mf/ref-val contenteditable-ref)))))
 
         on-composition-end
@@ -166,7 +183,7 @@
            (let [data (or (.-data event) "")]
              (text-editor/text-editor-composition-end data)
              (sync-wasm-text-editor-content!)
-             (wasm.api/request-render "text-composition"))
+             (wasm.api/request-render-preserving-target "text-composition"))
            (reset-input-node (mf/ref-val contenteditable-ref))))
 
         on-paste
@@ -178,7 +195,7 @@
              (when (and text (seq text))
                (text-editor/text-editor-insert-text text)
                (sync-wasm-text-editor-content!)
-               (wasm.api/request-render "text-paste"))
+               (wasm.api/request-render-preserving-target "text-paste"))
              (reset-input-node (mf/ref-val contenteditable-ref)))))
 
         on-copy
@@ -186,7 +203,7 @@
          (fn [^js event]
            (when (text-editor/text-editor-has-focus?)
              (dom/prevent-default event)
-             (when (text-editor/text-editor-get-selection)
+             (when (text-editor/text-editor-has-selection?)
                (let [text (text-editor/text-editor-export-selection)]
                  (.setData (.-clipboardData event) "text/plain" text))))))
 
@@ -195,13 +212,13 @@
          (fn [^js event]
            (when (text-editor/text-editor-has-focus?)
              (dom/prevent-default event)
-             (when (text-editor/text-editor-get-selection)
+             (when (text-editor/text-editor-has-selection?)
                (let [text (text-editor/text-editor-export-selection)]
                  (.setData (.-clipboardData event) "text/plain" (or text ""))
                  (when (and text (seq text))
                    (text-editor/text-editor-delete-backward)
                    (sync-wasm-text-editor-content!)
-                   (wasm.api/request-render "text-cut"))))
+                   (wasm.api/request-render-preserving-target "text-cut"))))
              (reset-input-node (mf/ref-val contenteditable-ref)))))
 
         on-key-down
@@ -225,7 +242,7 @@
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-select-all)
-                   (wasm.api/request-render "text-select-all"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  ;; Enter
                  (= key "Enter")
@@ -233,7 +250,7 @@
                    (dom/prevent-default event)
                    (text-editor/text-editor-insert-paragraph)
                    (sync-wasm-text-editor-content!)
-                   (wasm.api/request-render "text-paragraph"))
+                   (wasm.api/request-render-preserving-target "text-paragraph"))
 
                  ;; Backspace
                  (= key "Backspace")
@@ -241,7 +258,7 @@
                    (dom/prevent-default event)
                    (text-editor/text-editor-delete-backward ctrl?)
                    (sync-wasm-text-editor-content!)
-                   (wasm.api/request-render "text-delete-backward"))
+                   (wasm.api/request-render-preserving-target "text-delete-backward"))
 
                  ;; Delete
                  (= key "Delete")
@@ -249,51 +266,60 @@
                    (dom/prevent-default event)
                    (text-editor/text-editor-delete-forward ctrl?)
                    (sync-wasm-text-editor-content!)
-                   (wasm.api/request-render "text-delete-forward"))
+                   (wasm.api/request-render-preserving-target "text-delete-forward"))
+
+                 ;; Shift+Tab falls through to the browser, so the keyboard can
+                 ;; still leave the editor.
+                 (and (= key "Tab") (not shift?))
+                 (do
+                   (dom/prevent-default event)
+                   (text-editor/text-editor-insert-text "\t")
+                   (sync-wasm-text-editor-content!)
+                   (wasm.api/request-render-preserving-target "text-tab"))
 
                  ;; Insert
                  (= key "Insert")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-toggle-overtype-mode)
-                   (wasm.api/request-render "text-overtype-mode"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  ;; Arrow keys
                  (= key "ArrowLeft")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 0 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  (= key "ArrowRight")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 1 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  (= key "ArrowUp")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 2 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  (= key "ArrowDown")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 3 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  (= key "Home")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 4 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  (= key "End")
                  (do
                    (dom/prevent-default event)
                    (text-editor/text-editor-move-cursor 5 ctrl? shift?)
-                   (wasm.api/request-render "text-cursor-move"))
+                   (wasm.api/render-text-editor-overlay!))
 
                  ;; Let contenteditable handle text input via on-input
                  :else nil)))))
@@ -341,7 +367,7 @@
                      (text-editor/text-editor-delete-backward)))
                  (text-editor/text-editor-insert-text data)
                  (sync-wasm-text-editor-content!)
-                 (wasm.api/request-render "text-input"))
+                 (wasm.api/request-render-preserving-target "text-input"))
                (mf/set-ref-val! pending-replace-ref 0)
                ;; IMPORTANT: do NOT clear the surface here (see keep-input-alive):
                ;; the browser must retain the just-typed character so the macOS
@@ -353,35 +379,49 @@
          (fn [^js event]
            (let [native-event (dom/event->native-event event)
                  off-pt (dom/get-offset-position native-event)]
-             (wasm.api/text-editor-pointer-down off-pt))))
+             (mf/set-ref-val! dragging-ref true)
+             (if (.-shiftKey event)
+               (wasm.api/text-editor-pointer-down-extend off-pt)
+               (wasm.api/text-editor-pointer-down off-pt))
+             ;; Repaint the caret over the cached tiles instead of a full render,
+             ;; which flashes at high zoom (see `render-text-editor-overlay!`).
+             (wasm.api/render-text-editor-overlay!))))
 
         on-pointer-move
         (mf/use-fn
          (fn [^js event]
            (let [native-event (dom/event->native-event event)
                  off-pt (dom/get-offset-position native-event)]
-             (wasm.api/text-editor-pointer-move off-pt))))
+             (wasm.api/text-editor-pointer-move off-pt)
+             ;; Only while dragging: `text-editor-pointer-move` is a no-op
+             ;; otherwise, so avoid repainting on plain hover.
+             (when (mf/ref-val dragging-ref)
+               (wasm.api/render-text-editor-overlay!)))))
 
         on-pointer-up
         (mf/use-fn
          (fn [^js event]
            (let [native-event (dom/event->native-event event)
                  off-pt (dom/get-offset-position native-event)]
-             (wasm.api/text-editor-pointer-up off-pt))))
+             (mf/set-ref-val! dragging-ref false)
+             (wasm.api/text-editor-pointer-up off-pt)
+             (wasm.api/render-text-editor-overlay!))))
 
         on-click
         (mf/use-fn
          (fn [^js event]
            (let [native-event (dom/event->native-event event)
                  off-pt (dom/get-offset-position native-event)]
-             (wasm.api/text-editor-set-cursor-from-offset off-pt))))
+             (wasm.api/text-editor-set-cursor-from-offset off-pt)
+             (wasm.api/render-text-editor-overlay!))))
 
         on-double-click
         (mf/use-fn
          (fn [^js event]
            (let [native-event (dom/event->native-event event)
                  off-pt (dom/get-offset-position native-event)]
-             (wasm.api/text-editor-select-word-boundary off-pt))))
+             (wasm.api/text-editor-select-word-boundary off-pt)
+             (wasm.api/render-text-editor-overlay!))))
 
         on-focus
         (mf/use-fn
@@ -390,9 +430,15 @@
 
         on-blur
         (mf/use-fn
-         (fn [^js _event]
-           (sync-wasm-text-editor-content! {:finalize? true})
-           (wasm.api/text-editor-blur)))
+         (fn [^js event]
+           ;; MacOS Character Viewer on Firefox fires a `blur` when it opens.
+           ;; To avoid losing the selected character, we need guard against
+           ;; `activeElement` being the surface itself.
+           (when-not (and (some? event)
+                          (= (.-activeElement js/document)
+                             (mf/ref-val contenteditable-ref)))
+             (sync-wasm-text-editor-content! {:finalize? true})
+             (wasm.api/text-editor-blur))))
 
         style #js {:pointerEvents "all"
                    "--editor-container-width" (dm/str width "px")
@@ -420,21 +466,30 @@
          ;; Focus and select all text on mount (this will trigger on-focus)
          (.focus node)
          (text-editor/text-editor-select-all)
-         (wasm.api/request-render "text-editor-select-all-on-mount"))
+         (wasm.api/request-render-preserving-target "text-editor-select-all-on-mount"))
        ;; On unmount, finalize the editor content and then dispose the WASM editor.
        ;; We finalize on unmount instead of relying on the browser blur event, because
        ;; it was not being reliable (timing issues, Firefox issues…)
        (fn []
          (on-blur)
          (text-editor/text-editor-dispose)
-         (wasm.api/request-render "text-editor-dispose"))))
+         (wasm.api/request-render-preserving-target "text-editor-dispose"))))
 
     (mf/use-effect
+     (mf/deps)
      (fn []
        (let [timeout-id (atom nil)
              schedule-blink (fn schedule-blink []
-                              (when (text-editor/text-editor-has-focus?)
-                                (wasm.api/request-render "cursor-blink"))
+                              ;; The caret only blinks for a collapsed cursor. With an active
+                              ;; selection there is nothing to animate, so skip the repaint:
+                              ;; re-compositing every interval would otherwise redraw the
+                              ;; selection over and over (a visible flicker at high zoom).
+                              (when (and (text-editor/text-editor-has-focus?)
+                                         (not (text-editor/text-editor-has-selection?)))
+                                ;; Redraw only the caret (cached frame + overlay) instead of a
+                                ;; full `request-render`, which flashes on zoomed-in views by
+                                ;; kicking off a progressive tile-by-tile shape re-render.
+                                (wasm.api/render-text-editor-overlay!))
                               (reset! timeout-id (js/setTimeout schedule-blink caret-blink-interval-ms)))]
          (schedule-blink)
          (fn []
@@ -479,7 +534,5 @@
          :on-focus on-focus
          :on-blur on-blur
          :id "text-editor-wasm-input"
-         :class (dm/str (cur/get-dynamic "text" (:rotation shape))
-                        " "
-                        (stl/css :text-editor-container))
+         :class (input-surface-class (:rotation shape))
          :data-testid "text-editor-container"}]]]]))
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs b/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs
index ae6f49f688..77d659c17b 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/viewport_texts_html.cljs
@@ -16,6 +16,7 @@
    [app.common.types.modifiers :as ctm]
    [app.common.types.text :as txt]
    [app.common.uuid :as uuid]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.texts :as dwt]
    [app.main.fonts :as fonts]
    [app.main.refs :as refs]
@@ -94,7 +95,10 @@
                                 (not migrate))
                        (st/emit! (dwt/resize-text id width height)))))
 
-                 (st/emit! (dwt/clean-text-modifier id))))))
+                 (st/emit! (dwt/clean-text-modifier id))))
+       ;; Swallowed so a text whose position data cannot be computed still
+       ;; settles and still reports its measurement as finished.
+       (p/catch (fn [_] nil))))
 
 (defn- update-text-modifier
   [{:keys [grow-type id] :as shape} node]
@@ -183,11 +187,17 @@
         (mf/use-fn
          (fn [shape node]
            ;; Unique to indentify the pending state
-           (let [uid (uuid/next)]
-             (swap! pending-update* assoc uid (:id shape))
-             (p/then
-              (update-text-shape shape node)
-              #(swap! pending-update* dissoc uid)))))]
+           (let [uid (uuid/next)
+                 id  (:id shape)]
+             (swap! pending-update* assoc uid id)
+             ;; Callback refs run at the DOM commit boundary. Track the exact
+             ;; measurement promise from that acknowledgement; any resize it
+             ;; schedules owns the following task in the chain.
+             (wrf/run-pending!
+              :text-measure
+              [id]
+              #(-> (update-text-shape shape node)
+                   (p/finally (fn [] (swap! pending-update* dissoc uid))))))))]
 
     [:.text-changes-renderer
      (for [{:keys [id] :as shape} changed-texts]
diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs
index c918288270..d66dcdc4ff 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar.cljs
@@ -53,7 +53,7 @@
   {::mf/private true}
   []
   ;; NOTE: This custom button may be replace by an action button when this variant is designed
-  [:button {:class (stl/css :collapse-sidebar-button)
+  [:button {:class (stl/css :collapse-button)
             :on-click toggle-collapse-left-sidebar}
    [:> icon* {:icon-id i/arrow
               :size "s"
@@ -71,6 +71,7 @@
               :title (tr "workspace.sidebar.expand")
               :on-click toggle-collapse-left-sidebar}
      [:> icon* {:icon-id i/arrow
+                :class (stl/css :collapsed-button-icon)
                 :size "s"
                 :aria-label (tr "workspace.sidebar.expand")}]]]])
 
@@ -105,12 +106,12 @@
                    :on-toggle-collapsed on-toggle-sitemap-collapsed}]
 
      (when-not ^boolean sitemap-collapsed?
-       [:div {:class (stl/css :resize-area-horiz)
+       [:div {:class (stl/css :layers-tab-resize-area)
               :on-pointer-down on-pointer-down
               :on-lost-pointer-capture on-lost-pointer-capture
               :on-pointer-move on-pointer-move}
 
-        [:div {:class (stl/css :resize-handle-horiz)}]])
+        [:div {:class (stl/css :layers-tab-resize-handle)}]])
 
      [:> layers-toolbox* {:size-parent width}]]))
 
@@ -165,11 +166,10 @@
                 :id "assets"}])))
 
         aside-class
-        (stl/css-case
-         :left-settings-bar true
-         :global/two-row    (<= width 300)
-         :global/three-row  (and (> width 300) (<= width 400))
-         :global/four-row   (> width 400))
+        (stl/css-case :left-sidebar      true
+                      :global/two-row    (<= width 300)
+                      :global/three-row  (and (> width 300) (<= width 400))
+                      :global/four-row   (> width 400))
 
         tabs-action-button
         (mf/with-memo []
@@ -187,22 +187,22 @@
       [:> left-header* {:file file
                         :layout layout
                         :project project
-                        :class (stl/css :left-header)}]
+                        :class (stl/css :left-sidebar-header)}]
 
       [:div {:on-pointer-down on-pointer-down
              :on-lost-pointer-capture on-lost-pointer-capture
              :on-pointer-move on-pointer-move
-             :class (stl/css :resize-area)}]
+             :class (stl/css :left-sidebar-resize-area)}]
 
       (cond
         (true? shortcuts?)
-        [:> shortcuts-container* {:class (stl/css :settings-bar-content)}]
+        [:> shortcuts-container* {:class (stl/css :left-sidebar-content)}]
 
         (true? show-debug?)
-        [:> debug-panel* {:class (stl/css :settings-bar-content)}]
+        [:> debug-panel* {:class (stl/css :left-sidebar-content)}]
 
         :else
-        [:div {:class (stl/css  :settings-bar-content)}
+        [:div {:class (stl/css  :left-sidebar-content)}
          [:> tab-switcher* {:tabs tabs
                             :default "layers"
                             :selected (name section)
@@ -213,20 +213,17 @@
 
           (case section
             :assets
-            [:> assets-toolbox*
-             {:size (- width  58)
-              :file-id file-id}]
+            [:> assets-toolbox* {:size (- width  58)
+                                 :file-id file-id}]
 
             :tokens
-            [:> tokens-sidebar-tab*
-             {:tokens-lib tokens-lib
-              :active-tokens active-tokens
-              :resolved-active-tokens resolved-active-tokens}]
+            [:> tokens-sidebar-tab* {:tokens-lib tokens-lib
+                                     :active-tokens active-tokens
+                                     :resolved-active-tokens resolved-active-tokens}]
 
             :layers
-            [:> layers-content*
-             {:layout layout
-              :width width}])]])]]))
+            [:> layers-content* {:layout layout
+                                 :width width}])]])]]))
 
 ;; --- Right Sidebar (Component)
 
@@ -245,7 +242,8 @@
         (deref selected*)
 
         on-change-tab
-        (mf/use-fn #(reset! selected* %))
+        (mf/use-fn
+         #(reset! selected* %))
 
         tabs
         (mf/with-memo []
@@ -302,7 +300,8 @@
         (use-resize-hook :code right-sidebar-default-width right-sidebar-default-width right-sidebar-default-max-width :x true :right)
 
         on-change-section
-        (mf/use-fn #(reset! current-section* %))
+        (mf/use-fn
+         #(reset! current-section* %))
 
         on-expand
         (mf/use-fn
@@ -319,7 +318,7 @@
     [:> (mf/provider muc/sidebar) {:value :right}
      [:> (mf/provider muc/active-tokens-by-type) {:value active-tokens-by-type}
       [:aside
-       {:class (stl/css-case :right-settings-bar true
+       {:class (stl/css-case :right-sidebar true
                              :not-expand (not can-be-expanded?)
                              :expanded (or is-debug? (> width right-sidebar-default-width)))
 
@@ -338,12 +337,11 @@
                 :on-lost-pointer-capture on-lost-pointer-capture
                 :on-pointer-move on-pointer-move}])
 
-       [:> right-header*
-        {:file-id file-id
-         :layout layout
-         :page-id page-id}]
+       [:> right-header* {:file-id file-id
+                          :layout layout
+                          :page-id page-id}]
 
-       [:div {:class (stl/css :settings-bar-inside)}
+       [:div {:class (stl/css :right-sidebar-content)}
         (cond
           is-comments?
           [:> comments-sidebar* {}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar.scss b/frontend/src/app/main/ui/workspace/sidebar.scss
index 29c9984b01..66239eb9e9 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar.scss
@@ -4,110 +4,23 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
+@use "ds/_borders.scss" as *;
 @use "ds/_sizes.scss" as *;
-@use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
+@use "ds/z-index.scss" as *;
 
-.left-settings-bar {
-  display: grid;
-  grid-template: "header header" deprecated.$s-52 "content resize" 1fr / 1fr 0;
-  position: relative;
-  grid-area: left-sidebar;
-  min-width: var(--left-sidebar-width);
-  max-width: var(--left-sidebar-width-max);
-  width: var(--right-sidebar-width);
-  background-color: var(--panel-background-color);
-  height: 100vh;
-  max-height: 100vh;
-  z-index: deprecated.$z-index-1;
+// Component: collapse-button*
 
-  .resize-area {
-    grid-area: resize;
-  }
-}
-
-.layers-tab {
-  padding-top: deprecated.$s-4;
-  overflow-x: hidden;
-}
-
-.left-header {
-  grid-area: header;
-}
-
-.settings-bar-content {
-  grid-area: content;
-  right: calc(-1 * deprecated.$s-8);
-}
-
-.resize-area {
-  position: absolute;
-  top: 0;
-  left: unset;
-  z-index: deprecated.$z-index-4;
-  width: deprecated.$s-8;
-  cursor: ew-resize;
-  height: 100%;
-}
-
-.tab-spacing {
-  margin-inline: deprecated.$s-12;
-}
-
-.right-settings-bar {
-  grid-area: right-sidebar;
-  display: grid;
-  grid-template-rows: auto minmax(0, 1fr);
-  height: 100vh;
-  width: var(--right-sidebar-width);
-  background-color: var(--panel-background-color);
-  z-index: deprecated.$z-index-1;
-
-  &.not-expand {
-    max-width: var(--right-sidebar-width);
-  }
-
-  &.expanded {
-    width: var(--right-sidebar-width, var(--right-sidebar-width));
-  }
-
-  .settings-bar-inside {
-    display: grid;
-    grid-template-columns: 100%;
-    grid-template-rows: 100%;
-    height: calc(100vh - deprecated.$s-52);
-    overflow: hidden;
-  }
-}
-
-.resize-area-horiz {
-  background-color: var(--panel-background-color);
-  position: absolute;
-  left: 0;
-  width: 100%;
-  padding: deprecated.$s-3 0 deprecated.$s-1 0;
-  height: deprecated.$s-6;
-  cursor: ns-resize;
-}
-
-.resize-handle-horiz {
-  border-bottom: deprecated.$s-2 solid var(--resize-area-border-color);
-  cursor: ns-resize;
-}
-
-.left-sidebar-tabs {
-  --tabs-nav-padding-inline-start: var(--sp-m);
-  --tabs-nav-padding-inline-end: var(--sp-m);
-}
-
-.collapse-sidebar-button {
+.collapse-button {
   --collapse-icon-color: var(--color-foreground-secondary);
 
-  @include deprecated.flex-center;
-  @include deprecated.button-style;
-
-  height: 100%;
-  width: deprecated.$s-24;
-  border-radius: deprecated.$br-5;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: none;
+  background: none;
+  block-size: 100%;
+  inline-size: $sz-24;
   color: var(--collapse-icon-color);
   transform: rotate(180deg);
 
@@ -116,58 +29,150 @@
   }
 }
 
-.collapsed-sidebar {
-  @include deprecated.flex-center;
+// Component: collapsed-button*
 
+.collapsed-sidebar {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   position: absolute;
-  top: deprecated.$s-48;
-  left: 0;
-  padding: deprecated.$s-4;
-  border-radius: deprecated.$br-8;
+  inset-block-start: px2rem(48);
+  inset-inline-start: 0;
+  padding: var(--sp-xs);
+  border-radius: $br-8;
   background: var(--color-background-primary);
   margin-inline-start: var(--sp-m);
 }
 
 .collapsed-title {
-  @include deprecated.flex-center;
-
-  height: deprecated.$s-36;
-  width: deprecated.$s-24;
-  border-radius: deprecated.$br-8;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  block-size: $sz-36;
+  inline-size: $sz-24;
+  border-radius: $br-8;
   background: var(--color-background-secondary);
 }
 
 .collapsed-button {
-  @include deprecated.button-style;
+  --collapsed-icon-color: var(--color-foreground-secondary);
 
-  height: deprecated.$s-24;
-  width: deprecated.$s-16;
+  border: none;
+  background: none;
+  block-size: $sz-24;
+  inline-size: $sz-16;
   padding: 0;
-  border-radius: deprecated.$br-5;
-
-  svg {
-    @include deprecated.flex-center;
-
-    height: deprecated.$s-16;
-    width: deprecated.$s-16;
-    color: transparent;
-    fill: none;
-    stroke: var(--icon-foreground);
-  }
 
   &:hover {
-    svg {
-      stroke: var(--icon-foreground-hover);
-    }
+    --collapsed-icon-color: var(--color-foreground-primary);
   }
 }
 
-.versions-tab {
-  width: 100%;
-  overflow: hidden;
-  height: calc(100vh - deprecated.$s-88);
+.collapsed-button-icon {
+  color: var(--collapsed-icon-color);
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
+// Component: layers-content*
+
+.layers-tab {
+  padding-block-start: var(--sp-xs);
+  overflow-x: hidden;
+}
+
+.layers-tab-resize-area {
+  background-color: var(--color-background-primary);
+  position: absolute;
+  inset-inline-start: 0;
+  inline-size: 100%;
+  padding: px2rem(3) 0 px2rem(1);
+  block-size: $sz-6;
+  cursor: ns-resize;
+}
+
+.layers-tab-resize-handle {
+  border-block-end: $b-2 solid var(--color-background-quaternary);
+  cursor: ns-resize;
+}
+
+// Component: left-sidebar*
+
+.left-sidebar {
+  display: grid;
+  grid-template: "header header" px2rem(52) "content resize" 1fr / 1fr 0;
+  position: relative;
+  grid-area: left-sidebar;
+  min-inline-size: var(--left-sidebar-width);
+  max-inline-size: var(--left-sidebar-width-max);
+  inline-size: var(--left-sidebar-width);
+  background-color: var(--color-background-primary);
+  block-size: 100vh;
+  max-block-size: 100vh;
+  z-index: var(--z-index-panels);
+}
+
+.left-sidebar-header {
+  grid-area: header;
+}
+
+.left-sidebar-content {
+  grid-area: content;
+  inset-inline-end: calc(-1 * var(--sp-s));
+}
+
+.left-sidebar-tabs {
+  --tabs-nav-padding-inline-start: var(--sp-m);
+  --tabs-nav-padding-inline-end: var(--sp-m);
+}
+
+.left-sidebar-resize-area {
+  grid-area: resize;
+  position: absolute;
+  inset-block-start: 0;
+  inset-inline-start: unset;
+  inline-size: var(--sp-s);
+  block-size: 100%;
+  cursor: ew-resize;
+}
+
+// Component: right-sidebar*
+
+.right-sidebar {
+  grid-area: right-sidebar;
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr);
+  block-size: 100vh;
+  inline-size: var(--right-sidebar-width);
+  background-color: var(--color-background-primary);
+  z-index: var(--z-index-panels);
+
+  &.not-expand {
+    max-inline-size: var(--right-sidebar-width);
+  }
+
+  &.expanded {
+    inline-size: var(--right-sidebar-width, var(--right-sidebar-width));
+  }
+}
+
+.right-sidebar-content {
+  display: grid;
+  grid-template-columns: 100%;
+  grid-template-rows: 100%;
+  block-size: calc(100vh - px2rem(52));
+  overflow: hidden;
+}
+
+// Component: history-content*
+
 .history-tab {
   overflow-y: auto;
 }
+
+.versions-tab {
+  inline-size: 100%;
+  overflow: hidden;
+  block-size: calc(100vh - $sz-88);
+}
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index 020bc2a490..e9db4a2343 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -431,23 +431,36 @@
         text-match-count  (count text-match-ids)
         safe-match-idx    (if (pos? text-match-count) (mod current-match-idx text-match-count) 0)
 
+        text-match-ids-ref (mf/use-ref text-match-ids)
+        match-idx-ref      (mf/use-ref 0)
+
+        _                  (mf/set-ref-val! text-match-ids-ref text-match-ids)
+
         navigate-next
         (mf/use-fn
          (mf/deps text-match-count)
          (fn [_]
            (when (pos? text-match-count)
-             (swap! state* update :current-match-idx
-                    (fn [idx]
-                      (mod (inc idx) text-match-count))))))
+             (let [ids      (mf/ref-val text-match-ids-ref)
+                   next-idx (mod (inc (mf/ref-val match-idx-ref)) text-match-count)
+                   id       (nth ids next-idx)]
+               (mf/set-ref-val! match-idx-ref next-idx)
+               (swap! state* assoc :current-match-idx next-idx)
+               (st/emit! (dw/select-shape id)
+                         dw/zoom-to-selected-shape)))))
 
         navigate-prev
         (mf/use-fn
          (mf/deps text-match-count)
          (fn [_]
            (when (pos? text-match-count)
-             (swap! state* update :current-match-idx
-                    (fn [idx]
-                      (mod (+ (dec idx) text-match-count) text-match-count))))))
+             (let [ids      (mf/ref-val text-match-ids-ref)
+                   prev-idx (mod (+ (dec (mf/ref-val match-idx-ref)) text-match-count) text-match-count)
+                   id       (nth ids prev-idx)]
+               (mf/set-ref-val! match-idx-ref prev-idx)
+               (swap! state* assoc :current-match-idx prev-idx)
+               (st/emit! (dw/select-shape id)
+                         dw/zoom-to-selected-shape)))))
 
         handle-replace
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 2851124260..74e2eecb2d 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -464,11 +464,14 @@
         prop-vals        (mf/with-memo [component-file-data component-page-objects variant-id]
                            (cfv/extract-properties-values component-file-data component-page-objects variant-id))
 
-        get-options
-        (mf/use-fn
-         (mf/deps prop-vals)
-         (fn [prop-name]
-           (get-variant-options prop-name prop-vals)))
+        ;; Per-property options memoized on the identity-stable property values,
+        ;; so select* keeps a stable options prop across renders.
+        options-by-name
+        (mf/with-memo [prop-vals]
+          (reduce (fn [acc prop-name]
+                    (assoc acc prop-name (get-variant-options prop-name prop-vals)))
+                  {}
+                  (into #{} (map :name) props-first)))
 
         select-duplicated-comps
         (mf/use-fn
@@ -523,9 +526,9 @@
      [:div {:class (stl/css :variant-property-list)}
       (for [[pos prop] (map-indexed vector props-first)]
         (let [mixed-value? (not-every? #(= (:value prop) (:value (get % pos))) properties)
-              options      (get-options (:name prop))
-              boolean-pair (ctv/find-boolean-pair (mapv :id options))
-              options      (cond-> options
+              base-options (get options-by-name (:name prop))
+              boolean-pair (ctv/find-boolean-pair (mapv :id base-options))
+              options      (cond-> base-options
                              mixed-value?
                              (conj {:id mixed-label :label mixed-label :dimmed true}))]
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
index 258a9a9ac2..4141143a6e 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
@@ -84,8 +84,10 @@
         empty-fills?   (and (not multiple?)
                             (= 0 (count fills)))
 
-        open*          (mf/use-state has-fills?)
-        open?          (deref open*)
+        ;; Derive the open state from `has-fills?` on every render so it stays
+        ;; in sync even when the fills arrive after mount (editor v3)
+        open*          (mf/use-state true)
+        open?          (and has-fills? (deref open*))
 
         toggle-content (mf/use-fn #(swap! open* not))
         open-content   (mf/use-fn #(reset! open* true))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
index 70050dd38e..c02b3e6b90 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
@@ -1186,7 +1186,7 @@
         (mf/use-fn
          (mf/deps ids)
          (fn [multiple? type val]
-           (let [val (mth/finite val 0)]
+           (let [val (mth/finite (d/parse-double val 0) 0)]
              (cond
                ^boolean multiple?
                (st/emit! (dwsl/update-layout ids {:layout-gap {:row-gap val :column-gap val}}))
@@ -1194,6 +1194,7 @@
                (some? type)
                (st/emit! (dwsl/update-layout ids {:layout-gap {type val}}))))))
 
+
         ;; Padding
         on-padding-type-change
         (mf/use-fn
@@ -1205,7 +1206,7 @@
         (mf/use-fn
          (mf/deps ids)
          (fn [type prop val]
-           (let [val (mth/finite val 0)]
+           (let [val (mth/finite (d/parse-double val 0) 0)]
              (cond
                (and (= type :simple) (or (= prop :p1) (= prop #{:p1 :p3})))
                (st/emit! (dwsl/update-layout ids {:layout-padding {:p1 val :p3 val}}))
@@ -1431,7 +1432,7 @@
         (mf/use-fn
          (mf/deps ids)
          (fn [multiple? type val]
-           (let [val (mth/finite val 0)]
+           (let [val (mth/finite (d/parse-double val 0) 0)]
              (if multiple?
                (st/emit! (dwsl/update-layout ids {:layout-gap {:row-gap val :column-gap val}}))
                (st/emit! (dwsl/update-layout ids {:layout-gap {type val}}))))))
@@ -1445,7 +1446,7 @@
 
         on-padding-change
         (fn [type prop val]
-          (let [val (mth/finite val 0)]
+          (let [val (mth/finite (d/parse-double val 0) 0)]
             (cond
               (and (= type :simple) (= prop :p1))
               (st/emit! (dwsl/update-layout ids {:layout-padding {:p1 val :p3 val}}))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
index 598fd69b1b..63da937d98 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
@@ -234,10 +234,10 @@
         (mf/use-fn (mf/deps on-focus) #(on-focus :m2))
 
         on-focus-m3
-        (mf/use-fn (mf/deps on-focus) #(on-focus :m1))
+        (mf/use-fn (mf/deps on-focus) #(on-focus :m3))
 
         on-focus-m4
-        (mf/use-fn (mf/deps on-focus) #(on-focus :m2))
+        (mf/use-fn (mf/deps on-focus) #(on-focus :m4))
 
         on-change'
         (mf/use-fn
@@ -329,7 +329,6 @@
          :class (stl/css :bottom-margin-wrapper)
          :attr :m3
          :default nil
-         :align :right
          :input-type :vertical-margin
          :property "Bottom margin"
          :nillable true
@@ -359,6 +358,7 @@
          :class (stl/css :left-margin-wrapper)
          :default nil
          :attr :m4
+         :align :right
          :property "Left margin"
          :input-type :horizontal-margin
          :nillable true
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.scss
index d6bd605b44..2daf441b27 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.scss
@@ -140,20 +140,20 @@
   grid-row: 1;
 }
 
-.bottom-margin,
-.bottom-margin-wrapper {
+.right-margin,
+.right-margin-wrapper {
   grid-column: 2;
   grid-row: 1;
 }
 
-.left-margin,
-.left-margin-wrapper {
+.bottom-margin,
+.bottom-margin-wrapper {
   grid-column: 1;
   grid-row: 2;
 }
 
-.right-margin,
-.right-margin-wrapper {
+.left-margin,
+.left-margin-wrapper {
   grid-column: 2;
   grid-row: 2;
 }
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
index 29e4151880..d671e7294c 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
@@ -10,10 +10,12 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.types.stroke :as cts]
+   [app.config :as cf]
    [app.main.data.workspace :as udw]
    [app.main.data.workspace.colors :as dc]
    [app.main.data.workspace.shapes :as dwsh]
    [app.main.data.workspace.tokens.application :as dwta]
+   [app.main.features :as features]
    [app.main.store :as st]
    [app.main.ui.components.title-bar :refer [title-bar*]]
    [app.main.ui.ds.buttons.icon-button :refer [icon-button*]]
@@ -136,6 +138,53 @@
             (st/emit! (udw/trigger-bounding-box-cloaking ids))
             (st/emit! (dc/change-stroke-attrs ids {:stroke-width value} index))))
 
+        wasm-render?
+        (features/use-feature "render-wasm/v1")
+
+        per-side-available?
+        (and (contains? cf/flags :stroke-per-side)
+             (or (= type :rect) (= type :frame)))
+
+        per-side-disabled?
+        (not wasm-render?)
+
+        on-stroke-per-side-toggle
+        (fn [index]
+          (let [stroke  (get-in values [:strokes index])
+                active? (:stroke-per-side stroke)
+                width   (:stroke-width stroke)
+                width   (if (number? width) width 1)]
+            (st/emit! (udw/trigger-bounding-box-cloaking ids))
+            (if active?
+              (st/emit! (dc/change-stroke-attrs ids {:stroke-per-side false} index))
+              ;; Entering per-side mode seeds any missing side from the
+              ;; uniform width, so previous per-side edits are preserved.
+              ;; The top value doubles as the global :stroke-width.
+              (let [top (d/nilv (:stroke-width-top stroke) width)]
+                (st/emit! (dc/change-stroke-attrs
+                           ids
+                           {:stroke-per-side true
+                            :stroke-width top
+                            :stroke-width-top top
+                            :stroke-width-right (d/nilv (:stroke-width-right stroke) width)
+                            :stroke-width-bottom (d/nilv (:stroke-width-bottom stroke) width)
+                            :stroke-width-left (d/nilv (:stroke-width-left stroke) width)}
+                           index))))))
+
+        on-stroke-width-side-change
+        (fn [index attr value]
+          (when (number? value)
+            (st/emit! (udw/trigger-bounding-box-cloaking ids))
+            ;; Code paths that don't know about per-side data (old render,
+            ;; global width input, exports) keep reading :stroke-width, and
+            ;; per spec they must see the TOP side there. So editing the top
+            ;; side also writes :stroke-width; the other sides only write
+            ;; their own attr.
+            (let [attrs (cond-> {attr value}
+                          (= attr :stroke-width-top)
+                          (assoc :stroke-width value))]
+              (st/emit! (dc/change-stroke-attrs ids attrs index)))))
+
         on-stroke-dash-change
         (fn [index value]
           (when-not (str/empty? value)
@@ -237,6 +286,10 @@
                               :on-color-detach on-color-detach
                               :on-remove on-remove
                               :on-stroke-width-change on-stroke-width-change
+                              :per-side-available per-side-available?
+                              :per-side-disabled per-side-disabled?
+                              :on-stroke-per-side-toggle on-stroke-per-side-toggle
+                              :on-stroke-width-side-change on-stroke-width-side-change
                               :on-stroke-dash-change on-stroke-dash-change
                               :on-stroke-gap-change on-stroke-gap-change
                               :on-stroke-style-change on-stroke-style-change
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
index 0f6cc60077..4dc3473644 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
@@ -178,16 +178,32 @@
         flist        (mf/use-ref)
         input        (mf/use-ref)
 
-        fonts        (mf/deref fonts/fonts)
-        fonts        (mf/with-memo [state fonts]
-                       (filter-fonts state fonts))
+        all-fonts    (mf/deref fonts/fonts)
+        fonts        (mf/with-memo [state all-fonts]
+                       (filter-fonts state all-fonts))
+
+        ;; Ids currently installed in fontsdb. Recent fonts that are no longer
+        ;; available (deleted, or belonging to another team) must be hidden:
+        ;; selecting one applies a missing/nil font-family and corrupts the
+        ;; text content (fails the backend `validate-shape` schema).
+        installed-ids (mf/with-memo [all-fonts]
+                        (into #{} (map :id) all-fonts))
 
         sprite-status (:status (mf/deref fonts/preview-sprite))
 
         recent-fonts (mf/deref refs/recent-fonts)
-        recent-fonts (mf/with-memo [state recent-fonts]
-                       (filter-fonts state recent-fonts))
+        recent-fonts (mf/with-memo [state recent-fonts installed-ids]
+                       (->> recent-fonts
+                            (filter #(contains? installed-ids (:id %)))
+                            (filter-fonts state)))
 
+        ;; When the active font is not in the filtered results, pre-select
+        ;; the first match visually so the user can confirm it with Enter —
+        ;; without live-applying it on every keystroke.
+        effective-selected
+        (if (and (seq fonts) (not (d/seek #(= (:id %) (:id @selected)) fonts)))
+          (first fonts)
+          @selected)
 
         full-size?   (boolean (and full-size show-recent))
 
@@ -209,13 +225,18 @@
 
         on-key-down
         (mf/use-fn
-         (mf/deps fonts)
+         (mf/deps fonts on-select on-close)
          (fn [event]
            (cond
              (kbd/up-arrow? event)   (select-prev event)
              (kbd/down-arrow? event) (select-next event)
              (kbd/esc? event)        (on-close)
-             (kbd/enter? event)      (on-close)
+             (kbd/enter? event)
+             (let [first-result (when-not (d/seek #(= (:id %) (:id @selected)) fonts)
+                                  (first fonts))]
+               (if first-result
+                 (do (on-select first-result) (on-close))
+                 (on-close)))
              :else                   (dom/focus! (mf/ref-val input)))))
 
         on-filter-change
@@ -230,7 +251,7 @@
            (on-select font)
            (on-close)))]
 
-    (mf/with-effect [fonts]
+    (mf/with-effect [fonts on-key-down]
       (let [key (events/listen js/document "keydown" on-key-down)]
         #(events/unlistenByKey key)))
 
@@ -253,7 +274,7 @@
       (on-select @selected))
 
     (mf/with-effect []
-      (st/emit! (dsc/push-shortcuts :typography {}))
+      (st/emit! (dsc/push-shortcuts :typography {} :workspace))
       (fn []
         (st/emit! (dsc/pop-shortcuts :typography))))
 
@@ -281,7 +302,7 @@
                             :font font
                             :style {}
                             :on-click on-select-and-close
-                            :is-current (= (:id font) (:id @selected))}])])]
+                            :is-current (= (:id font) (:id effective-selected))}])])]
 
       [:div {:class (stl/css-case :fonts-list true
                                   :fonts-list-full-size full-size?)}
@@ -289,7 +310,7 @@
         (fn [props]
           (let [width  (unchecked-get props "width")
                 height (unchecked-get props "height")
-                render #(row-renderer fonts @selected on-select-and-close %)]
+                render #(row-renderer fonts effective-selected on-select-and-close %)]
             (mf/html
              [:> rvt/List #js {:height height
                                :ref flist
@@ -332,12 +353,19 @@
          (fn [new-font-id]
            (let [{:keys [family] :as font} (get fonts new-font-id)
                  {:keys [id name weight style]} (fonts/get-default-variant font)]
-             (on-change {:font-id new-font-id
-                         :font-family family
-                         :font-variant-id (or id name)
-                         :font-weight weight
-                         :font-style style})
-             (mf/set-ref-val! last-font font))))
+             ;; Guard against a font that is not present in fontsdb (unloaded
+             ;; custom font, deleted font, shared library not yet resolved).
+             ;; Without it `family`/`weight`/`style` come back nil and get written
+             ;; onto the text spans, producing content that fails the backend
+             ;; `validate-shape` schema (`:font-family`/`:font-weight`/`:font-style`
+             ;; must be non-blank strings when present).
+             (when (and (some? font) (some? family))
+               (on-change {:font-id new-font-id
+                           :font-family family
+                           :font-variant-id (or id name)
+                           :font-weight weight
+                           :font-style style})
+               (mf/set-ref-val! last-font font)))))
 
         on-font-size-change
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
index 4281c18e61..c5b1a59d2f 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.scss
@@ -345,6 +345,7 @@ $font-preview-box-height: 28px;
   background: var(--color-background-tertiary);
   border: $b-1 solid var(--color-background-quaternary);
   border-block-end: none;
+  padding: var(--sp-xxs);
 }
 
 .font-selector-dropdown {
@@ -379,6 +380,7 @@ $font-preview-box-height: 28px;
 .font-item {
   @extend %asset-element;
 
+  width: px2rem(280);
   margin-bottom: var(--sp-xs);
   border-radius: $br-8;
   display: flex;
@@ -450,12 +452,6 @@ $font-preview-box-height: 28px;
   border-start-start-radius: 0;
   border-start-end-radius: 0;
   border: $b-1 solid var(--color-background-quaternary);
-
-  // TODO: this should belong to typography-entry , but atm we don't have a clear
-  // way of accessing whether we are in fullsize mode or not
-  .selected {
-    padding-inline-end: 0;
-  }
 }
 
 .dropdown-icon {
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
index 8e21f18232..cdb971dbbf 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
@@ -9,6 +9,7 @@
   (:require
    [app.common.data :as d]
    [app.common.types.color :as ctc]
+   [app.main.data.workspace.colors :as dc]
    [app.main.data.workspace.tokens.application :as dwta]
    [app.main.features :as features]
    [app.main.store :as st]
@@ -35,6 +36,10 @@
            on-color-detach
            on-remove
            on-stroke-width-change
+           per-side-available
+           per-side-disabled
+           on-stroke-per-side-toggle
+           on-stroke-width-side-change
            on-stroke-dash-change
            on-stroke-gap-change
            on-stroke-style-change
@@ -98,15 +103,78 @@
 
         stroke-width (:stroke-width stroke)
 
+        per-side? (and per-side-available
+                       (not per-side-disabled)
+                       (true? (:stroke-per-side stroke)))
+
+        per-side-expanded* (mf/use-state false)
+        per-side-expanded? (deref per-side-expanded*)
+
+        all-sides-equal?
+        (mf/with-memo [stroke]
+          (let [width  (:stroke-width stroke)
+                top    (d/nilv (:stroke-width-top stroke) width)
+                right  (d/nilv (:stroke-width-right stroke) width)
+                bottom (d/nilv (:stroke-width-bottom stroke) width)
+                left   (d/nilv (:stroke-width-left stroke) width)]
+            (= top right bottom left)))
+
+        show-multiple-placeholder? (or per-side-expanded? (not all-sides-equal?))
+
+        per-side-toggle-label
+        (if per-side-disabled
+          (tr "workspace.options.stroke.per-side-disabled")
+          (tr "workspace.options.stroke.per-side"))
+
+        on-per-side-toggle
+        (mf/use-fn
+         (mf/deps per-side? on-stroke-per-side-toggle index)
+         (fn []
+           (if per-side?
+             (swap! per-side-expanded* not)
+             (do
+               (when on-stroke-per-side-toggle
+                 (on-stroke-per-side-toggle index))
+               (reset! per-side-expanded* true)))))
+
+        on-width-top-change
+        (mf/use-fn
+         (mf/deps index on-stroke-width-side-change)
+         #(on-stroke-width-side-change index :stroke-width-top %))
+
+        on-width-right-change
+        (mf/use-fn
+         (mf/deps index on-stroke-width-side-change)
+         #(on-stroke-width-side-change index :stroke-width-right %))
+
+        on-width-bottom-change
+        (mf/use-fn
+         (mf/deps index on-stroke-width-side-change)
+         #(on-stroke-width-side-change index :stroke-width-bottom %))
+
+        on-width-left-change
+        (mf/use-fn
+         (mf/deps index on-stroke-width-side-change)
+         #(on-stroke-width-side-change index :stroke-width-left %))
+
         on-width-change
         (mf/use-fn
-         (mf/deps index on-stroke-width-change ids)
+         (mf/deps index on-stroke-width-change ids per-side?)
          (fn [value]
-           (soc/emit-value-or-token
-            value
-            #(on-stroke-width-change index %)
-            ids
-            #{:stroke-width})))
+           (if per-side?
+             (st/emit! (dc/change-stroke-attrs
+                        ids
+                        {:stroke-width value
+                         :stroke-width-top value
+                         :stroke-width-right value
+                         :stroke-width-bottom value
+                         :stroke-width-left value}
+                        index))
+             (soc/emit-value-or-token
+              value
+              #(on-stroke-width-change index %)
+              ids
+              #{:stroke-width}))))
 
         ;; The SVG renderer defaults dash and gap to `stroke-width + 10` when
         ;; unset. Showing that value as placeholder makes the override obvious.
@@ -264,7 +332,8 @@
 
      ;; Stroke Width, Alignment & Style
      (if token-numeric-inputs
-       [:div {:class (stl/css :stroke-options-tokens)}
+       [:div {:class (stl/css-case :stroke-options-tokens true
+                                   :stroke-options-tokens-with-toggle per-side-available)}
         [:> numeric-input-wrapper* {:on-change on-width-change
                                     :on-detach on-detach-token-width
                                     :icon i/stroke-size
@@ -275,7 +344,13 @@
                                     :class (stl/css :numeric-input-wrapper)
                                     :property (tr "workspace.options.stroke-width")
                                     :applied-token (get applied-tokens :stroke-width)
-                                    :value stroke-width}]
+                                    :placeholder (if show-multiple-placeholder?
+                                                   (tr "settings.multiple")
+                                                   "--")
+                                    :nillable true
+                                    :value (if all-sides-equal?
+                                             stroke-width
+                                             nil)}]
         [:> select* {:default-selected (d/name stroke-alignment)
                      :options stroke-alignment-options
                      :variant "icon-only"
@@ -292,16 +367,28 @@
                        :variant "icon-only"
                        :disabled (if (= :multiple hidden?) true hidden?)
                        :dropdown-alignment :right
-                       :on-change on-style-change}])]
+                       :on-change on-style-change}])
+        (when per-side-available
+          [:> icon-button* {:variant "ghost"
+                            :aria-pressed per-side-expanded?
+                            :aria-label per-side-toggle-label
+                            :disabled per-side-disabled
+                            :on-click on-per-side-toggle
+                            :icon i/stroke-extended
+                            :data-testid "stroke.per-side-toggle"}])]
 
        [:div {:class (stl/css :stroke-options)}
         [:div {:class (stl/css :stroke-width-input)
                :title (tr "workspace.options.stroke-width")}
          [:> icon* {:icon-id i/stroke-size
                     :size "s"}]
-         [:> deprecated-input/numeric-input* {:value stroke-width
+         [:> deprecated-input/numeric-input* {:value (if show-multiple-placeholder?
+                                                       nil
+                                                       stroke-width)
                                               :min 0
-                                              :placeholder (tr "settings.multiple")
+                                              :placeholder (if show-multiple-placeholder?
+                                                             (tr "settings.multiple")
+                                                             "--")
                                               :on-change on-width-change
                                               :on-focus on-focus
                                               :select-on-focus select-on-focus
@@ -314,12 +401,65 @@
                      :on-change on-alignment-change}]]
 
         (when-not disable-stroke-style
-          [:div {:class (stl/css :stroke-style-select)
+          [:div {:class (stl/css-case :stroke-style-select true
+                                      :stroke-style-select-compact per-side-available)
                  :data-testid "stroke.style"}
            [:& select {:default-value stroke-style
                        :options stroke-style-options
                        :disabled hidden?
-                       :on-change on-style-change}]])])
+                       :on-change on-style-change}]])
+        (when per-side-available
+          [:> icon-button* {:variant "ghost"
+                            :aria-pressed per-side-expanded?
+                            :aria-label per-side-toggle-label
+                            :disabled per-side-disabled
+                            :on-click on-per-side-toggle
+                            :icon i/stroke-extended
+                            :data-testid "stroke.per-side-toggle"}])])
+
+     (when per-side-expanded?
+       [:div {:class (stl/css :stroke-sides-options)
+              :data-testid "stroke.per-side-options"}
+        [:div {:class (stl/css :stroke-side-input)
+               :title (tr "workspace.options.stroke-width-top")}
+         [:> icon* {:icon-id i/stroke-top
+                    :size "s"}]
+         [:> deprecated-input/numeric-input* {:value (d/nilv (:stroke-width-top stroke) stroke-width)
+                                              :min 0
+                                              :on-change on-width-top-change
+                                              :on-focus on-focus
+                                              :select-on-focus select-on-focus
+                                              :on-blur on-blur}]]
+        [:div {:class (stl/css :stroke-side-input)
+               :title (tr "workspace.options.stroke-width-right")}
+         [:> icon* {:icon-id i/stroke-right
+                    :size "s"}]
+         [:> deprecated-input/numeric-input* {:value (d/nilv (:stroke-width-right stroke) stroke-width)
+                                              :min 0
+                                              :on-change on-width-right-change
+                                              :on-focus on-focus
+                                              :select-on-focus select-on-focus
+                                              :on-blur on-blur}]]
+        [:div {:class (stl/css :stroke-side-input)
+               :title (tr "workspace.options.stroke-width-bottom")}
+         [:> icon* {:icon-id i/stroke-bottom
+                    :size "s"}]
+         [:> deprecated-input/numeric-input* {:value (d/nilv (:stroke-width-bottom stroke) stroke-width)
+                                              :min 0
+                                              :on-change on-width-bottom-change
+                                              :on-focus on-focus
+                                              :select-on-focus select-on-focus
+                                              :on-blur on-blur}]]
+        [:div {:class (stl/css :stroke-side-input)
+               :title (tr "workspace.options.stroke-width-left")}
+         [:> icon* {:icon-id i/stroke-left
+                    :size "s"}]
+         [:> deprecated-input/numeric-input* {:value (d/nilv (:stroke-width-left stroke) stroke-width)
+                                              :min 0
+                                              :on-change on-width-left-change
+                                              :on-focus on-focus
+                                              :select-on-focus select-on-focus
+                                              :on-blur on-blur}]]])
 
      ;; Stroke Dash / Gap (only visible for dashed style)
      (when (= stroke-style :dashed)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.scss b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.scss
index bc452ce0ad..227d229fd1 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.scss
@@ -98,3 +98,24 @@
 .stroke-style-icon-select {
   --dropdown-width: var(--four-columns-width);
 }
+
+.stroke-options-tokens-with-toggle {
+  grid-template-columns: 1.5fr 1fr 1fr auto;
+}
+
+.stroke-style-select-compact {
+  grid-column: span 2;
+}
+
+.stroke-sides-options {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: var(--sp-xs) var(--sp-xs);
+}
+
+.stroke-side-input {
+  @extend %input-element;
+  @include t.use-typography("body-small");
+
+  padding-inline-start: var(--sp-xs);
+}
diff --git a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
index aecf386f6a..be454c585c 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
@@ -10,450 +10,80 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.config :as cf]
-   [app.main.data.dashboard.shortcuts]
+   [app.main.data.dashboard.shortcuts :as dsc]
    [app.main.data.shortcuts :as ds]
-   [app.main.data.viewer.shortcuts]
+   [app.main.data.viewer.shortcuts :as vsc]
    [app.main.data.workspace :as dw]
-   [app.main.data.workspace.path.shortcuts]
-   [app.main.data.workspace.shortcuts]
+   [app.main.data.workspace.path.shortcuts :as psc]
+   [app.main.data.workspace.shortcuts :as wsc]
+   [app.main.refs :as refs]
+   [app.main.router :as rt]
    [app.main.store :as st]
+   [app.main.ui.components.button-link :as bl]
    [app.main.ui.components.search-bar :refer [search-bar*]]
-   [app.main.ui.ds.foundations.assets.icon :as i :refer [icon*]]
+   [app.main.ui.ds.foundations.assets.icon :as i  :refer [icon*]]
    [app.main.ui.ds.product.panel-title :refer [panel-title*]]
+   [app.main.ui.shortcuts :as ss]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
    [app.util.strings :refer [matches-search]]
    [clojure.set :as set]
-   [clojure.string]
-   [cuerdas.core :as str]
    [rumext.v2 :as mf]))
 
-(mf/defc converted-chars*
-  [{:keys [char command]}]
-  (let [modified-keys {:up    ds/up-arrow
-                       :down  ds/down-arrow
-                       :left  ds/left-arrow
-                       :right ds/right-arrow
-                       :plus "+"}
-        macos-keys    {:command "\u2318"
-                       :option  "\u2325"
-                       :alt     "\u2325"
-                       :delete  "\u232B"
-                       :del     "\u232B"
-                       :shift   "\u21E7"
-                       :control "\u2303"
-                       :esc     "\u238B"
-                       :enter   "\u23CE"}
-        is-macos?     (cf/check-platform? :macos)
-        char          (if (contains? modified-keys (keyword char)) ((keyword char) modified-keys) char)
-        char          (if (and is-macos? (contains? macos-keys (keyword char))) ((keyword char) macos-keys) char)
-        unique-key    (str (d/name command) "-" char)]
-    [:span {:class (stl/css :key)
-            :key unique-key} char]))
-
-(defn translation-keyname
-  [type keyname]
-  ;; Execution time translation strings:
-  (comment
-    (tr "shortcut-subsection.alignment")
-    (tr "shortcut-subsection.edit")
-    (tr "shortcut-subsection.general-dashboard")
-    (tr "shortcut-subsection.general-viewer")
-    (tr "shortcut-subsection.main-menu")
-    (tr "shortcut-subsection.modify-layers")
-    (tr "shortcut-subsection.navigation-dashboard")
-    (tr "shortcut-subsection.navigation-viewer")
-    (tr "shortcut-subsection.navigation-workspace")
-    (tr "shortcut-subsection.panels")
-    (tr "shortcut-subsection.path-editor")
-    (tr "shortcut-subsection.shape")
-    (tr "shortcut-subsection.text-editor")
-    (tr "shortcut-subsection.tools")
-    (tr "shortcut-subsection.zoom-viewer")
-    (tr "shortcut-subsection.zoom-workspace")
-    (tr "shortcuts.add-comment")
-    (tr "shortcuts.add-node")
-    (tr "shortcuts.align-bottom")
-    (tr "shortcuts.align-center")
-    (tr "shortcuts.align-hcenter")
-    (tr "shortcuts.align-justify")
-    (tr "shortcuts.align-left")
-    (tr "shortcuts.align-right")
-    (tr "shortcuts.align-top")
-    (tr "shortcuts.align-vcenter")
-    (tr "shortcuts.artboard-selection")
-    (tr "shortcuts.bold")
-    (tr "shortcuts.bool-difference")
-    (tr "shortcuts.bool-exclude")
-    (tr "shortcuts.bool-intersection")
-    (tr "shortcuts.bool-union")
-    (tr "shortcuts.bring-back")
-    (tr "shortcuts.bring-backward")
-    (tr "shortcuts.bring-forward")
-    (tr "shortcuts.bring-front")
-    (tr "shortcuts.clear-undo")
-    (tr "shortcuts.copy")
-    (tr "shortcuts.copy-link")
-    (tr "shortcuts.create-component-variant")
-    (tr "shortcuts.create-new-project")
-    (tr "shortcuts.cut")
-    (tr "shortcuts.decrease-zoom")
-    (tr "shortcuts.delete")
-    (tr "shortcuts.delete-node")
-    (tr "shortcuts.detach-component")
-    (tr "shortcuts.draw-curve")
-    (tr "shortcuts.draw-ellipse")
-    (tr "shortcuts.draw-frame")
-    (tr "shortcuts.draw-nodes")
-    (tr "shortcuts.draw-path")
-    (tr "shortcuts.draw-rect")
-    (tr "shortcuts.draw-text")
-    (tr "shortcuts.duplicate")
-    (tr "shortcuts.escape")
-    (tr "shortcuts.export-shapes")
-    (tr "shortcuts.find")
-    (tr "shortcuts.find-and-replace")
-    (tr "shortcuts.fit-all")
-    (tr "shortcuts.flip-horizontal")
-    (tr "shortcuts.flip-vertical")
-    (tr "shortcuts.font-size-dec")
-    (tr "shortcuts.font-size-inc")
-    (tr "shortcuts.go-to-drafts")
-    (tr "shortcuts.go-to-libs")
-    (tr "shortcuts.go-to-search")
-    (tr "shortcuts.group")
-    (tr "shortcuts.h-distribute")
-    (tr "shortcuts.hide-ui")
-    (tr "shortcuts.increase-zoom")
-    (tr "shortcuts.insert-image")
-    (tr "shortcuts.italic")
-    (tr "shortcuts.join-nodes")
-    (tr "shortcuts.line-through")
-    (tr "shortcuts.make-corner")
-    (tr "shortcuts.make-curve")
-    (tr "shortcuts.mask")
-    (tr "shortcuts.merge-nodes")
-    (tr "shortcuts.move")
-    (tr "shortcuts.move-fast-down")
-    (tr "shortcuts.move-fast-left")
-    (tr "shortcuts.move-fast-right")
-    (tr "shortcuts.move-fast-up")
-    (tr "shortcuts.move-nodes")
-    (tr "shortcuts.move-unit-down")
-    (tr "shortcuts.move-unit-left")
-    (tr "shortcuts.move-unit-right")
-    (tr "shortcuts.move-unit-up")
-    (tr "shortcuts.next-frame")
-    (tr "shortcuts.opacity-0")
-    (tr "shortcuts.opacity-1")
-    (tr "shortcuts.opacity-2")
-    (tr "shortcuts.opacity-3")
-    (tr "shortcuts.opacity-4")
-    (tr "shortcuts.opacity-5")
-    (tr "shortcuts.opacity-6")
-    (tr "shortcuts.opacity-7")
-    (tr "shortcuts.opacity-8")
-    (tr "shortcuts.opacity-9")
-    (tr "shortcuts.open-color-picker")
-    (tr "shortcuts.open-comments")
-    (tr "shortcuts.open-dashboard")
-    (tr "shortcuts.open-inspect")
-    (tr "shortcuts.open-interactions")
-    (tr "shortcuts.open-viewer")
-    (tr "shortcuts.open-workspace")
-    (tr "shortcuts.paste")
-    (tr "shortcuts.paste-replace")
-    (tr "shortcuts.prev-frame")
-    (tr "shortcuts.redo")
-    (tr "shortcuts.rename")
-    (tr "shortcuts.reset-zoom")
-    (tr "shortcuts.scale")
-    (tr "shortcuts.search-placeholder")
-    (tr "shortcuts.select-all")
-    (tr "shortcuts.select-next")
-    (tr "shortcuts.select-parent-layer")
-    (tr "shortcuts.select-prev")
-    (tr "shortcuts.separate-nodes")
-    (tr "shortcuts.show-pixel-grid")
-    (tr "shortcuts.show-shortcuts")
-    (tr "shortcuts.snap-nodes")
-    (tr "shortcuts.snap-pixel-grid")
-    (tr "shortcuts.start-editing")
-    (tr "shortcuts.start-measure")
-    (tr "shortcuts.stop-measure")
-    (tr "shortcuts.thumbnail-set")
-    (tr "shortcuts.toggle-alignment")
-    (tr "shortcuts.toggle-assets")
-    (tr "shortcuts.toggle-colorpalette")
-    (tr "shortcuts.toggle-focus-mode")
-    (tr "shortcuts.toggle-fullscreen")
-    (tr "shortcuts.toggle-guides")
-    (tr "shortcuts.toggle-history")
-    (tr "shortcuts.toggle-layers")
-    (tr "shortcuts.toggle-layout-flex")
-    (tr "shortcuts.toggle-layout-grid")
-    (tr "shortcuts.toggle-lock")
-    (tr "shortcuts.toggle-lock-size")
-    (tr "shortcuts.toggle-rulers")
-    (tr "shortcuts.toggle-snap-guides")
-    (tr "shortcuts.toggle-snap-ruler-guide")
-    (tr "shortcuts.toggle-textpalette")
-    (tr "shortcuts.toggle-theme")
-    (tr "shortcuts.toggle-visibility")
-    (tr "shortcuts.toggle-zoom-style")
-    (tr "shortcuts.underline")
-    (tr "shortcuts.undo")
-    (tr "shortcuts.ungroup")
-    (tr "shortcuts.unmask")
-    (tr "shortcuts.v-distribute")
-    (tr "shortcuts.zoom-lense-decrease")
-    (tr "shortcuts.zoom-lense-increase")
-    (tr "shortcuts.zoom-selected"))
-
-  (let [translat-pre (case type
-                       :sc      "shortcuts."
-                       :sec     "shortcut-section."
-                       :sub-sec "shortcut-subsection.")]
-    (tr (str translat-pre (d/name keyname)))))
-
-(defn add-translation
-  [type item]
-  (map (fn [[k v]] [k (assoc v :translation (translation-keyname type k))]) item))
-
-(defn shortcuts->subsections
-  "A function to obtain the list of subsections and their
-   associated shortcus from the general map of shortcuts"
-  [shortcuts]
-  (let [subsections (into #{} (mapcat :subsections) (vals shortcuts))
-        get-sc-by-subsection
-        (fn [subsection [k v]]
-          (when (some #(= subsection %) (:subsections v)) {k v}))
-        reduce-sc
-        (fn [acc subsection]
-          (let [shortcuts-by-subsection (into {} (keep (partial get-sc-by-subsection subsection) shortcuts))]
-            (assoc acc subsection {:children shortcuts-by-subsection})))]
-    (reduce reduce-sc {} subsections)))
-
-(mf/defc shortcuts-keys*
-  [{:keys [content command]}]
-  (let [managed-list    (if (coll? content)
-                          content
-                          (conj () content))
-        chars-list      (map ds/split-sc managed-list)
-        last-element    (last chars-list)
-        short-char-list (if (= 1 (count chars-list))
-                          chars-list
-                          (drop-last chars-list))
-        penultimate     (last short-char-list)]
-    [:span {:class (stl/css :keys)}
-     (for [chars short-char-list]
-       [:* {:key (str/join chars)}
-        (for [char chars]
-          [:> converted-chars* {:key (dm/str char "-" (name command))
-                                :char char
-                                :command command}])
-        (when (not= chars penultimate) [:span {:class (stl/css :space)} ","])])
-     (when (not= last-element penultimate)
-       [:*
-        [:span {:class (stl/css :space)} (tr "shortcuts.or")]
-        (for [char last-element]
-          [:> converted-chars* {:key (dm/str char "-" (name command))
-                                :char char
-                                :command command}])])]))
-
-(mf/defc shortcut-row*
-  [{:keys [elements filter-term is-match-section is-match-subsection]}]
-  (let [shortcut-name         (keys elements)
-        shortcut-translations (map #(translation-keyname :sc %) shortcut-name)
-        match-shortcut?       (some #(matches-search % @filter-term) shortcut-translations)
-        filtered              (if (and (or is-match-section is-match-subsection) (not match-shortcut?))
-                                shortcut-translations
-                                (filter #(matches-search % @filter-term) shortcut-translations))
-        sorted-filtered       (sort filtered)]
-
-    [:ul {:class (stl/css :sub-menu)}
-     (for [command-translate sorted-filtered]
-       (let [sc-by-translate  (first (filter #(= (:translation (second %)) command-translate) elements))
-             [command  comand-info] sc-by-translate
-             content                (or (:show-command comand-info) (:command comand-info))]
-         [:li {:class (stl/css :shortcuts-name)
-               :key command-translate}
-          [:span {:class (stl/css :command-name)}
-           command-translate]
-          [:> shortcuts-keys* {:content content
-                               :command command}]]))]))
-
-(mf/defc section-title*
-  [{:keys [name is-visible is-sub]}]
-  [:div {:class (if is-sub
-                  (stl/css :subsection-title)
-                  (stl/css :section-title))}
-   [:> icon* {:icon-id (if is-visible i/arrow-down i/arrow-right)
-              :size "s"}]
-   [:span {:class (if is-sub
-                    (stl/css :subsection-name)
-                    (stl/css :section-name))} name]])
-
-(mf/defc shortcut-subsection*
-  [{:keys [subsections manage-sections filter-term is-match-section open-sections]}]
-  (let [subsections-names       (keys subsections)
-        subsection-translations (if (= :none (first subsections-names))
-                                  (map #(translation-keyname :sc %) subsections-names)
-                                  (map #(translation-keyname :sub-sec %) subsections-names))
-        sorted-translations     (sort subsection-translations)]
-    ;; Basics section is treated different because it has no sub sections
-    (if (= :none (first subsections-names))
-      (let [basic-shortcuts (:none subsections)]
-        [:> shortcut-row* {:elements (:children basic-shortcuts)
-                           :filter-term filter-term
-                           :is-match-section is-match-section
-                           :is-match-subsection true}])
-
-      [:ul {:class (stl/css :subsection-menu)}
-       (for [sub-translated sorted-translations]
-         (let [sub-by-translate    (first (filter #(= (:translation (second %)) sub-translated) subsections))
-               [sub-name sub-info] sub-by-translate
-               visible?            (some  #(= % (:id sub-info)) @open-sections)
-               match-subsection?   (matches-search (translation-keyname :sub-sec sub-name) @filter-term)
-               shortcut-names      (map #(translation-keyname :sc %) (keys (:children sub-info)))
-               match-shortcuts?    (some #(matches-search % @filter-term) shortcut-names)]
-           (when (or match-subsection? match-shortcuts? is-match-section)
-             [:li {:key sub-translated
-                   :on-click (manage-sections (:id sub-info))}
-              [:> section-title* {:name sub-translated
-                                  :is-visible visible?
-                                  :is-sub true}]
-
-              [:div {:style {:display (if visible? "initial" "none")}}
-               [:> shortcut-row* {:elements (:children sub-info)
-                                  :filter-term filter-term
-                                  :is-match-section is-match-section
-                                  :is-match-subsection match-subsection?}]]])))])))
-
-(mf/defc shortcut-section*
-  [{:keys [section manage-sections open-sections filter-term]}]
-  (let [[section-key section-info] section
-        section-id          (:id section-info)
-        section-translation (translation-keyname :sec section-key)
-        match-section?      (matches-search section-translation @filter-term)
-        subsections         (:children section-info)
-        subs-names          (keys subsections)
-        subs-bodys          (reduce #(conj %1 (:children (%2 subsections))) {} subs-names)
-        sub-trans           (map #(if (= "none" (d/name %))
-                                    nil
-                                    (translation-keyname :sub-sec %)) subs-names)
-        match-subsection?   (some #(matches-search % @filter-term) sub-trans)
-        translations        (map #(translation-keyname :sc %) (keys subs-bodys))
-        match-shortcut?     (some #(matches-search % @filter-term) translations)
-        visible?            (some  #(= % section-id) @open-sections)]
-
-    (when (or match-section? match-subsection? match-shortcut?)
-      [:div {:class (stl/css :section)
-             :on-click (manage-sections section-id)}
-       [:> section-title* {:name section-translation
-                           :is-visible visible?
-                           :is-sub false}]
-
-       [:div {:style {:display (if visible? "initial" "none")}}
-        [:> shortcut-subsection* {:subsections subsections
-                                  :open-sections open-sections
-                                  :manage-sections manage-sections
-                                  :is-match-section match-section?
-                                  :filter-term filter-term}]]])))
 
 (mf/defc shortcuts-container*
   [{:keys [class]}]
-  (let [workspace-shortcuts          app.main.data.workspace.shortcuts/shortcuts
-        path-shortcuts               app.main.data.workspace.path.shortcuts/shortcuts
-        all-workspace-shortcuts      (->> (d/deep-merge path-shortcuts workspace-shortcuts)
-                                          (add-translation :sc)
+  (let [profile                      (mf/deref refs/profile)
+        custom-shortcuts             (get-in profile [:props :custom-shortcuts])
+
+        path-shortcuts-custom        (ds/apply-custom-overrides psc/shortcuts custom-shortcuts :path)
+
+        workspace-shortcuts-custom   (ds/apply-custom-overrides wsc/shortcuts custom-shortcuts :workspace)
+
+        workspace-shortcuts          (->> (d/deep-merge path-shortcuts-custom workspace-shortcuts-custom)
+                                          (ss/add-translation :sc)
                                           (into {}))
 
-        dashboard-shortcuts          (->> app.main.data.dashboard.shortcuts/shortcuts
-                                          (add-translation :sc)
+
+        dashboard-shortcuts-custom   (ds/apply-custom-overrides dsc/shortcuts custom-shortcuts :dashboard)
+        dashboard-shortcuts          (->> dashboard-shortcuts-custom
+                                          (ss/add-translation :sc)
                                           (into {}))
-        viewer-shortcuts             (->> app.main.data.viewer.shortcuts/shortcuts
-                                          (add-translation :sc)
+
+        viewer-shortcuts-custom      (ds/apply-custom-overrides vsc/shortcuts custom-shortcuts :viewer)
+        viewer-shortcuts             (->> viewer-shortcuts-custom
+                                          (ss/add-translation :sc)
                                           (into {}))
-        open-sections                (mf/use-state [[1]])
-        filter-term                  (mf/use-state "")
+
+        open-sections*               (mf/use-state [[:workspace]])
+        open-sections                (deref open-sections*)
+        filter-term*                 (mf/use-state "")
+        filter-term                  (deref filter-term*)
 
         close-fn                     #(st/emit! (dw/toggle-layout-flag :shortcuts))
 
-        walk (fn walk [element parent-id]
-               (if (nil? element)
-                 element
-                 (let [rec-fn (fn [index [k item]]
-                                (let [item-id (if (nil? parent-id)
-                                                [index]
-                                                (conj parent-id index))]
-                                  [k (assoc item :id item-id :children  (walk (:children item) item-id))]))]
-                   (into {} (map-indexed (partial rec-fn) element)))))
+        {:keys [all-shortcuts all-sc-names all-sub-names all-section-names]}
+        (ss/build-all-shortcuts workspace-shortcuts dashboard-shortcuts viewer-shortcuts)
 
-        workspace-sc-by-subsections (->> (shortcuts->subsections all-workspace-shortcuts)
-                                         (add-translation :sub-sec)
-                                         (into {}))
-        dashboard-sc-by-subsections (->> (shortcuts->subsections dashboard-shortcuts)
-                                         (add-translation :sub-sec)
-                                         (into {}))
-        viewer-sc-by-subsections    (->> (shortcuts->subsections viewer-shortcuts)
-                                         (add-translation :sub-sec)
-                                         (into {}))
-        basics-elements             (into {} (concat (:children (:basics workspace-sc-by-subsections))
-                                                     (:children (:basics dashboard-sc-by-subsections))
-                                                     (:children (:basics viewer-sc-by-subsections))))
-
-        workspace-sc-by-subsections (dissoc workspace-sc-by-subsections :basics)
-        dashboard-sc-by-subsections (dissoc dashboard-sc-by-subsections :basics)
-        viewer-sc-by-subsections    (dissoc viewer-sc-by-subsections :bassics)
-
-        all-shortcuts               {:basics    {:id [1]
-                                                 :children {:none {:children basics-elements}}
-                                                 :translation (tr "shortcut-section.basics")}
-                                     :workspace {:id [2]
-                                                 :children workspace-sc-by-subsections
-                                                 :translation (tr "shortcut-section.workspace")}
-                                     :dashboard {:id [3]
-                                                 :children dashboard-sc-by-subsections
-                                                 :translation (tr "shortcut-section.dashboard")}
-                                     :viewer    {:id [4]
-                                                 :children viewer-sc-by-subsections
-                                                 :translation (tr "shortcut-section.viewer")}}
-        all-shortcuts               (walk all-shortcuts nil)
-
-        all-sc-names                (map #(translation-keyname :sc %) (concat
-                                                                       (keys all-workspace-shortcuts)
-                                                                       (keys dashboard-shortcuts)
-                                                                       (keys viewer-shortcuts)))
-
-        all-sub-names               (map #(translation-keyname :sub-sec %) (concat
-                                                                            (keys workspace-sc-by-subsections)
-                                                                            (keys dashboard-sc-by-subsections)
-                                                                            (keys viewer-sc-by-subsections)))
-        all-section-names           (map #(translation-keyname :sec %) (keys all-shortcuts))
         all-item-names              (concat all-sc-names all-sub-names all-section-names)
-        match-any?                  (some #(matches-search % @filter-term) all-item-names)
+        match-any?                  (some #(matches-search % filter-term) all-item-names)
 
         manage-sections
         (fn [item]
           (fn [event]
             (dom/stop-propagation event)
-            (let [is-present? (some #(= % item) @open-sections)
+            (let [is-present? (some #(= % item) open-sections)
                   new-value (if is-present?
-                              (filterv (fn [element] (not= element item)) @open-sections)
-                              (conj @open-sections item))]
-              (reset! open-sections new-value))))
+                              (filterv (fn [element] (not= element item)) open-sections)
+                              (conj open-sections item))]
+              (reset! open-sections* new-value))))
 
         add-ids (fn [acc node]
-                  (let [id (:id node)
-                        addition (case (count id)
-                                   1 id
-                                   2 [[(first id)] id]
-                                   3 [[(first id)] [(first id) (second id)]]
-                                   "default" nil)]
-                    (if (= 1 (count addition))
-                      (conj acc addition)
-                      (into [] (concat acc addition)))))
+                  (let [id      (:id node)
+                        parents (when (> (count id) 1)
+                                  (mapv (fn [n] (vec (take n id)))
+                                        (range 1 (count id))))]
+                    (into [] (concat acc parents))))
 
         manage-section-on-search
         (fn [section term]
@@ -468,23 +98,28 @@
         manage-sections-on-search
         (fn [term]
           (if (= term "")
-            (reset! open-sections [[1]])
+            (reset! open-sections* [[:workspace]])
             (let [ids (set/union (manage-section-on-search :basics term)
                                  (manage-section-on-search :workspace term)
                                  (manage-section-on-search :dashboard term)
                                  (manage-section-on-search :viewer term))]
-              (reset! open-sections ids))))
+              (reset! open-sections* ids))))
 
         on-search-term-change-2
         (mf/use-callback
          (fn [value]
            (manage-sections-on-search value)
-           (reset! filter-term value)))
+           (reset! filter-term* value)))
+
         on-search-clear-click
         (mf/use-callback
          (fn [_]
-           (reset! open-sections [[1]])
-           (reset! filter-term "")))]
+           (reset! open-sections* [[:workspace]])
+           (reset! filter-term* "")))
+
+        go-to-edit-shortcuts
+        (mf/use-fn
+         #(st/emit! (rt/nav :settings-shortcuts {} {::rt/new-window true})))]
 
     [:div {:class (dm/str class " " (stl/css :shortcuts))}
      [:> panel-title* {:class (stl/css :shortcuts-title)
@@ -494,7 +129,7 @@
      [:div {:class (stl/css :search-field)}
       [:> search-bar* {:on-change on-search-term-change-2
                        :on-clear on-search-clear-click
-                       :value @filter-term
+                       :value filter-term
                        :placeholder (tr "shortcuts.title")
                        :icon-id i/search
                        :auto-focus true}]]
@@ -502,9 +137,20 @@
      (if match-any?
        [:div {:class (stl/css :shortcuts-list)}
         (for [section all-shortcuts]
-          [:> shortcut-section* {:key (->> section second :id first)
-                                 :section section
-                                 :manage-sections manage-sections
-                                 :open-sections open-sections
-                                 :filter-term filter-term}])]
-       [:div {:class (stl/css :not-found)} (tr "shortcuts.not-found")])]))
+          (let [[section-key _] section]
+            [:> ss/shortcut-section* {:key (name section-key)
+                                      :section section
+                                      :manage-sections manage-sections
+                                      :open-sections open-sections
+                                      :filter-term filter-term
+                                      :editable? false
+                                      :custom-shortcuts custom-shortcuts}]))]
+       [:div {:class (stl/css :not-found)} (tr "shortcuts.not-found")])
+     (when (contains? cf/flags :custom-shortcuts)
+       [:> bl/button-link* {:on-click go-to-edit-shortcuts
+                            :label (tr "shortcuts.edit-on-settings")
+                            :class (stl/css :edit-shortcuts-button)
+                            :icon (mf/html
+                                   [:> icon* {:icon-id i/open-link
+                                              :size "m"
+                                              :aria-hidden true}])}])]))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.scss b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.scss
index d375082b1a..a2b1771b30 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.scss
@@ -5,115 +5,63 @@
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
 @use "refactor/common-refactor.scss" as deprecated;
+@use "ds/typography.scss" as t;
+@use "ds/_borders.scss" as *;
+@use "ds/spacing.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
 
 .shortcuts {
   display: grid;
   grid-template-rows: auto auto 1fr;
 
   // TODO: Fix this once we start implementing the DS.
-  //       We should not be doign these hardcoded calc's.
-  height: calc(100vh - #{deprecated.$s-60});
+  //       We should not be doing these hardcoded calc's.
+  block-size: calc(100vh - #{px2rem(60)});
 }
 
 .search-field {
-  margin: deprecated.$s-16 deprecated.$s-12 deprecated.$s-4 deprecated.$s-12;
+  display: flex;
+  align-items: center;
+  gap: var(--sp-xs);
+  margin: var(--sp-l) var(--sp-m) var(--sp-xs) var(--sp-m);
+
+  // The search bar should fill available space; the reset-all button sits at the end
+  & > :first-child {
+    flex: 1;
+    min-inline-size: 0;
+  }
 }
 
 .shortcuts-title {
   margin: var(--sp-s) var(--sp-s) 0 var(--sp-s);
 }
 
-.section {
-  margin: 0;
+.shortcuts-list {
+  @include t.use-typography("body-small");
+
+  display: flex;
+  flex-direction: column;
+  block-size: 100%;
+  padding: var(--sp-m);
+  overflow-y: auto;
+  color: var(--color-foreground-secondary);
+  min-block-size: px2rem(250);
 }
 
 .not-found {
-  @include deprecated.body-small-typography;
+  @include t.use-typography("body-small");
 
-  color: var(--empty-message-foreground-color);
-  margin: deprecated.$s-12;
+  color: var(--color-foreground-secondary);
+  margin: var(--sp-m);
 }
 
-.shortcuts-list {
+.edit-shortcuts-button {
+  @include t.use-typography("headline-small");
+
+  width: fit-content;
   display: flex;
-  flex-direction: column;
-  height: 100%;
-  padding: deprecated.$s-12;
-  overflow-y: auto;
-  font-size: deprecated.$fs-12;
-  color: var(--title-foreground-color);
-
-  .section-title,
-  .subsection-title {
-    @include deprecated.uppercase-title-typography;
-
-    display: flex;
-    align-items: center;
-    margin: 0;
-    padding: deprecated.$s-8 0;
-    cursor: pointer;
-
-    .subsection-name,
-    .section-name {
-      padding-left: deprecated.$s-4;
-    }
-
-    &:hover {
-      color: var(--title-foreground-color-hover);
-    }
-  }
-
-  .subsection-title {
-    text-transform: none;
-    padding-left: deprecated.$s-12;
-  }
-
-  .subsection-menu {
-    margin-bottom: deprecated.$s-4;
-  }
-
-  .sub-menu {
-    margin-bottom: deprecated.$s-4;
-
-    .shortcuts-name {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      width: 100%;
-      min-height: deprecated.$s-32;
-      padding: deprecated.$s-6;
-      margin-bottom: deprecated.$s-4;
-      border-radius: deprecated.$br-8;
-      background-color: var(--pill-background-color);
-
-      .command-name {
-        @include deprecated.body-small-typography;
-
-        margin-left: deprecated.$s-2;
-        color: var(--pill-foreground-color);
-      }
-
-      .keys {
-        @include deprecated.flex-center;
-
-        gap: deprecated.$s-2;
-        color: var(--pill-foreground-color);
-
-        .key {
-          @include deprecated.body-small-typography;
-          @include deprecated.flex-center;
-
-          text-transform: capitalize;
-          height: deprecated.$s-20;
-          padding: deprecated.$s-2 deprecated.$s-6;
-          border-radius: deprecated.$s-6;
-          background-color: var(--menu-shortcut-background-color);
-        }
-
-        .space {
-          margin: 0 deprecated.$s-2;
-        }
-      }
-    }
-  }
+  align-items: center;
+  gap: var(--sp-xs);
+  justify-content: center;
 }
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
index cb33815c7d..455a8135bc 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.cljs
@@ -32,7 +32,8 @@
 
 ;; Helpers ---------------------------------------------------------------------
 
-(defn- key-in-map? [ks m]
+(defn- key-in-map?
+  [ks m]
   (some #(contains? m %) ks))
 
 (defn clean-separators
@@ -48,14 +49,16 @@
 
 ;; Actions ---------------------------------------------------------------------
 
-(defn attribute-actions [token selected-shapes attributes]
+(defn attribute-actions
+  [token selected-shapes attributes]
   (let [ids-by-attributes (cfo/shapes-ids-by-applied-attributes token selected-shapes attributes)
         shape-ids (into #{} (map :id selected-shapes))]
     {:all-selected? (cfo/shapes-applied-all? ids-by-attributes shape-ids attributes)
      :shape-ids shape-ids
      :selected-pred #(seq (% ids-by-attributes))}))
 
-(defn generic-attribute-actions [attributes title {:keys [token selected-shapes on-update-shape hint allowed-shape-attributes]}]
+(defn generic-attribute-actions
+  [attributes title {:keys [token selected-shapes on-update-shape hint allowed-shape-attributes]}]
   (let [allowed-attributes (set/intersection attributes allowed-shape-attributes)
         on-update-shape-fn (or on-update-shape (dwta/get-update-shape-fn token))
 
@@ -80,8 +83,9 @@
                           (st/emit! (dwta/apply-token (assoc props :on-update-shape on-update-shape-fn)))))}))
          allowed-attributes)))
 
-(defn all-or-separate-actions [{:keys [attribute-labels on-update-shape-all on-update-shape hint]}
-                               {:keys [token selected-shapes allowed-shape-attributes]}]
+(defn all-or-separate-actions
+  [{:keys [attribute-labels on-update-shape-all on-update-shape hint]}
+   {:keys [token selected-shapes allowed-shape-attributes]}]
   (when-let [attribute-labels (seq (select-keys attribute-labels allowed-shape-attributes))]
     (let [attributes (-> (keys attribute-labels) (set))
           {:keys [all-selected? selected-pred shape-ids]} (attribute-actions token selected-shapes attributes)
@@ -117,7 +121,8 @@
                               attribute-labels)]
       (concat (when all-action [all-action]) single-actions))))
 
-(defn layout-spacing-items [{:keys [token selected-shapes all-attr-labels horizontal-attr-labels vertical-attr-labels on-update-shape hint]}]
+(defn layout-spacing-items
+  [{:keys [token selected-shapes all-attr-labels horizontal-attr-labels vertical-attr-labels on-update-shape hint]}]
   (let [horizontal-attrs (into #{} (keys horizontal-attr-labels))
         vertical-attrs (into #{} (keys vertical-attr-labels))
         attrs (set/union horizontal-attrs vertical-attrs)
@@ -192,13 +197,15 @@
                           all-attr-labels)]
     (concat multi-items single-items)))
 
-(defn update-shape-layout-padding [value shape-ids attributes]
+(defn update-shape-layout-padding
+  [value shape-ids attributes]
   (st/emit!
    (when (= (count attributes) 1)
      (dwsl/update-layout shape-ids {:layout-padding-type :multiple}))
    (dwta/update-layout-padding value shape-ids attributes)))
 
-(defn update-shape-layout-margin [value shape-ids attributes]
+(defn update-shape-layout-margin
+  [value shape-ids attributes]
   (st/emit!
    (when (= (count attributes) 1)
      (dwsl/update-layout shape-ids {:layout-item-margin-type :multiple}))
@@ -206,7 +213,8 @@
 
 
 
-(defn spacing-attribute-actions [{:keys [token selected-shapes allowed-shape-attributes is-selected-inside-layout] :as context-data}]
+(defn spacing-attribute-actions
+  [{:keys [token selected-shapes allowed-shape-attributes is-selected-inside-layout] :as context-data}]
   (let [padding-attr-labels {:p1 "Padding top"
                              :p2 "Padding right"
                              :p3 "Padding bottom"
@@ -250,7 +258,8 @@
           margin-items)
          (clean-separators))))
 
-(defn sizing-attribute-actions [context-data]
+(defn sizing-attribute-actions
+  [context-data]
   (->>
    (concat
     (all-or-separate-actions {:attribute-labels {:width "Width"
@@ -272,7 +281,8 @@
                              context-data))
    (clean-separators)))
 
-(defn update-shape-radius-for-corners [value shape-ids attributes]
+(defn update-shape-radius-for-corners
+  [value shape-ids attributes]
   (st/emit!
    (ptk/data-event :expand-border-radius)
    (dwta/update-shape-radius-for-corners value shape-ids attributes)))
@@ -333,7 +343,8 @@
                         (generic-attribute-actions #{:y} "Y" (assoc context-data :on-update-shape dwta/update-shape-position)))
                        (clean-separators)))}))
 
-(defn default-actions [{:keys [token selected-token-set-id on-delete-token errors]}]
+(defn default-actions
+  [{:keys [token selected-token-set-id on-delete-token errors]}]
   (let [{:keys [modal]} (dwta/get-token-properties token)
         on-copy-name #(clipboard/to-clipboard (:name token))
         on-duplicate-token #(st/emit! (dwtl/duplicate-token (:id token)))]
@@ -361,7 +372,8 @@
       :no-selectable true
       :action #(on-delete-token token)}]))
 
-(defn- allowed-shape-attributes [shapes]
+(defn- allowed-shape-attributes
+  [shapes]
   (reduce into #{} (map #(ctt/shape-type->attributes (:type %) (:layout %)) shapes)))
 
 (defn menu-actions [{:keys [type token selected-shapes] :as context-data}]
@@ -370,14 +382,16 @@
         attribute-actions (if with-actions (with-actions context-data) [])]
     attribute-actions))
 
-(defn selection-actions [context-data]
+(defn selection-actions
+  [context-data]
   (let [attribute-actions (menu-actions context-data)]
     (concat
      attribute-actions
      (when (seq attribute-actions) [:separator])
      (default-actions context-data))))
 
-(defn submenu-actions-selection-actions [context-data]
+(defn submenu-actions-selection-actions
+  [context-data]
   (menu-actions context-data))
 
 ;; Components ------------------------------------------------------------------
@@ -426,29 +440,27 @@
            (when (some? parent-menu-dom-element)
              (reset! parent-menu-dom-element-pos* (dm/str (.-offsetTop parent-menu-dom-element) "px")))))]
 
-    [:li {:class (stl/css-case
-                  :context-menu-item true
-                  :context-menu-item-selected (and (not no-selectable) selected?)
-                  :context-menu-item-unselected (and (not no-selectable) (not selected?))
-                  :context-menu-item-hint-wrapper hint?)
+    [:li {:class (stl/css-case :menu-item true
+                               :selected (and (not no-selectable) selected?)
+                               :unselected (and (not no-selectable) (not selected?))
+                               :hint hint?)
           :ref get-parent-menu-entry-position
           :data-value value
           :on-click on-click
           :on-pointer-enter on-pointer-enter
           :on-pointer-leave on-pointer-leave}
      (when hint
-       [:span {:class (stl/css :context-menu-item-hint)} hint])
+       [:span {:class (stl/css :menu-item-hint)} hint])
      (when (not no-selectable)
-       [:> icon* {:icon-id i/tick :size "s" :class (stl/css :icon-wrapper)}])
-     [:span {:class (stl/css :item-text)}
+       [:> icon* {:icon-id i/tick :size "s" :class (stl/css :menu-item-icon)}])
+     [:span {:class (stl/css :menu-item-text)}
       title]
      (when children
        [:*
         [:> icon* {:icon-id i/arrow :size "s"}]
         [:ul {:ref submenu-ref
-              :class (stl/css-case
-                      :token-context-submenu true
-                      :token-context-submenu-top is-submenu-outside?)
+              :class (stl/css-case :submenu true
+                                   :submenu-top is-submenu-outside?)
               :style {:left (dm/str submenu-offset "px")
                       :top (if is-submenu-outside? "unset" parent-menu-dom-element-pos)}
               :on-context-menu prevent-default}
@@ -503,7 +515,7 @@
           (when (contains? #{:spacing :dimensions} token-type)
             (some #(ctsl/any-layout-immediate-child? objects %) selected-shapes)))]
 
-    [:ul {:class (stl/css :context-list)}
+    [:ul {:class (stl/css :menu)}
      [:& menu-tree {:submenu-offset width
                     :token token
                     :errors errors
@@ -550,7 +562,7 @@
        (mf/html
         [:& dropdown {:show is-open?
                       :on-close #(st/emit! (dwtl/assign-token-context-menu nil))}
-         [:div {:class (stl/css :token-context-menu)
+         [:div {:class (stl/css :menu-wrapper)
                 :data-testid "tokens-context-menu-for-token"
                 :ref dropdown-ref
                 :data-direction dropdown-direction
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.scss b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.scss
index a7ab8ec0d6..a50dc6e193 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/management/context_menu.scss
@@ -4,131 +4,115 @@
 //
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
+@use "ds/_borders.scss" as *;
+@use "ds/_sizes.scss" as *;
+@use "ds/_utils.scss" as *;
 @use "ds/typography.scss" as *;
-@use "refactor/common-refactor.scss" as deprecated;
 
-.token-context-menu {
+.menu-wrapper {
   position: absolute;
-  z-index: deprecated.$z-index-4;
+  z-index: var(--z-index-dropdown);
 }
 
-.token-context-menu[data-direction="up"] {
+.menu-wrapper[data-direction="up"] {
   bottom: var(--bottom);
 }
 
-.token-context-menu[data-direction="down"] {
+.menu-wrapper[data-direction="down"] {
   top: var(--top);
 }
 
-.context-list,
-.token-context-submenu {
-  @include deprecated.menu-shadow;
-
+.menu,
+.submenu {
+  box-shadow: 0 0 px2rem(12) 0 var(--color-shadow-dark);
   display: grid;
-  width: deprecated.$s-240;
-  padding: deprecated.$s-4;
-  border-radius: deprecated.$br-8;
-  border: deprecated.$s-2 solid var(--color-background-quaternary);
+  inline-size: px2rem(240);
+  padding: var(--sp-xs);
+  border-radius: $br-8;
+  border: $b-2 solid var(--color-background-quaternary);
   background-color: var(--color-background-tertiary);
-  max-height: 100vh;
+  max-block-size: 100vh;
   overflow-y: auto;
 }
 
-.token-context-submenu {
+.submenu {
   display: none;
-}
-
-.token-context-submenu-top {
-  bottom: 80px;
-}
-
-.token-context-submenu {
   position: absolute;
-  padding: deprecated.$s-4;
-  margin-left: deprecated.$s-6;
+  padding: var(--sp-xs);
+  margin-inline-start: px2rem(6);
+}
+
+.submenu-top {
+  inset-block-end: px2rem(80);
 }
 
 .separator {
-  margin: deprecated.$s-6;
-  border-block-start: deprecated.$s-1 solid var(--panel-border-color);
+  margin: px2rem(6);
+  border-block-start: $b-1 solid var(--color-background-quaternary);
 }
 
-.context-menu-item {
-  --context-menu-item-bg-color: none;
-  --context-menu-item-fg-color: var(--color-foreground-primary);
-  --context-menu-item-border-color: none;
+.menu-item {
+  --menu-item-bg-color: none;
+  --menu-item-fg-color: var(--color-foreground-primary);
+  --menu-item-border-color: none;
+  --menu-item-icon-color: none;
 
   @include use-typography("body-small");
 
+  cursor: default;
   display: flex;
   align-items: center;
-  height: deprecated.$s-32;
-  width: 100%;
-  padding: deprecated.$s-8;
-  border-radius: deprecated.$br-8;
-  color: var(--context-menu-item-fg-color);
-  background-color: var(--context-menu-item-bg-color);
-  border: deprecated.$s-1 solid var(--context-menu-item-border-color);
-  cursor: pointer;
+  block-size: $sz-32;
+  inline-size: 100%;
+  padding: var(--sp-s);
+  border-radius: $br-8;
+  color: var(--menu-item-fg-color);
+  background-color: var(--menu-item-bg-color);
+  border: $b-1 solid var(--menu-item-border-color);
 
   &:hover {
-    --context-menu-item-bg-color: var(--color-background-quaternary);
+    --menu-item-bg-color: var(--color-background-quaternary);
   }
 
   &:focus {
-    --context-menu-item-bg-color: var(--menu-background-color-focus);
-    --context-menu-item-border-color: var(--color-background-tertiary);
+    --menu-item-bg-color: var(--color-background-tertiary);
+    --menu-item-border-color: var(--color-background-tertiary);
   }
 
-  &[aria-selected="true"] {
-    --context-menu-item-bg-color: var(--color-background-quaternary);
-  }
-}
-
-.context-menu-item-hint-wrapper {
-  position: relative;
-}
-
-.context-menu-item-selected {
-  & .icon-wrapper {
-    color: var(--color-accent-primary);
-  }
-}
-
-.context-menu-item-unselected {
-  color: var(--color-foreground-secondary);
-
-  & .icon-wrapper {
-    color: var(--color-background-quaternary);
+  &.selected {
+    --menu-item-icon-color: var(--color-accent-primary);
   }
 
-  &:hover {
-    color: var(--color-foreground-primary);
+  &.unselected {
+    --menu-item-fg-color: var(--color-foreground-secondary);
+    --menu-item-icon-color: var(--color-background-quaternary);
 
-    & .icon-wrapper {
-      color: var(--color-foreground-secondary);
+    &:hover {
+      --menu-item-fg-color: var(--color-foreground-primary);
+      --menu-item-icon-color: var(--color-foreground-secondary);
     }
   }
+
+  &.hint {
+    position: relative;
+  }
 }
 
-.context-menu-item-hint {
+.menu-item-hint {
   position: absolute;
   background-color: var(--color-background-primary);
-  border-radius: deprecated.$br-6;
-  padding: deprecated.$s-4;
-  inset-inline-end: deprecated.$s-4;
-  inset-block-start: deprecated.$s-4;
+  border-radius: $br-6;
+  padding: var(--sp-xs);
+  inset-inline-end: var(--sp-xs);
+  inset-block-start: var(--sp-xs);
   color: var(--color-foreground-secondary);
 }
 
-.item-text {
+.menu-item-text {
   flex-grow: 1;
 }
 
-.item-with-icon-space {
-  padding-left: deprecated.$s-20;
-}
-
-.icon-wrapper {
-  margin-right: deprecated.$s-4;
+.menu-item-icon {
+  color: var(--menu-item-icon-color);
+  margin-inline-end: var(--sp-xs);
 }
diff --git a/frontend/src/app/main/ui/workspace/top_toolbar.cljs b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
index 819f41b80c..2590122475 100644
--- a/frontend/src/app/main/ui/workspace/top_toolbar.cljs
+++ b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
@@ -7,6 +7,7 @@
 (ns app.main.ui.workspace.top-toolbar
   (:require-macros [app.main.style :as stl])
   (:require
+   [app.common.data :as d]
    [app.common.geom.point :as gpt]
    [app.config :as cf]
    [app.main.data.event :as ev]
@@ -28,7 +29,9 @@
    [app.main.ui.ds.foundations.assets.icon :as i]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
+   [app.util.keyboard :as kbd]
    [app.util.timers :as ts]
+   [beicon.v2.core :as rx]
    [okulary.core :as l]
    [rumext.v2 :as mf]))
 
@@ -97,7 +100,10 @@
   {::mf/private true
    ::mf/wrap [mf/memo]}
   [{:keys [group drawtool on-select-tool]}]
-  (let [default-tool*  (mf/use-state (active-group-tool group drawtool))
+  (let [li-ref         (mf/use-ref nil)
+        flyout-ref     (mf/use-ref nil)
+
+        default-tool*  (mf/use-state (active-group-tool group drawtool))
         default-tool   (deref default-tool*)
 
         open*          (mf/use-state false)
@@ -114,6 +120,7 @@
         on-select-tool
         (mf/use-fn
          (fn [event]
+           (reset! open* false)
            (on-select-tool event)))
 
         on-display-menu
@@ -138,7 +145,50 @@
             (ts/schedule 350
                          #(do
                             (reset! open* false)
-                            (mf/set-ref-val! close-timer* nil))))))]
+                            (mf/set-ref-val! close-timer* nil))))))
+
+        on-main-key-down
+        (mf/use-fn
+         (fn [event]
+           (cond
+             (kbd/space? event)
+             (do
+               (dom/prevent-default event)
+               (cancel-timer! close-timer*)
+               (reset! open* true))
+
+             (and open (kbd/esc? event))
+             (reset! open* false))))
+
+        on-flyout-key-down
+        (mf/use-fn
+         (fn [event]
+           (let [flyout (mf/ref-val flyout-ref)]
+             (when flyout
+               (let [items  (vec (dom/query-all flyout "[role=menuitemradio]"))
+                     active (dom/get-active)
+                     idx    (d/index-of-pred items #(identical? % active))]
+                 (cond
+                   (kbd/space? event)
+                   (when active
+                     (dom/prevent-default event)
+                     (dom/click active))
+
+                   (kbd/esc? event)
+                   (do
+                     (reset! open* false)
+                     (when-let [li (mf/ref-val li-ref)]
+                       (when-let [btn (.. li (querySelector "div[role=group] > button"))]
+                         (dom/focus! btn))))
+
+                   (kbd/tab? event)
+                   (do
+                     (dom/prevent-default event)
+                     (let [shift? (.-shiftKey ^js event)
+                           next-idx (if shift?
+                                      (if (or (nil? idx) (zero? idx)) (dec (count items)) (dec idx))
+                                      (if (or (nil? idx) (= idx (dec (count items)))) 0 (inc idx)))]
+                       (dom/focus! (nth items next-idx))))))))))]
 
     (mf/with-effect []
       (fn []
@@ -148,7 +198,14 @@
     (mf/with-effect [drawtool group]
       (reset! default-tool* (active-group-tool group drawtool)))
 
-    [:li {:class (stl/css :toolbar-group)
+    (mf/with-effect []
+      (let [subs (->> st/stream
+                      (rx/filter #(= % :interrupt))
+                      (rx/subs! #(reset! open* false)))]
+        #(rx/dispose! subs)))
+
+    [:li {:ref li-ref
+          :class (stl/css :toolbar-group)
           :on-pointer-enter on-display-menu
           :on-pointer-leave on-hide-menu}
      [:div {:role "group"
@@ -162,12 +219,15 @@
                         :has-tooltip false
                         :icon default-icon
                         :on-click on-select-tool
+                        :on-key-down on-main-key-down
                         :data-tool (name default-tool)}]
 
-      [:ul {:role "menu"
+      [:ul {:ref flyout-ref
+            :role "menu"
             :class (stl/css-case :toolbar-group-flyout true
                                  :open open)
-            :aria-label menu-label}
+            :aria-label menu-label
+            :on-key-down on-flyout-key-down}
 
        (for [[id {:keys [icon]}] subtools]
          [:li {:key (name id)
@@ -337,7 +397,7 @@
     (when-not ^boolean read-only?
       [:div {:role "toolbar"
              :aria-label (tr "workspace.toolbar.label")
-             :tabindex "0"
+             :tab-index "0"
              :class (stl/css-case :toolbar true
                                   :no-rulers (not rulers-enabled)
                                   :hidden toolbar-hidden)}
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 6841784f44..5f71417631 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -508,6 +508,7 @@
                   (not transform)
                   (not text-editing?)
                   (not edition)
+                  (not read-only?)
                   (not mode-inspect?))
          [:> msr/selection-size-badge*
           {:shapes selected-shapes
diff --git a/frontend/src/app/main/ui/workspace/viewport/gradients.cljs b/frontend/src/app/main/ui/workspace/viewport/gradients.cljs
index bc16b89045..ec2f9b586c 100644
--- a/frontend/src/app/main/ui/workspace/viewport/gradients.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/gradients.cljs
@@ -189,6 +189,7 @@
                    lv (-> (gpt/to-vec from-p to-p) (gpt/unit))
                    nv (gpt/normal-left lv)
                    offset (-> (gsp/project-t position [from-p to-p] nv)
+                              (mth/clamp 0 1)
                               (mth/precision 2))
                    new-stop (cc/interpolate-gradient stops offset)
                    stops (conj stops new-stop)
@@ -447,12 +448,38 @@
                    :r (/ 4 zoom)
                    :fill "var(--app-white)"}]))]))
 
+;; The gradient geometry is defined in objectBoundingBox units, so the
+;; perpendicular of the gradient vector has to be taken in that normalized
+;; space and only afterwards mapped to the shape dimensions. Doing it the other
+;; way around blows the handler up by the shape aspect ratio (see #10069).
+
+(defn radial-width-point
+  "Position, in shape local coordinates, of the radial gradient width handler."
+  [{:keys [x y width height]} gradient]
+  (let [{:keys [start-x start-y end-x end-y] gwidth :width} gradient
+        vx (- end-x start-x)
+        vy (- end-y start-y)]
+    (gpt/point (+ x (* width (+ start-x (* gwidth vy))))
+               (+ y (* height (- start-y (* gwidth vx)))))))
+
+(defn point->gradient-width
+  "Inverse of `radial-width-point`: the radial gradient `:width` factor that
+  places its width handler on the given shape local coordinates point."
+  [{:keys [x y width height]} gradient point]
+  (let [{:keys [start-x start-y end-x end-y]} gradient
+        dx (- (/ (- (:x point) x) width) start-x)
+        dy (- (/ (- (:y point) y) height) start-y)]
+    (/ (mth/hypot dx dy)
+       (mth/hypot (- end-x start-x) (- end-y start-y)))))
+
 (mf/defc gradient-handlers-impl*
   [{:keys [zoom stops gradient editing shape]}]
   (let [transform         (gsh/transform-matrix shape)
         transform-inverse (gsh/inverse-transform-matrix shape)
 
-        {:keys [x y width height] :as sr} (:selrect shape)
+        selrect (:selrect shape)
+
+        {:keys [x y width height]} selrect
 
         from-p (-> (gpt/point (+ x (* width (:start-x gradient)))
                               (+ y (* height (:start-y gradient))))
@@ -461,15 +488,9 @@
                               (+ y (* height (:end-y gradient))))
                    (gpt/transform transform))
 
-        gradient-vec    (gpt/to-vec from-p to-p)
-        gradient-length (gpt/length gradient-vec)
-
-        width-v (-> gradient-vec
-                    (gpt/normal-right)
-                    (gpt/multiply (gpt/point (* (:width gradient) (/ gradient-length (/ height 2)))))
-                    (gpt/multiply (gpt/point (/ width 2))))
-
-        width-p (gpt/add from-p width-v)
+        width-p (when (= :radial (:type gradient))
+                  (-> (radial-width-point selrect gradient)
+                      (gpt/transform transform)))
 
         change!
         (mf/use-fn
@@ -496,19 +517,18 @@
 
         on-change-width
         (mf/use-fn
-         (mf/deps gradient-length width height)
+         (mf/deps transform-inverse selrect gradient)
          (fn [point]
-           (let [scale-factor-y (/ gradient-length (/ height 2))
-                 norm-dist (/ (gpt/distance point from-p)
-                              (* (/ width 2) scale-factor-y))]
-             (when (and norm-dist (d/num? norm-dist))
+           (let [point     (gpt/transform point transform-inverse)
+                 norm-dist (point->gradient-width selrect gradient point)]
+             (when (d/num? norm-dist)
                (change! {:width norm-dist})))))]
 
     [:> gradient-handler-transformed*
      {:editing editing
       :from-p from-p
       :to-p to-p
-      :width-p (when (= :radial (:type gradient)) width-p)
+      :width-p width-p
       :stops stops
       :zoom zoom
       :on-change-start on-change-start
diff --git a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs
index e59e984967..b851d09c4e 100644
--- a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs
@@ -28,6 +28,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.css-cursors :as cur]
+   [app.main.ui.ds.buttons.button :refer [button*]]
    [app.main.ui.formats :as fmt]
    [app.main.ui.icons :as deprecated-icon]
    [app.main.ui.workspace.viewport.viewport-ref :as uwvv]
@@ -52,18 +53,17 @@
     :flex (dm/str (fmt/format-number value) "FR")
     :auto "AUTO"))
 
-(mf/defc grid-edition-actions
-  {::mf/wrap-props false}
+(mf/defc grid-edition-actions*
   [{:keys [shape]}]
   [:div {:class (stl/css :grid-actions)}
    [:div {:class (stl/css :grid-actions-container)}
     [:div {:class (stl/css :grid-actions-title)}
      (tr "workspace.layout-grid.editor.title")  " " [:span {:stl/css :board-name} (:name shape)]]
-    [:button {:class (stl/css :locate-btn)
-              :on-click #(st/emit! (dwge/locate-board (:id shape)))}
+    [:> button* {:variant "secondary"
+                 :on-click #(st/emit! (dwge/locate-board (:id shape)))}
      (tr "workspace.layout-grid.editor.top-bar.locate")]
-    [:button {:class (stl/css :done-btn)
-              :on-click #(st/emit! (dw/clear-edition-mode))}
+    [:> button* {:variant "primary"
+                 :on-click #(st/emit! (dw/clear-edition-mode))}
      (tr "workspace.layout-grid.editor.top-bar.done")]]])
 
 (mf/defc grid-editor-frame
diff --git a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
index e9d929f847..26d473689c 100644
--- a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
+++ b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
@@ -5,6 +5,7 @@
 // Copyright (c) KALEIDOS INC Sucursal en España SL
 
 @use "refactor/common-refactor.scss" as deprecated;
+@use "ds/z-index.scss" as *;
 
 .grid-track-marker {
   .marker-shape {
@@ -123,7 +124,7 @@
   position: absolute;
   top: deprecated.$s-44;
   left: 50%;
-  z-index: deprecated.$z-index-20;
+  z-index: var(--z-index-notifications);
 }
 
 .grid-actions-container {
@@ -148,22 +149,6 @@
   padding-left: deprecated.$s-8;
 }
 
-.locate-btn {
-  @extend %button-secondary;
-
-  text-transform: uppercase;
-  padding: deprecated.$s-8 deprecated.$s-20;
-  font-size: deprecated.$fs-11;
-}
-
-.done-btn {
-  @extend %button-primary;
-
-  text-transform: uppercase;
-  padding: deprecated.$s-8 deprecated.$s-20;
-  font-size: deprecated.$fs-11;
-}
-
 .close-btn {
   @extend %button-tertiary;
 
diff --git a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
index 141986c4f2..d820f01aa2 100644
--- a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
@@ -479,7 +479,7 @@
 
 (defn setup-shortcuts
   [path-editing? drawing-path? text-editing? grid-editing?]
-  (hooks/use-shortcuts ::workspace wsc/shortcuts)
+  (hooks/use-shortcuts ::workspace wsc/shortcuts :workspace)
 
   (mf/with-effect []
     (.addEventListener js/window "keydown" wsc/on-display-guides-keydown)
@@ -490,18 +490,20 @@
     (cond
       grid-editing?
       (do
-        (st/emit! (dsc/push-shortcuts ::grid gsc/shortcuts))
+        (st/emit! (dsc/push-shortcuts ::grid gsc/shortcuts :workspace
+                                      :merge-shortcuts :auto))
         (fn []
           (st/emit! (dsc/pop-shortcuts ::grid))))
 
       (or drawing-path? path-editing?)
       (do
-        (st/emit! (dsc/push-shortcuts ::path psc/shortcuts))
+        (st/emit! (dsc/push-shortcuts ::path psc/shortcuts :workspace
+                                      :merge-shortcuts :auto))
         (fn []
           (st/emit! (dsc/pop-shortcuts ::path))))
 
       text-editing?
       (do
-        (st/emit! (dsc/push-shortcuts ::text tsc/shortcuts))
+        (st/emit! (dsc/push-shortcuts ::text tsc/shortcuts :workspace))
         (fn []
           (st/emit! (dsc/pop-shortcuts ::text)))))))
diff --git a/frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs b/frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs
index afc461b4c6..c756f06e52 100644
--- a/frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/pixel_overlay.cljs
@@ -56,51 +56,52 @@
 
 (defn process-pointer-move
   [viewport-node canvas canvas-image-data zoom-view-context last-picked-color client-x client-y]
-  (when-let [image-data (mf/ref-val canvas-image-data)]
-    (when-let [zoom-view-node (dom/get-element "picker-detail")]
-      (when-not (mf/ref-val zoom-view-context)
-        (mf/set-ref-val! zoom-view-context (.getContext zoom-view-node "2d")))
-      (let [canvas-width  260
-            canvas-height 140
-            {brx :left bry :top} (dom/get-bounding-rect viewport-node)
+  (when viewport-node
+    (when-let [image-data (mf/ref-val canvas-image-data)]
+      (when-let [zoom-view-node (dom/get-element "picker-detail")]
+        (when-not (mf/ref-val zoom-view-context)
+          (mf/set-ref-val! zoom-view-context (.getContext zoom-view-node "2d")))
+        (let [canvas-width  260
+              canvas-height 140
+              {brx :left bry :top} (dom/get-bounding-rect viewport-node)
 
-            x (mth/floor (- client-x brx))
-            y (mth/floor (- client-y bry))
+              x (mth/floor (- client-x brx))
+              y (mth/floor (- client-y bry))
 
-            img-width  (unchecked-get image-data "width")
-            img-height (unchecked-get image-data "height")
+              img-width  (unchecked-get image-data "width")
+              img-height (unchecked-get image-data "height")
 
-            zoom-context (mf/ref-val zoom-view-context)
+              zoom-context (mf/ref-val zoom-view-context)
 
-            sx (- x 32)
-            sy (if (cfg/check-browser? :safari) y (- y 17))
-            sw 65
-            sh 35
-            dx 0
-            dy 0
-            dw canvas-width
-            dh canvas-height]
+              sx (- x 32)
+              sy (if (cfg/check-browser? :safari) y (- y 17))
+              sw 65
+              sh 35
+              dx 0
+              dy 0
+              dw canvas-width
+              dh canvas-height]
 
-        (when (obj/get zoom-context "imageSmoothingEnabled")
-          (obj/set! zoom-context "imageSmoothingEnabled" false))
-        (.clearRect zoom-context 0 0 canvas-width canvas-height)
-        (.drawImage zoom-context canvas sx sy sw sh dx dy dw dh)
+          (when (obj/get zoom-context "imageSmoothingEnabled")
+            (obj/set! zoom-context "imageSmoothingEnabled" false))
+          (.clearRect zoom-context 0 0 canvas-width canvas-height)
+          (.drawImage zoom-context canvas sx sy sw sh dx dy dw dh)
 
-        ;; Only pick color when cursor is within canvas bounds to avoid garbage pixels
-        (when (and (>= x 0) (< x img-width) (>= y 0) (< y img-height))
-          (let [offset (* (+ (* y img-width) x) 4)
-                rgba   (unchecked-get image-data "data")
-                r      (d/check-num (obj/get rgba (+ 0 offset)) 255)
-                g      (d/check-num (obj/get rgba (+ 1 offset)) 255)
-                b      (d/check-num (obj/get rgba (+ 2 offset)) 255)
-                a      (d/check-num (obj/get rgba (+ 3 offset)) 255)
-                color  [r g b a]]
-            ;; Store latest color synchronously so the click handler always reads
-            ;; the correct pixel even before the rAF fires (fixes race condition)
-            (mf/set-ref-val! last-picked-color color)
-            (timers/raf
-             (fn []
-               (st/emit! (dwc/pick-color color))))))))))
+          ;; Only pick color when cursor is within canvas bounds to avoid garbage pixels
+          (when (and (>= x 0) (< x img-width) (>= y 0) (< y img-height))
+            (let [offset (* (+ (* y img-width) x) 4)
+                  rgba   (unchecked-get image-data "data")
+                  r      (d/check-num (obj/get rgba (+ 0 offset)) 255)
+                  g      (d/check-num (obj/get rgba (+ 1 offset)) 255)
+                  b      (d/check-num (obj/get rgba (+ 2 offset)) 255)
+                  a      (d/check-num (obj/get rgba (+ 3 offset)) 255)
+                  color  [r g b a]]
+              ;; Store latest color synchronously so the click handler always reads
+              ;; the correct pixel even before the rAF fires (fixes race condition)
+              (mf/set-ref-val! last-picked-color color)
+              (timers/raf
+               (fn []
+                 (st/emit! (dwc/pick-color color)))))))))))
 
 
 (mf/defc pixel-overlay*
@@ -260,18 +261,19 @@
 (defn- viewport->canvas-coords
   "Maps client (viewport) coordinates to device-pixel canvas coordinates."
   [viewport-node client-x client-y]
-  (let [{brx :left bry :top} (dom/get-bounding-rect viewport-node)
-        dpr (wasm.api/get-dpr)
-        x (mth/floor (- client-x brx))
-        y (mth/floor (- client-y bry))]
-    [(mth/floor (* x dpr))
-     (mth/floor (* y dpr))]))
+  (when viewport-node
+    (let [{brx :left bry :top} (dom/get-bounding-rect viewport-node)
+          dpr (wasm.api/get-dpr)
+          x (mth/floor (- client-x brx))
+          y (mth/floor (- client-y bry))]
+      [(mth/floor (* x dpr))
+       (mth/floor (* y dpr))])))
 
 (defn process-pointer-move-wasm
   "Updates the magnifier loupe with the canvas region under the cursor. The
    actual color is only read on click (see `pick-color-at-wasm`)."
   [viewport-node canvas zoom-view-context client-x client-y]
-  (when canvas
+  (when (and canvas viewport-node)
     (when-let [zoom-view-node (dom/get-element "picker-detail")]
       (when-not (mf/ref-val zoom-view-context)
         (mf/set-ref-val! zoom-view-context (.getContext zoom-view-node "2d")))
@@ -309,7 +311,7 @@
    the correct color even on GPUs where a raw WebGL `readPixels` returned
    values with their byte order swapped."
   [viewport-node canvas client-x client-y]
-  (when canvas
+  (when (and canvas viewport-node)
     (let [[canvas-x canvas-y] (viewport->canvas-coords viewport-node client-x client-y)
           img-width  (.-width canvas)
           img-height (.-height canvas)]
@@ -370,7 +372,7 @@
         handle-draw-picker-canvas
         (mf/use-callback
          (fn []
-           (when canvas
+           (when (and canvas viewport-node)
              ;; Read current mouse position from ref so the loupe refreshes on
              ;; each render even without a mouse-move.
              (let [{mx :x my :y} (mf/ref-val initial-mouse-pos)]
diff --git a/frontend/src/app/main/ui/workspace/viewport/selection.cljs b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
index 9e497ef8d0..4315ff2d0b 100644
--- a/frontend/src/app/main/ui/workspace/viewport/selection.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
@@ -18,6 +18,8 @@
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.shapes :as dwsh]
+   [app.main.data.workspace.wasm-text :as dwwt]
+   [app.main.features :as features]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.context :as ctx]
@@ -26,6 +28,7 @@
    [app.util.debug :as dbg]
    [app.util.dom :as dom]
    [app.util.object :as obj]
+   [potok.v2.core :as ptk]
    [rumext.v2 :as mf]))
 
 (def rotation-handler-size 20)
@@ -295,13 +298,20 @@
         on-double-click
         (mf/use-fn
          (mf/deps shape-id position shape-type)
-         (fn [_event]
+         (fn [event]
            (when (= shape-type :text)
-             (cond
-               (= position :right)
-               (st/emit! (dwsh/update-shapes [shape-id] #(assoc % :grow-type :auto-width)))
-               (= position :bottom)
-               (st/emit! (dwsh/update-shapes [shape-id] #(assoc % :grow-type :auto-height)))))))]
+             ;; Prevent the viewport double-click handler from entering text editor
+             (dom/stop-propagation event)
+             (let [grow-type (case position
+                               :right :auto-width
+                               :bottom :auto-height
+                               nil)]
+               (when (some? grow-type)
+                 (st/emit! (dwsh/update-shapes [shape-id] #(assoc % :grow-type grow-type)))
+                 ;; The WASM renderer needs an explicit reflow after the grow-type change
+                 (when (features/active-feature? @st/state "render-wasm/v1")
+                   (st/emit! (dwwt/resize-wasm-text-all [shape-id])
+                             (ptk/data-event :layout/update {:ids [shape-id]}))))))))]
 
     [:g.resize-handler
      (when ^boolean show-handler
@@ -321,6 +331,7 @@
              :height height
              :class cursor
              :data-position (name position)
+             :data-testid (dm/str "resize-side-handler-" (name position))
              :transform transform-str
              :on-pointer-down on-resize
              :on-double-click on-double-click
diff --git a/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs b/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
index 4f0e8f122d..c92c357d25 100644
--- a/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
@@ -12,7 +12,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.ds.buttons.button :refer [button*]]
-   [app.main.ui.workspace.viewport.grid-layout-editor :refer [grid-edition-actions]]
+   [app.main.ui.workspace.viewport.grid-layout-editor :refer [grid-edition-actions*]]
    [app.main.ui.workspace.viewport.path-actions :refer [path-actions*]]
    [app.util.i18n :as i18n :refer [tr]]
    [rumext.v2 :as mf]))
@@ -55,4 +55,4 @@
 
 (mf/defc grid-edition-bar*
   [{:keys [shape]}]
-  [:& grid-edition-actions {:shape shape}])
+  [:> grid-edition-actions* {:shape shape}])
diff --git a/frontend/src/app/main/ui/workspace/viewport/viewport_ref.cljs b/frontend/src/app/main/ui/workspace/viewport/viewport_ref.cljs
index 46e1356596..38349f8f24 100644
--- a/frontend/src/app/main/ui/workspace/viewport/viewport_ref.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/viewport_ref.cljs
@@ -7,62 +7,75 @@
 (ns app.main.ui.workspace.viewport.viewport-ref
   (:require
    [app.common.data :as d]
-   [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]
+   [app.main.refs :as refs]
    [app.main.store :as st]
    [app.util.dom :as dom]
    [app.util.mouse :as mse]
-   [goog.events :as events]
-   [rumext.v2 :as mf])
-  (:import goog.events.EventType))
+   [rumext.v2 :as mf]))
 
 (defonce viewport-ref (atom nil))
-(defonce current-observer (atom nil))
 (defonce viewport-brect (atom nil))
 
-(defn init-observer
-  [node on-change-bounds]
+(defn- init-observer
+  [node]
+  (let [on-change-bounds
+        (fn [_]
+          (let [brect (dom/get-bounding-rect node)
+                brect (gpt/point (d/parse-integer (:left brect))
+                                 (d/parse-integer (:top brect)))]
+            (reset! viewport-brect brect)))
 
-  (let [observer (js/ResizeObserver. on-change-bounds)]
-    (when (some? @current-observer)
-      (.disconnect @current-observer))
+        observer
+        (js/ResizeObserver. on-change-bounds)]
 
-    (reset! current-observer observer)
-
-    (when (some? node)
-      (.observe observer node))))
-
-(defn on-change-bounds
-  [_]
-  (when @viewport-ref
-    (let [brect (dom/get-bounding-rect @viewport-ref)
-          brect (gpt/point (d/parse-integer (:left brect))
-                           (d/parse-integer (:top brect)))]
-      (reset! viewport-brect brect))))
+    (.observe observer node)
+    observer))
 
 (defn create-viewport-ref
   []
-  (let [ref (mf/use-ref nil)]
-    [ref
-     (mf/use-memo
-      #(fn [node]
-         (mf/set-ref-val! ref node)
-         (reset! viewport-ref node)
-         (when (some? node)
-           (events/listen node EventType.MOUSELEAVE (fn [] (st/emit! (mse/->BlurEvent)))))
-         (init-observer node on-change-bounds)))]))
+  (let [node-ref     (mf/use-ref nil)
+        handler-ref  (mf/use-ref nil)
+        observer-ref (mf/use-ref nil)
+        callback     (mf/use-fn
+                      (fn [node]
+                        ;; Dispose all previous resources
+                        (when-let [observer (mf/ref-val observer-ref)]
+                          (.disconnect ^js observer)
+                          (mf/set-ref-val! observer-ref nil))
+
+
+                        (when-let [handler (mf/ref-val handler-ref)]
+                          (when-let [node (mf/ref-val node-ref)]
+                            (.removeEventListener ^js node "mouseleave" handler)
+                            (mf/set-ref-val! handler-ref nil)))
+
+                        ;; Reset the ref values to the current node (can be nil)
+                        (mf/set-ref-val! node-ref node)
+                        (reset! viewport-ref node)
+
+                        (when (some? node)
+                          (let [handler  (fn [] (st/emit! (mse/->BlurEvent)))
+                                observer (init-observer node)]
+                            (.addEventListener ^js node "mouseleave" handler)
+
+                            (mf/set-ref-val! handler-ref handler)
+                            (mf/set-ref-val! observer-ref observer)))))]
+    [node-ref callback]))
 
 (defn point->viewport
   [pt]
-  (let [zoom (dm/get-in @st/state [:workspace-local :zoom] 1)]
-    (when (and (some? @viewport-ref)
-               (some? @viewport-brect))
-      (let [vbox     (.. ^js @viewport-ref -viewBox -baseVal)
-            brect    @viewport-brect
-            box      (gpt/point (.-x vbox) (.-y vbox))
-            zoom     (gpt/point zoom)]
+  (let [zoom          (d/nilv @refs/selected-zoom 1)
+        viewport-node  @viewport-ref
+        viewport-brect @viewport-brect]
 
-        (-> (gpt/subtract pt brect)
+    (when (and (some? viewport-brect)
+               (some? viewport-node))
+      (let [vbox (.. ^js viewport-node -viewBox -baseVal)
+            box  (gpt/point (.-x vbox) (.-y vbox))
+            zoom (gpt/point zoom)]
+
+        (-> (gpt/subtract pt viewport-brect)
             (gpt/divide zoom)
             (gpt/add box))))))
 
@@ -71,8 +84,8 @@
    Unlike point->viewport, this does NOT convert to canvas coordinates -
    it just subtracts the viewport's bounding rect offset."
   [pt]
-  (when (some? @viewport-brect)
-    (gpt/subtract pt @viewport-brect)))
+  (when-let [brect @viewport-brect]
+    (gpt/subtract pt brect)))
 
 (defn inside-viewport?
   [target]
diff --git a/frontend/src/app/main/ui/workspace/viewport_wasm.cljs b/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
index 4a0c4a80b2..b55d8c554c 100644
--- a/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
@@ -586,19 +586,22 @@
            (wasm.api/text-editor-apply-theme)
            (wasm.api/request-render "text-editor-colors-theme")))))
 
-    ;; Ruler overlay updates below only change the UI surface, not the shapes.
-    ;; They use `render-from-cache!` (cached tiles + UI, atomic) instead of a full
-    ;; `request-render`, which would kick off a progressive tile-by-tile shape
-    ;; re-render that flashes on zoomed-in views (see penpot ruler-selection flash).
+    ;; Ruler overlay updates below only change the UI surface, not the shapes,
+    ;; and they fire on a stable viewbox (toggles / selection changes, not pan).
+    ;; They re-present via `render-from-backbuffer!` — reusing the crisp last
+    ;; frame + fresh UI — instead of a full `request-render` (which would kick
+    ;; off a progressive tile-by-tile re-render that flashes) or a cached-atlas
+    ;; blit (whose scale-capped atlas flashes crisp->blurry on zoomed-in views,
+    ;; e.g. when the text editor opens at high zoom).
     (mf/with-effect [@canvas-init? frame-visible?]
       (when @canvas-init?
         (wasm.api/set-rulers-frame-visible! frame-visible?)
-        (wasm.api/render-from-cache!)))
+        (wasm.api/render-from-backbuffer!)))
 
     (mf/with-effect [@canvas-init? show-rulers?]
       (when @canvas-init?
         (wasm.api/set-rulers-visible! show-rulers?)
-        (wasm.api/render-from-cache!)))
+        (wasm.api/render-from-backbuffer!)))
 
     (mf/with-effect [@canvas-init? show-rulers? offset-x offset-y]
       (when (and @canvas-init? show-rulers?)
@@ -609,7 +612,7 @@
                      (some-> ruler-selection :width) (some-> ruler-selection :height)]
       (when (and @canvas-init? show-rulers?)
         (wasm.api/set-rulers-selection! ruler-selection)
-        (wasm.api/render-from-cache!)))
+        (wasm.api/render-from-backbuffer!)))
 
     ;; Paint background + rulers instantly, before shapes finish loading. Runs
     ;; after the ruler push effects so the WASM ruler state is already set.
@@ -793,6 +796,7 @@
                   (not transform)
                   (not text-editing?)
                   (not edition)
+                  (not read-only?)
                   (not mode-inspect?)
                   (not page-transition?))
          [:> msr/selection-size-badge*
diff --git a/frontend/src/app/plugins/api.cljs b/frontend/src/app/plugins/api.cljs
index 2b65475c22..bea36ad027 100644
--- a/frontend/src/app/plugins/api.cljs
+++ b/frontend/src/app/plugins/api.cljs
@@ -28,6 +28,7 @@
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.media :as dwm]
    [app.main.data.workspace.pages :as dwpg]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.selection :as dws]
    [app.main.data.workspace.variants :as dwv]
    [app.main.data.workspace.wasm-text :as dwwt]
@@ -237,15 +238,7 @@
     :getTheme
     (fn []
       (let [theme (get-in @st/state [:profile :theme])]
-        (cond
-          (or (not theme) (= theme "system"))
-          (theme/get-system-theme)
-
-          (= theme "default")
-          "dark"
-
-          :else
-          theme)))
+        (theme/resolve-theme theme (theme/get-system-theme))))
 
     :getCurrentUser
     (fn []
@@ -737,4 +730,14 @@
                             (se/add-event plugin-id)))
               (shape/shape-proxy plugin-id variant-id))
 
-            (u/not-valid plugin-id :shapes "One of the components is not on the same page or is already a variant")))))))
+            (u/not-valid plugin-id :shapes "One of the components is not on the same page or is already a variant")))))
+
+    :waitForLayoutUpdate
+    (fn [timeout]
+      ;; Always a promise, so a bad argument travels as a rejection.
+      (if (u/valid-timeout? timeout)
+        ;; Resolves once every shape with reflow work in flight has settled.
+        (wrf/wait-for-layout-update timeout)
+        (js/Promise.
+         (fn [_ reject]
+           (u/reject-not-valid reject :waitForLayoutUpdate timeout)))))))
diff --git a/frontend/src/app/plugins/events.cljs b/frontend/src/app/plugins/events.cljs
index a6078b2b2b..17e50140a1 100644
--- a/frontend/src/app/plugins/events.cljs
+++ b/frontend/src/app/plugins/events.cljs
@@ -53,16 +53,8 @@
 
 (defn- get-theme
   [state]
-  (let [theme (get-in state [:profile :theme])]
-    (cond
-      (or (not theme) (= theme "system"))
-      (theme/get-system-theme)
-
-      (= theme "default")
-      "dark"
-
-      :else
-      theme)))
+  (theme/resolve-theme (get-in state [:profile :theme])
+                       (theme/get-system-theme)))
 
 (defmethod handle-state-change "themechange"
   [_ _ old-val new-val _]
@@ -70,9 +62,7 @@
         new-theme (get-theme new-val)]
     (if (identical? old-theme new-theme)
       ::not-changed
-      (if (= new-theme "default")
-        "dark"
-        new-theme))))
+      new-theme)))
 
 (defmethod handle-state-change "shapechange"
   [_ plugin-id old-val new-val props]
diff --git a/frontend/src/app/plugins/register.cljs b/frontend/src/app/plugins/register.cljs
index e4837ce75b..9180463c69 100644
--- a/frontend/src/app/plugins/register.cljs
+++ b/frontend/src/app/plugins/register.cljs
@@ -35,7 +35,7 @@
   "Signals that plugins runtime has been initialized. Called by app.plugins/init-plugins-runtime."
   []
   (when (p/pending? runtime-ready-promise)
-    (p/resolve! runtime-ready-promise true)))
+    (p/resolve runtime-ready-promise true)))
 
 ;; Stores the installed plugins information
 (defonce ^:private registry (atom {}))
diff --git a/frontend/src/app/plugins/shape.cljs b/frontend/src/app/plugins/shape.cljs
index 4a1ea9bdf9..1b0a9fa965 100644
--- a/frontend/src/app/plugins/shape.cljs
+++ b/frontend/src/app/plugins/shape.cljs
@@ -33,7 +33,7 @@
    [app.common.types.shape.shadow :as ctss]
    [app.common.types.text :as txt]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
+   [app.main.data.exports.assets :as de]
    [app.main.data.exports.wasm :as wasm.exports]
    [app.main.data.persistence :as dwp]
    [app.main.data.plugins :as dp]
@@ -42,12 +42,14 @@
    [app.main.data.workspace.guides :as dwgu]
    [app.main.data.workspace.interactions :as dwi]
    [app.main.data.workspace.libraries :as dwl]
+   [app.main.data.workspace.reflow :as wrf]
    [app.main.data.workspace.selection :as dws]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.shapes :as dwsh]
    [app.main.data.workspace.texts :as dwt]
    [app.main.data.workspace.tokens.application :as dwta]
    [app.main.data.workspace.variants :as dwv]
+   [app.main.features :as features]
    [app.main.repo :as rp]
    [app.main.store :as st]
    [app.plugins.exports :as exports]
@@ -1053,6 +1055,18 @@
                :else
                (st/emit! (dwsh/delete-shapes #{id}))))
 
+           :waitForLayoutUpdate
+           (fn [timeout]
+             ;; Always a promise, so a bad argument travels as a rejection.
+             (if (u/valid-timeout? timeout)
+               ;; Resolves once the reflow work of this shape's subtree has
+               ;; settled: it can be marked on the shape or on its descendants.
+               (let [objects (u/locate-objects file-id page-id)]
+                 (wrf/wait-for-layout-update (cfh/get-children-ids-with-self objects id) timeout))
+               (js/Promise.
+                (fn [_ reject]
+                  (u/reject-not-valid reject :waitForLayoutUpdate timeout)))))
+
            ;; Plugin data
            :getPluginData
            (fn [key]
@@ -1518,7 +1532,7 @@
                  (u/not-valid plugin-id :export value)
 
                  :else
-                 (if (and (contains? cf/flags :wasm-export)
+                 (if (and (features/active-feature? @st/state "wasm-export/v1")
                           (contains? #{:jpeg :webp :png} (:type value :png)))
                    ;; New export with wasm
                    (let [uri (wasm.exports/export-image-uri
@@ -1547,13 +1561,13 @@
                           :profile-id (:profile-id @st/state)
                           :wait true
                           :is-wasm false
-                          :exports [{:file-id   file-id
-                                     :page-id   page-id
-                                     :object-id id
-                                     :name      (:name shape)
-                                     :type      (:type value :png)
-                                     :suffix    (:suffix value "")
-                                     :scale     (:scale value 1)}]}]
+                          :exports [(de/normalize-export {:file-id   file-id
+                                                          :page-id   page-id
+                                                          :object-id id
+                                                          :name      (:name shape)
+                                                          :type      (:type value :png)
+                                                          :suffix    (:suffix value "")
+                                                          :scale     (:scale value 1)})]}]
                      (js/Promise.
                       (fn [resolve reject]
                         ;; The exporter renders the file from its persisted
diff --git a/frontend/src/app/plugins/utils.cljs b/frontend/src/app/plugins/utils.cljs
index 49622d9710..21afd5cdde 100644
--- a/frontend/src/app/plugins/utils.cljs
+++ b/frontend/src/app/plugins/utils.cljs
@@ -291,6 +291,14 @@
     (throw-not-valid code value)
     (display-not-valid code value)))
 
+(defn valid-timeout?
+  "A plugin timeout argument: omitted, or a finite positive number of msecs."
+  [value]
+  (or (nil? value)
+      (and (number? value)
+           (pos? value)
+           (js/Number.isFinite value))))
+
 (defn reject-not-valid
   [reject code value]
   (let [msg (dm/str "[PENPOT PLUGIN] Value not valid: " value ". Code: " code)]
diff --git a/frontend/src/app/render_wasm/api.cljs b/frontend/src/app/render_wasm/api.cljs
index 82cf07cc8f..e7b0b03c0b 100644
--- a/frontend/src/app/render_wasm/api.cljs
+++ b/frontend/src/app/render_wasm/api.cljs
@@ -13,8 +13,17 @@
    [app.common.exceptions :as ex]
    [app.common.files.focus :as cpf]
    [app.common.files.helpers :as cfh]
+   [app.common.fonts :as cfnt]
    [app.common.logging :as log]
    [app.common.math :as mth]
+   [app.common.render-wasm.api.props :as props]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.mem.heap32 :as mem.h32]
+   [app.common.render-wasm.serialize-shape :as serialize-shape]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.serializers.color :as sr-clr]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.color :as clr]
    [app.common.types.fills :as types.fills]
    [app.common.types.path :as path]
@@ -31,23 +40,17 @@
    [app.main.router :as rt]
    [app.main.store :as st]
    [app.main.ui.shapes.text]
+   ;; Required for side effects: binds the generated enums.
+   [app.render-wasm.api.enums]
    [app.render-wasm.api.fonts :as f]
-   [app.render-wasm.api.props :as props]
    [app.render-wasm.api.texts :as t]
    [app.render-wasm.api.webgl :as webgl]
    [app.render-wasm.deserializers :as dr]
    [app.render-wasm.gesture :as wasm-gesture]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.mem.heap32 :as mem.h32]
    [app.render-wasm.performance :as perf]
    [app.render-wasm.rulers-state :as rulers-state]
-   [app.render-wasm.serialize-shape :as serialize-shape]
-   [app.render-wasm.serializers :as sr]
-   [app.render-wasm.serializers.color :as sr-clr]
    [app.render-wasm.svg-filters :as svg-filters]
    [app.render-wasm.text-editor :as text-editor]
-   [app.render-wasm.wasm :as wasm]
    [app.util.debug :as dbg]
    [app.util.dom :as dom]
    [app.util.functions :as fns]
@@ -93,11 +96,14 @@
 
 
 (defn initialized?
-  "True when the WASM render context is ready to receive design-state
-  operations. Use it to skip WASM work during transient states (e.g. while
-  switching renderer with a text shape being edited)."
+  "True when the WASM render context is safe for normal application calls.
+  False while missing/lost or while `reload-renderer!` is reconstructing it.
+
+  App/data code and tests should use this (tests can `set!` it). Prefer
+  `(initialized?)` over `(wasm/ready?)` inside this namespace so readiness
+  stays mockable; use `wasm/live?` for reload-internal ops."
   []
-  (and wasm/context-initialized? (not @wasm/context-lost?)))
+  (wasm/ready?))
 
 
 (defn set-transition-image-from-background!
@@ -278,6 +284,7 @@
 (def text-editor-set-cursor-from-point text-editor/text-editor-set-cursor-from-point)
 (def text-editor-toggle-overtype-mode text-editor/text-editor-toggle-overtype-mode)
 (def text-editor-pointer-down text-editor/text-editor-pointer-down)
+(def text-editor-pointer-down-extend text-editor/text-editor-pointer-down-extend)
 (def text-editor-pointer-move text-editor/text-editor-pointer-move)
 (def text-editor-pointer-up text-editor/text-editor-pointer-up)
 (def text-editor-get-current-styles text-editor/text-editor-get-current-styles)
@@ -351,6 +358,8 @@
 (declare request-render)
 (declare set-shape-vertical-align fonts-from-text-content)
 (declare reload-renderer!)
+(declare request-render-preserving-target)
+(declare render-pending?)
 
 ;; These are the type of frames we have in our
 ;; render pipeline.
@@ -414,37 +423,68 @@
 
 (defn free-gpu-resources
   []
-  ;; check if the context has not been lost already or we will get warnings about
-  ;; removing objects from a non-current context
-  (when (initialized?)
+  ;; Do not use `wasm/live?` here: after `webglcontextrestored` we keep
+  ;; `context-lost?` true until re-init, but the browser context is usable again
+  ;; and must release GPU objects before `_clean_up` / context deletion.
+  (when (and wasm/context-initialized? (wasm/module-ready?))
     (h/call wasm/internal-module "_free_gpu_resources")))
 
+;; When set, the next render keeps the previously presented frame on screen
+;; while the new tiles are rasterized, instead of clearing the canvas first.
+;; See `request-render-preserving-target`.
+(defonce ^:private preserve-target-render? (atom false))
+
+(defn- drain-text-editor-events!
+  "Pop and handle every pending text-editor event.
+
+   StylesChanged syncs the caret's current styles to the toolbar. Returns true
+   when some event needs a full shape re-render (content or layout changed)."
+  []
+  (loop [needs-render? false]
+    (let [ev (text-editor/text-editor-poll-event)]
+      (if (or (nil? ev) (= ev TEXT_EDITOR_EVENT_NONE))
+        needs-render?
+        (do
+          (when (= ev TEXT_EDITOR_EVENT_STYLES_CHANGED)
+            (let [current-styles (text-editor/text-editor-get-current-styles)
+                  shape-id (text-editor/text-editor-get-active-shape-id)]
+              ;; Keep the caret color matching the text at the caret position.
+              (text-editor/text-editor-apply-caret-color (:fills current-styles))
+              (st/emit! (texts/v3-update-text-editor-styles shape-id current-styles))))
+          (recur (or needs-render?
+                     (= ev TEXT_EDITOR_EVENT_CONTENT_CHANGED)
+                     (= ev TEXT_EDITOR_EVENT_NEEDS_LAYOUT))))))))
+
 ;; This should never be called from the outside.
 (defn- render
   [timestamp]
-  (when (and wasm/context-initialized? (not @wasm/context-lost?))
-    (internal-render timestamp)
+  (when (wasm/live?)
+    ;; SYNC-TILES makes WASM keep the last presented frame while the new tiles
+    ;; are rasterized, rather than clearing to the background first. The flag is
+    ;; one-shot on both sides: WASM clears it when the render loop starts, so
+    ;; the progressive continuation frames behave normally.
+    (if (compare-and-set! preserve-target-render? true false)
+      (internal-render timestamp (bit-or wasm/internal-frame-type RENDER-FLAG-SYNC-TILES))
+      (internal-render timestamp))
 
     ;; Update text editor blink (so cursor toggles) using the same timestamp
     (try
       (when (is-text-editor-wasm-enabled @st/state)
         (text-editor/text-editor-update-blink timestamp)
-        (text-editor/text-editor-render-overlay)
-        ;; Poll for editor events; if any event occurs, trigger a re-render
-        (let [ev (text-editor/text-editor-poll-event)]
-          (when (and ev (not= ev TEXT_EDITOR_EVENT_NONE))
-            ;; When StylesChanged, get the current styles.
-            (case ev
-              ;; StylesChanged Event
-              TEXT_EDITOR_EVENT_STYLES_CHANGED
-              (let [current-styles (text-editor/text-editor-get-current-styles)
-                    shape-id (text-editor/text-editor-get-active-shape-id)]
-                (st/emit! (texts/v3-update-text-editor-styles shape-id current-styles)))
-
-              ;; Default case
-              nil)
-
-            (request-render "text-editor-event"))))
+        ;; Only repaint the overlay when this frame recomposited Target (a full
+        ;; frame). A partial frame is flushed but not presented — Target still
+        ;; shows the last presented frame with the overlay already on it — so
+        ;; repainting the translucent selection over it stacks another layer
+        ;; every progressive frame: it darkens, then snaps back when the final
+        ;; frame presents from the clean Backbuffer (the blink at the end of a
+        ;; zoom over a selection, gh-10709).
+        (when (not= wasm/internal-frame-type FRAME_TYPE_PARTIAL)
+          (text-editor/text-editor-render-overlay))
+        ;; Drain editor events. Only content/layout changes need a full shape
+        ;; re-render; selection/style changes are already reflected by the
+        ;; overlay redrawn just above.
+        (when (drain-text-editor-events!)
+          (request-render-preserving-target "text-editor-content")))
       (catch :default e
         (js/console.error "text-editor overlay/update failed:" e)))
 
@@ -456,22 +496,57 @@
    rebuilding shape tiles. Fast synchronous call used to show the viewport
    frame immediately before a potentially slow tile rebuild."
   []
-  (when (and wasm/context-initialized? (not @wasm/context-lost?))
+  (when (wasm/live?)
     (h/call wasm/internal-module "_render_ui_only")))
 
-(defn render-from-cache!
-  "Blit the shapes from the cached tile atlas and redraw the UI overlay
-   (rulers, selection band) fresh on top, in a single atomic frame. The
-   *shapes* are the cached part (already-rasterized tiles, not rebuilt); the UI
-   is re-rendered every call, which is what lets it reflect a new selection.
+(defn render-from-backbuffer!
+  "Re-present the last fully rendered frame with the UI overlay (rulers,
+   selection band) redrawn on top, reusing the crisp Backbuffer instead of
+   rebuilding it from the scale-capped document atlas.
 
-   Use for UI-only updates that don't change shapes (e.g. the ruler selection
-   band): unlike `request-render`, it never kicks off a progressive,
-   tile-by-tile shape re-render, so it does not flash on zoomed-in views where
-   the scene spans multiple tiles."
+   For UI-only updates that must not kick off a progressive shape re-render. The
+   alternative — blitting shapes from the cached tile atlas (WASM
+   `_render_from_cache`, what pan/zoom uses in `set-view-box`) — is fine at
+   normal zoom, but on a zoomed-in view (>1000%) it is a heavy upscale that
+   flashes crisp->blurry->crisp. Reusing the Backbuffer is pixel-identical at
+   any zoom. Only valid on a stable viewbox; pan/zoom must keep using the atlas
+   blit, whose preview tracks the moving viewport."
   []
-  (when (and wasm/context-initialized? (not @wasm/context-lost?))
-    (h/call wasm/internal-module "_render_from_cache" 0)))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_render_from_backbuffer")))
+
+(defn render-text-editor-overlay!
+  "Repaint the text-editor caret and selection over the last fully rendered
+   frame, without a full (tile-rebuilding) render.
+
+   Caret/selection changes — the blink, clicks, drag-selection, arrow-key
+   navigation — never alter the shapes. `text-editor-render-caret` re-composes
+   the frame from the Backbuffer (which still holds the last complete render)
+   and draws the caret/selection overlay on top, so the shapes are pixel
+   identical to the last full render at any zoom level. A full `request-render`
+   would instead blank the canvas and re-rasterize tiles progressively, which
+   flashes on zoomed-in views; blitting from the cached tile atlas
+   (`_render_from_cache`) would instead look softer when upscaled (the atlas is
+   scale-capped), so the blink would alternate crisp/soft — a subtler flash.
+   Pending editor events are still drained so the style toolbar stays in sync; a
+   full render is only requested when content or layout actually changed."
+  []
+  (when (and (wasm/live?)
+             ;; Skip when a render is already pending: `text-editor-render-caret`
+             ;; composes from the Backbuffer, but a progressive render (multiple
+             ;; rAF frames at high zoom) is still rebuilding it. Compositing then
+             ;; would show a half-built frame — a sparse, timing-dependent flash.
+             ;; The in-flight render draws the overlay itself when it completes.
+             (not (render-pending?)))
+    (when (is-text-editor-wasm-enabled @st/state)
+      (text-editor/text-editor-update-blink (js/performance.now))
+      ;; Drain before painting so the caret color (updated on StylesChanged when
+      ;; the caret crosses into differently-colored text) is applied before the
+      ;; overlay is drawn, instead of lagging a frame behind.
+      (let [needs-render? (drain-text-editor-events!)]
+        (text-editor/text-editor-render-caret)
+        (when needs-render?
+          (request-render-preserving-target "text-editor-content"))))))
 
 ;; CSS-pixel blur radius for the page-transition snapshot (DPR-scaled in WASM).
 (def ^:private TRANSITION_BLUR_RADIUS 4.0)
@@ -480,7 +555,7 @@
   "Blurs the current page into the canvas so a following
    `capture-canvas-snapshot` grabs an already-blurred transition frame."
   []
-  (when (and wasm/context-initialized? (not @wasm/context-lost?))
+  (when (wasm/live?)
     (h/call wasm/internal-module "_render_blurred_snapshot" TRANSITION_BLUR_RADIUS)))
 
 (defn render-sync
@@ -512,13 +587,21 @@
 (defonce shapes-loading? (atom false))
 (defonce deferred-render? (atom false))
 
+(defn render-pending?
+  "True while a render has been scheduled but not yet completed — including the
+   frames of an in-progress progressive render."
+  []
+  @pending-render)
+
 (defn- register-deferred-render!
   []
   (reset! deferred-render? true))
 
 (defn request-render
   [_requester]
-  (when (and (initialized?) (not @wasm/disable-request-render?))
+  ;; Use `wasm/live?` (not `wasm/ready?`) so reload-internal
+  ;; renders can run while `reloading?` still blocks external mutations.
+  (when (and (wasm/live?) (not @wasm/disable-request-render?))
     (if @shapes-loading?
       (register-deferred-render!)
       (when-not @pending-render
@@ -538,6 +621,23 @@
                      (throw e)))))]
           (set! wasm/internal-frame-id frame-id))))))
 
+(defn request-render-preserving-target
+  "Like `request-render`, but keeps the previously presented frame on screen
+   while the new tiles are rasterized instead of blanking the canvas first.
+
+   A plain `request-render` goes through WASM's `reset_canvas`, which clears to
+   the background colour and then fills the viewport tile by tile. When that
+   rasterization spans more than one frame — as it does on zoomed-in views,
+   where glyphs are expensive to raster — the cleared canvas is visible as a
+   flash. Preserving the target is what the renderer already does after a
+   pan/zoom gesture for exactly this reason.
+
+   Use for shape edits on a stable viewbox (typing in the text editor), where
+   the previous frame is a good stand-in until the new one is ready."
+  [requester]
+  (reset! preserve-target-render? true)
+  (request-render requester))
+
 (defn- begin-shapes-loading!
   []
   (reset! shapes-loading? true)
@@ -607,12 +707,21 @@
 
 (defn apply-styles-to-selection
   "Apply style attrs to the currently selected text spans.
-   Updates the cached content, pushes to WASM, and returns {:shape-id :content} for saving."
-  [attrs]
-  (let [result (text-editor/apply-styles-to-selection attrs use-shape set-shape-text-content)]
+   Updates the cached content, pushes to WASM, and returns {:shape-id :content} for saving.
+   `:with-fills?` also returns the selection's `:fills`."
+  [styles & [opts]]
+  (let [result (text-editor/apply-styles-to-selection styles use-shape set-shape-text-content opts)]
     (request-render "apply-styles-to-selection")
     result))
 
+(defn apply-paragraph-attrs-to-selection
+  "Apply paragraph attrs to the paragraphs the editor selection touches.
+   Returns {:shape-id :content} for saving."
+  [attrs]
+  (let [result (text-editor/apply-paragraph-attrs-to-selection attrs use-shape set-shape-text-content)]
+    (request-render "apply-paragraph-attrs-to-selection")
+    result))
+
 (defn set-parent-id
   [id]
   (let [buffer (uuid/get-u32 id)]
@@ -1189,8 +1298,8 @@
                    langs)
 
             (let [text   (apply str (map :text spans))
-                  emoji? (if emoji? emoji? (t/contains-emoji? text))
-                  langs  (t/collect-used-languages langs text)]
+                  emoji? (if emoji? emoji? (cfnt/contains-emoji? text))
+                  langs  (cfnt/collect-used-languages langs text)]
 
               ;; FIXME: this should probably be somewhere else
               (when fallback-fonts-only? (t/write-shape-text spans paragraph text))
@@ -1201,15 +1310,16 @@
 
         (let [updated-fonts
               (-> #{}
-                  (cond-> ^boolean emoji? (f/add-emoji-font))
-                  (f/add-noto-fonts langs))
+                  (cond-> ^boolean emoji? (cfnt/add-emoji-font))
+                  (cfnt/add-noto-fonts langs))
               fallback-fonts (filter #(get % :is-fallback) updated-fonts)]
 
           (if fallback-fonts-only? updated-fonts fallback-fonts))))))
 
 (defn set-shape-grow-type
   [grow-type]
-  (props/set-shape-grow-type grow-type))
+  (when (initialized?)
+    (props/set-shape-grow-type grow-type)))
 
 (defn get-text-dimensions
   ([id]
@@ -1249,13 +1359,13 @@
 
 (defn view-interaction-start!
   []
-  (when-not @view-interaction-active?
+  (when (and (initialized?) (not @view-interaction-active?))
     (h/call wasm/internal-module "_set_view_start")
     (reset! view-interaction-active? true)))
 
 (defn view-interaction-end!
   []
-  (when @view-interaction-active?
+  (when (and (initialized?) @view-interaction-active?)
     (perf/begin-measure "render-finish")
     (h/call wasm/internal-module "_set_view_end")
     (perf/end-measure "render-finish")
@@ -1267,11 +1377,52 @@
   (let [local (get @st/state :workspace-local)]
     (or (:panning local) (:zooming local))))
 
-(defn finalize-view-interaction!
-  "Ends the view interaction and triggers a full-quality render."
+(defn- render-text-editor-overlay-if-active!
+  "Redraw the editor caret/selection straight onto the current Target frame when
+   an editor is active (no-op otherwise). Used after the direct `_render_from_cache`
+   / `internal-render` calls of a view interaction, which bypass the rAF `render`
+   loop that normally repaints the overlay. Without it the selection blinks out
+   for the duration of a pan/zoom gesture over a text shape (gh-10709)."
   []
-  (view-interaction-end!)
-  (internal-render 0 0))
+  (when (is-text-editor-wasm-enabled @st/state)
+    (text-editor/text-editor-render-overlay)))
+
+(defn- render-text-editor-overlay-after-frame!
+  "Repaint the overlay after a direct `internal-render`, but only when that
+   render recomposited Target (a full frame). A partial frame is only flushed —
+   Target keeps the last presented frame with the overlay already on it — so
+   repainting the translucent selection then stacks another layer and it visibly
+   darkens across the progressive frames before snapping back on the final
+   present (the blink at the end of a zoom over a selection, gh-10709). The
+   final full frame's own repaint keeps the overlay in place."
+  []
+  (when (not= wasm/internal-frame-type FRAME_TYPE_PARTIAL)
+    (render-text-editor-overlay-if-active!)))
+
+(defn finalize-view-interaction!
+  "Ends an in-progress pan/zoom view interaction and triggers a full-quality
+   render. No-ops when no view interaction is active.
+
+   `finish-panning` runs on every pointerup, so without this guard we would
+   call `internal-render` (and WASM `reset_canvas`) on plain clicks."
+  []
+  (when (and @view-interaction-active? (initialized?))
+    (view-interaction-end!)
+    ;; Preserve the last presented frame while the new one renders. A plain render
+    ;; goes through WASM `reset_canvas`, which clears to the background and
+    ;; re-rasterizes the viewport tile by tile — a visible flash on zoomed-in
+    ;; views. The content is unchanged across a view-interaction end (only the
+    ;; view moved), so there is nothing to clear; SYNC-TILES sets `preserve_target`
+    ;; and lets the new tiles replace the old frame in place. Zoom-end already did
+    ;; this implicitly (`zoom_changed`); this extends it to pan/resize-triggered
+    ;; ends (e.g. selecting a shape opens the options panel and resizes the
+    ;; viewport), which previously blanked.
+    (internal-render (js/performance.now) RENDER-FLAG-SYNC-TILES)
+    ;; The direct render above bypasses the rAF `render` loop, so repaint the
+    ;; editor overlay explicitly. Only when this was a full frame: a progressive
+    ;; render keeps painting through the rAF loop and its partial frames must not
+    ;; be over-stamped (see `render-text-editor-overlay-after-frame!`).
+    (render-text-editor-overlay-after-frame!)))
 
 (def render-finish
   (letfn [(do-render []
@@ -1280,21 +1431,33 @@
             (when (initialized?)
               (if (view-gesture-active?)
                 ;; Pan/zoom pause: render without ending the interaction.
-                (internal-render 0 RENDER-FLAG-SYNC-TILES)
+                (do
+                  (internal-render (js/performance.now) RENDER-FLAG-SYNC-TILES)
+                  (render-text-editor-overlay-after-frame!))
                 (finalize-view-interaction!))))]
     (fns/debounce do-render DEBOUNCE_DELAY_MS)))
 
 (defn set-view-box
   [zoom vbox]
-  (perf/begin-measure "set-view-box")
-  (view-interaction-start!)
-  (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
-  (perf/end-measure "set-view-box")
+  (when (initialized?)
+    (perf/begin-measure "set-view-box")
+    (view-interaction-start!)
+    (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
+    (perf/end-measure "set-view-box")
 
-  (perf/begin-measure "render-from-cache")
-  (h/call wasm/internal-module "_render_from_cache" 0)
-  (render-finish)
-  (perf/end-measure "render-from-cache"))
+    (perf/begin-measure "render-from-cache")
+    (h/call wasm/internal-module "_render_from_cache" 0)
+    ;; Keep the text-editor caret/selection glued to the shapes while the view
+    ;; changes. `_render_from_cache` re-composites shapes + UI at the new viewbox
+    ;; but omits the editor overlay, so without this the selection would vanish for
+    ;; the whole pan/zoom gesture and only flash back when the debounced full
+    ;; render lands — the blink seen when zooming in/out over a selection at high
+    ;; zoom (gh-10709). `_text_editor_render_overlay` draws straight onto the
+    ;; freshly composited Target (no Backbuffer re-compose) and no-ops when no
+    ;; editor is active.
+    (render-text-editor-overlay-if-active!)
+    (render-finish)
+    (perf/end-measure "render-from-cache")))
 
 (defn sync-workspace-local-viewport!
   "Pushes `[:workspace-local :zoom]` and `:vbox` into WASM."
@@ -1314,42 +1477,44 @@
 
 (defn set-object
   [shape]
-  (perf/begin-measure "set-object")
-  (when shape
-    (let [shape        (svg-filters/apply-svg-derived shape)
-          id           (dm/get-prop shape :id)
-          type         (dm/get-prop shape :type)
+  (if-not (and shape (wasm/live?))
+    {:thumbnails [] :full [] :font-pending-ids []}
+    (do
+      (perf/begin-measure "set-object")
+      (let [shape        (svg-filters/apply-svg-derived shape)
+            id           (dm/get-prop shape :id)
+            type         (dm/get-prop shape :type)
 
-          fills        (get shape :fills)
-          strokes      (if (= type :group)
-                         [] (get shape :strokes))
-          content      (let [content (get shape :content)]
-                         (if (= type :text)
-                           (ensure-text-content content)
-                           content))]
+            fills        (get shape :fills)
+            strokes      (if (= type :group)
+                           [] (get shape :strokes))
+            content      (let [content (get shape :content)]
+                           (if (= type :text)
+                             (ensure-text-content content)
+                             content))]
 
-      (serialize-shape/serialize-shape! shape)
+        (serialize-shape/serialize-shape! shape)
 
-      ;; Browser-only: svg-raw markup (needs React) + workspace layout.
-      (when (and (some? content) (= type :svg-raw))
-        (set-shape-svg-raw-content (get-static-markup shape)))
-      (set-shape-layout shape)
-      (set-layout-data shape)
-      (let [is-text? (= type :text)
-            text-content-pending (when is-text? (set-shape-text-content id content))
-            pending-thumbnails (into [] (concat
-                                         text-content-pending
-                                         (when is-text? (set-shape-text-images id content true))
-                                         (set-shape-fills id fills true)
-                                         (set-shape-strokes id strokes true)))
-            pending-full (into [] (concat
-                                   (when is-text? (set-shape-text-images id content false))
-                                   (set-shape-fills id fills false)
-                                   (set-shape-strokes id strokes false)))]
-        (perf/end-measure "set-object")
-        {:thumbnails pending-thumbnails
-         :full pending-full
-         :font-pending-ids (if (some :callback text-content-pending) [id] [])}))))
+        ;; Browser-only: svg-raw markup (needs React) + workspace layout.
+        (when (and (some? content) (= type :svg-raw))
+          (set-shape-svg-raw-content (get-static-markup shape)))
+        (set-shape-layout shape)
+        (set-layout-data shape)
+        (let [is-text? (= type :text)
+              text-content-pending (when is-text? (set-shape-text-content id content))
+              pending-thumbnails (into [] (concat
+                                           text-content-pending
+                                           (when is-text? (set-shape-text-images id content true))
+                                           (set-shape-fills id fills true)
+                                           (set-shape-strokes id strokes true)))
+              pending-full (into [] (concat
+                                     (when is-text? (set-shape-text-images id content false))
+                                     (set-shape-fills id fills false)
+                                     (set-shape-strokes id strokes false)))]
+          (perf/end-measure "set-object")
+          {:thumbnails pending-thumbnails
+           :full pending-full
+           :font-pending-ids (if (some :callback text-content-pending) [id] [])})))))
 
 (defn- update-text-layouts
   "Synchronously update text layouts for all shapes and send rect updates
@@ -1511,50 +1676,55 @@
 
                      ;; Notify that shapes are loaded and tiles rebuilt
                      (when on-shapes-ready (on-shapes-ready))
-                     ;; Show shapes immediately: end loading overlay + unblock rendering
-                     (h/call wasm/internal-module "_end_loading")
-                     (end-shapes-loading!)
+                     (if-not (wasm/live?)
+                       (do
+                         (end-shapes-loading!)
+                         (resolve nil))
+                       (do
+                         ;; Show shapes immediately: end loading overlay + unblock rendering
+                         (h/call wasm/internal-module "_end_loading")
+                         (end-shapes-loading!)
 
-                     ;; Rebuild the tile index so _render knows which shapes
-                     ;; map to which tiles after a page switch.
-                     (h/call wasm/internal-module "_set_view_end")
-                     (reset! view-interaction-active? false)
+                         ;; Rebuild the tile index so _render knows which shapes
+                         ;; map to which tiles after a page switch.
+                         (h/call wasm/internal-module "_set_view_end")
+                         (reset! view-interaction-active? false)
 
-                     ;; Text layouts must run after _end_loading (they
-                     ;; depend on state that is only correct when loading
-                     ;; is false).  Each call touch_shape → touched_ids.
-                     (let [text-ids (into [] (comp (filter cfh/text-shape?) (map :id)) shapes)]
-                       (when (seq text-ids)
-                         (update-text-layouts text-ids)))
-                     (if render-callback
-                       (render-callback)
-                       (request-render "set-objects-complete"))
-                     (ug/dispatch! (ug/event "penpot:wasm:set-objects"))
-                     (resolve nil)
+                         ;; Text layouts must run after _end_loading (they
+                         ;; depend on state that is only correct when loading
+                         ;; is false).  Each call touch_shape → touched_ids.
+                         (let [text-ids (into [] (comp (filter cfh/text-shape?) (map :id)) shapes)]
+                           (when (seq text-ids)
+                             (update-text-layouts text-ids)))
+                         (if render-callback
+                           (render-callback)
+                           (request-render "set-objects-complete"))
+                         (ug/dispatch! (ug/event "penpot:wasm:set-objects"))
+                         (resolve nil)
 
-                     ;; Kick off image fetches in the background.
-                     ;; The promise is already resolved so these don't
-                     ;; block the caller.
-                     (let [pending-thumbnails (d/index-by :key :callback thumbnails-acc)
-                           pending-full       (d/index-by :key :callback full-acc)]
-                       (when (or (seq pending-thumbnails) (seq pending-full))
-                         (->> (rx/concat
-                               (->> (rx/from (vals pending-thumbnails))
-                                    (rx/merge-map
-                                     (fn [callback]
-                                       (if (fn? callback) (callback) (rx/empty))))
-                                    (rx/reduce conj []))
-                               (->> (rx/from (vals pending-full))
-                                    (rx/mapcat
-                                     (fn [callback]
-                                       (if (fn? callback) (callback) (rx/empty))))
-                                    (rx/reduce conj [])))
-                              (rx/subs!
-                               (fn [_]
-                                 (relayout-after-fonts! shapes font-pending-acc)
-                                 (request-render "images-loaded"))
-                               noop-fn
-                               noop-fn)))))))]
+                         ;; Kick off image fetches in the background.
+                         ;; The promise is already resolved so these don't
+                         ;; block the caller.
+                         (let [pending-thumbnails (d/index-by :key :callback thumbnails-acc)
+                               pending-full       (d/index-by :key :callback full-acc)]
+                           (when (or (seq pending-thumbnails) (seq pending-full))
+                             (->> (rx/concat
+                                   (->> (rx/from (vals pending-thumbnails))
+                                        (rx/merge-map
+                                         (fn [callback]
+                                           (if (fn? callback) (callback) (rx/empty))))
+                                        (rx/reduce conj []))
+                                   (->> (rx/from (vals pending-full))
+                                        (rx/mapcat
+                                         (fn [callback]
+                                           (if (fn? callback) (callback) (rx/empty))))
+                                        (rx/reduce conj [])))
+                                  (rx/subs!
+                                   (fn [_]
+                                     (relayout-after-fonts! shapes font-pending-acc)
+                                     (request-render "images-loaded"))
+                                   noop-fn
+                                   noop-fn)))))))))]
          (process-next-chunk 0 [] [] []))))))
 
 
@@ -1622,16 +1792,17 @@
              :font-pending-ids (persistent! font-acc)}))]
     (perf/end-measure "set-objects")
     (when on-shapes-ready (on-shapes-ready))
-    ;; Rebuild the tile index so _render knows which shapes
-    ;; map to which tiles after a page switch.
-    (h/call wasm/internal-module "_set_view_end")
-    (reset! view-interaction-active? false)
-    (process-pending shapes thumbnails full font-pending-ids
-                     (fn []
-                       (if render-callback
-                         (render-callback)
-                         (request-render "set-objects-sync-complete"))
-                       (ug/dispatch! (ug/event "penpot:wasm:set-objects"))))))
+    (when (wasm/live?)
+      ;; Rebuild the tile index so _render knows which shapes
+      ;; map to which tiles after a page switch.
+      (h/call wasm/internal-module "_set_view_end")
+      (reset! view-interaction-active? false)
+      (process-pending shapes thumbnails full font-pending-ids
+                       (fn []
+                         (if render-callback
+                           (render-callback)
+                           (request-render "set-objects-sync-complete"))
+                         (ug/dispatch! (ug/event "penpot:wasm:set-objects")))))))
 
 (defn- shapes-in-tree-order
   "Returns shapes sorted in tree order (parents before children).
@@ -1677,38 +1848,40 @@
   ([objects render-callback]
    (set-objects objects render-callback nil false))
   ([objects render-callback on-shapes-ready force-sync]
-   (perf/begin-measure "set-objects")
-   (let [shapes (shapes-in-tree-order objects)
-         total-shapes (count shapes)]
-     (if (or force-sync (< total-shapes ASYNC_THRESHOLD))
-       (set-objects-sync shapes render-callback on-shapes-ready)
-       (do
-         (begin-shapes-loading!)
-         (h/call wasm/internal-module "_begin_loading")
-         ;; NOTE: to render a loading overlay in the future
-         ;;  (when-not on-shapes-ready
-         ;;    (h/call wasm/internal-module "_render_loading_overlay"))
-         (try
-           (-> (set-objects-async shapes render-callback on-shapes-ready)
-               (p/catch (fn [error]
-                          (h/call wasm/internal-module "_end_loading")
-                          (end-shapes-loading!)
-                          (js/console.error "Async WASM shape loading failed" error))))
-           (catch :default error
-             (h/call wasm/internal-module "_end_loading")
-             (end-shapes-loading!)
-             (js/console.error "Async WASM shape loading failed" error)
-             (throw error)))
-         nil)))))
+   (when (wasm/live?)
+     (perf/begin-measure "set-objects")
+     (let [shapes (shapes-in-tree-order objects)
+           total-shapes (count shapes)]
+       (if (or force-sync (< total-shapes ASYNC_THRESHOLD))
+         (set-objects-sync shapes render-callback on-shapes-ready)
+         (do
+           (begin-shapes-loading!)
+           (h/call wasm/internal-module "_begin_loading")
+           ;; NOTE: to render a loading overlay in the future
+           ;;  (when-not on-shapes-ready
+           ;;    (h/call wasm/internal-module "_render_loading_overlay"))
+           (try
+             (-> (set-objects-async shapes render-callback on-shapes-ready)
+                 (p/catch (fn [error]
+                            (h/call wasm/internal-module "_end_loading")
+                            (end-shapes-loading!)
+                            (js/console.error "Async WASM shape loading failed" error))))
+             (catch :default error
+               (h/call wasm/internal-module "_end_loading")
+               (end-shapes-loading!)
+               (js/console.error "Async WASM shape loading failed" error)
+               (throw error)))
+           nil))))))
 
 (defn clear-focus-mode
   []
-  (h/call wasm/internal-module "_clear_focus_mode")
-  (request-render "clear-focus-mode"))
+  (when (initialized?)
+    (h/call wasm/internal-module "_clear_focus_mode")
+    (request-render "clear-focus-mode")))
 
 (defn set-focus-mode
   [entries]
-  (when-not ^boolean (empty? entries)
+  (when (and (initialized?) (not ^boolean (empty? entries)))
     (let [size   (mem/get-alloc-size entries UUID-U8-SIZE)
           heap   (mem/get-heap-u32)
           offset (mem/alloc->offset-32 size)]
@@ -1744,7 +1917,7 @@
 
 (defn set-structure-modifiers
   [entries]
-  (when-not ^boolean (empty? entries)
+  (when (and (initialized?) (not ^boolean (empty? entries)))
     (let [size    (mem/get-alloc-size entries 44)
           offset  (mem/alloc->offset-32 size)
           heapu32 (mem/get-heap-u32)
@@ -1764,8 +1937,14 @@
       (h/call wasm/internal-module "_set_structure_modifiers"))))
 
 (defn propagate-modifiers
+  "Propagates geometry modifiers through the WASM shape tree.
+
+  Always returns a vector. When the context is not ready (lost / mid-reload)
+  or `entries` is empty, returns `[]` so callers never receive `nil` (which
+  would trip `set-modifiers`' vector assert)."
   [entries pixel-precision]
-  (when-not ^boolean (empty? entries)
+  (if-not (and (initialized?) (not ^boolean (empty? entries)))
+    []
     (let [heapf32 (mem/get-heap-f32)
           heapu32 (mem/get-heap-u32)
           size    (mem/get-alloc-size entries INPUT-MODIFIER-U8-SIZE)
@@ -1799,7 +1978,7 @@
 (defn get-selection-rect
   [entries]
 
-  (when-not ^boolean (empty? entries)
+  (when (and (initialized?) (not ^boolean (empty? entries)))
     (let [size    (mem/get-alloc-size entries UUID-U8-SIZE)
           offset  (mem/alloc->offset-32 size)
           heapu32 (mem/get-heap-u32)
@@ -1818,9 +1997,10 @@
 
 (defn set-canvas-background
   [background]
-  (let [rgba (sr-clr/hex->u32argb background 1)]
-    (h/call wasm/internal-module "_set_canvas_background" rgba)
-    (request-render "set-canvas-background")))
+  (when (initialized?)
+    (let [rgba (sr-clr/hex->u32argb background 1)]
+      (h/call wasm/internal-module "_set_canvas_background" rgba)
+      (request-render "set-canvas-background"))))
 
 (defn clean-modifiers
   []
@@ -1846,38 +2026,40 @@
 
 (defn set-modifiers
   [modifiers]
+  (when (initialized?)
+    ;; Assert only when we would touch WASM; callers may still build
+    ;; modifiers while the context is unavailable.
+    (assert (vector? modifiers) "expected a vector for `set-modifiers`")
 
-  ;; We need to ensure efficient operations
-  (assert (vector? modifiers) "expected a vector for `set-modifiers`")
+    (let [length (count modifiers)]
+      (when (pos? length)
+        (let [offset  (mem/alloc->offset-32 (* MODIFIER-U8-SIZE length))
+              heapu32 (mem/get-heap-u32)
+              heapf32 (mem/get-heap-f32)]
 
-  (let [length (count modifiers)]
-    (when (pos? length)
-      (let [offset  (mem/alloc->offset-32 (* MODIFIER-U8-SIZE length))
-            heapu32 (mem/get-heap-u32)
-            heapf32 (mem/get-heap-f32)]
+          (reduce (fn [offset [id transform]]
+                    (-> offset
+                        (mem.h32/write-uuid heapu32 id)
+                        (mem.h32/write-matrix heapf32 transform)))
+                  offset
+                  modifiers)
 
-        (reduce (fn [offset [id transform]]
-                  (-> offset
-                      (mem.h32/write-uuid heapu32 id)
-                      (mem.h32/write-matrix heapf32 transform)))
-                offset
-                modifiers)
+          (h/call wasm/internal-module "_set_modifiers")
 
-        (h/call wasm/internal-module "_set_modifiers")
-
-        (request-render "set-modifiers")))))
+          (request-render "set-modifiers"))))))
 
 (defn initialize-viewport
   [base-objects zoom vbox &
    {:keys [background background-opacity on-render on-shapes-ready force-sync]
     :or {background-opacity 1}}]
-  (let [rgba (when background (sr-clr/hex->u32argb background background-opacity))
-        total-shapes (count (vals base-objects))]
+  (when (wasm/live?)
+    (let [rgba (when background (sr-clr/hex->u32argb background background-opacity))
+          total-shapes (count (vals base-objects))]
 
-    (when rgba (h/call wasm/internal-module "_set_canvas_background" rgba))
-    (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
-    (h/call wasm/internal-module "_init_shapes_pool" total-shapes)
-    (set-objects base-objects on-render on-shapes-ready force-sync)))
+      (when rgba (h/call wasm/internal-module "_set_canvas_background" rgba))
+      (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
+      (h/call wasm/internal-module "_init_shapes_pool" total-shapes)
+      (set-objects base-objects on-render on-shapes-ready force-sync))))
 
 (defn- run-resource-callbacks!
   [entries]
@@ -1938,15 +2120,20 @@
        "preserveDrawingBuffer" true})
 
 (defn resize-viewbox
+  "Resizes the WASM viewbox. No-ops unless the GL context is live
+  (`wasm/live?`), so callers cannot hit `_resize_viewbox` during
+  teardown / pre-init after WebGL context loss. Allowed during reload
+  once re-init has succeeded."
   [width height]
-  (h/call wasm/internal-module "_resize_viewbox" width height))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_resize_viewbox" width height)))
 
 (defn set-viewer-viewport!
   "Update viewer zoom/pan and rebuild the tile index (frame hops in the viewer).
   `vbox` must have at least `:x` and `:y` keys (design-space top-left corner)."
   [zoom vbox]
-  (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
   (when (initialized?)
+    (h/call wasm/internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
     (h/call wasm/internal-module "_set_view_end")
     (reset! view-interaction-active? false)))
 
@@ -1963,18 +2150,20 @@
 (defn set-render-options!
   "Updates WASM render options with a new DPR value."
   [new-dpr]
-  (h/call wasm/internal-module "_set_render_options" (debug-flags) new-dpr))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_set_render_options" (debug-flags) new-dpr)))
 
 (defn resize-offscreen-canvas!
   "Resize a persistent OffscreenCanvas to new physical-pixel dimensions and
   update the WASM render surfaces accordingly (via `_resize_viewbox`). The
   design state (shape pool) is preserved so `set-objects` is not needed again."
   [canvas new-physical-w new-physical-h]
-  (let [dpr (get-dpr)]
-    (set! (.-width canvas) new-physical-w)
-    (set! (.-height canvas) new-physical-h)
-    (set-render-options! dpr)
-    (resize-viewbox (/ new-physical-w dpr) (/ new-physical-h dpr))))
+  (when (wasm/live?)
+    (let [dpr (get-dpr)]
+      (set! (.-width canvas) new-physical-w)
+      (set! (.-height canvas) new-physical-h)
+      (set-render-options! dpr)
+      (resize-viewbox (/ new-physical-w dpr) (/ new-physical-h dpr)))))
 
 (defn- wasm-get-numeric-value
   [name]
@@ -2014,11 +2203,12 @@
   ([canvas]
    (resize-canvas! canvas (get-dpr)))
   ([canvas new-dpr]
-   (let [[css-w css-h] (canvas-css-size canvas new-dpr)]
-     (set! (.-width ^js canvas) (* new-dpr css-w))
-     (set! (.-height ^js canvas) (* new-dpr css-h))
-     (set-render-options! new-dpr)
-     (resize-viewbox css-w css-h))))
+   (when (wasm/live?)
+     (let [[css-w css-h] (canvas-css-size canvas new-dpr)]
+       (set! (.-width ^js canvas) (* new-dpr css-w))
+       (set! (.-height ^js canvas) (* new-dpr css-h))
+       (set-render-options! new-dpr)
+       (resize-viewbox css-w css-h)))))
 
 (defn- on-webgl-context-lost
   [event]
@@ -2041,11 +2231,18 @@
 (defn- on-webgl-context-restored
   [event]
   (dom/prevent-default event)
-  (reset! wasm/context-lost? false)
-  (st/emit! (drw/context-restored))
+  ;; Keep `context-lost?` / `:render-state :lost` until reload finishes.
+  ;; Emitting `context-restored` early flips the UI out of inspect/read-only,
+  ;; which can call into WASM while `reload-renderer!` is still between
+  ;; `clear-canvas` and re-init (panic). `reloading?` is owned by
+  ;; `reload-renderer!`.
   (let [payload (build-reload-payload)]
     (-> (reload-renderer! payload)
         (p/then (fn [_]
+                  ;; `init-canvas-context` already cleared the lost atom; emit
+                  ;; only after the full reload so layout/viewport sync runs
+                  ;; against a live renderer with `wasm/ready?` true.
+                  (st/emit! (drw/context-restored))
                   (listen-tiles-render-complete-once! end-context-loss-overlay!)
                   (st/async-emit!
                    (ntf/show {:content (tr "webgl.webgl-context-recovered.toast")
@@ -2070,6 +2267,9 @@
           browser (sr/translate-browser cf/browser)
           dpr     (get-dpr)
           [css-w css-h] (canvas-css-size canvas dpr)
+          ;; Avoid 0×0 Skia/GL surfaces (crashes on some browsers).
+          css-w (mth/max 1 css-w)
+          css-h (mth/max 1 css-h)
           can-listen? (fn? (.-addEventListener ^js canvas))]
       (when-not (nil? context)
         (let [handle (.registerContext ^js gl context #js {"majorVersion" 2})]
@@ -2091,14 +2291,10 @@
           (wasm-set-param-from-route-params-if-present :node_batch_threshold)
           (wasm-set-param-from-route-params-if-present :blur_downscale_threshold)
 
-          ;; Set browser and canvas size only after initialization
+          ;; Set browser after `_init`; mark live before sizing so the
+          ;; guarded `resize-*` helpers can run (they require `wasm/live?`,
+          ;; which is true here even while `reloading?` still blocks app callers).
           (h/call wasm/internal-module "_set_browser" browser)
-          ;; DOM canvas: keep drawing buffer synced to CSS size.
-          ;; OffscreenCanvas: no CSS size, so only sync WASM viewbox.
-          (if (and (number? (.-clientWidth ^js canvas))
-                   (pos? (.-clientWidth ^js canvas)))
-            (resize-canvas! canvas dpr)
-            (resize-viewbox css-w css-h))
 
           ;; Add event listeners for WebGL context lost
           (set! wasm/canvas canvas)
@@ -2107,7 +2303,14 @@
             (.addEventListener canvas "webglcontextrestored" on-webgl-context-restored))
           (start-canvas-snapshot-listener!)
           (reset! wasm/context-lost? false)
-          (set! wasm/context-initialized? true)))
+          (set! wasm/context-initialized? true)
+
+          ;; DOM canvas: keep drawing buffer synced to CSS size.
+          ;; OffscreenCanvas: no CSS size, so only sync WASM viewbox.
+          (if (and (number? (.-clientWidth ^js canvas))
+                   (pos? (.-clientWidth ^js canvas)))
+            (resize-canvas! canvas dpr)
+            (resize-viewbox css-w css-h))))
 
       context-init?)))
 
@@ -2117,6 +2320,9 @@
   ([{:keys [lose-browser-context?]
      :or {lose-browser-context? true}}]
    (try
+     ;; Release GPU objects while the context is still current.
+     (free-gpu-resources)
+
      (set! wasm/context-initialized? false)
 
      ;; Cancel any pending animation frame to prevent race conditions.
@@ -2127,6 +2333,7 @@
      (reset! pending-render false)
      (reset! shapes-loading? false)
      (reset! deferred-render? false)
+     (reset! view-interaction-active? false)
 
      ;; Remove listener before losing/deleting context.
      (when wasm/canvas
@@ -2135,7 +2342,6 @@
      (stop-canvas-snapshot-listener!)
 
      (when (wasm/module-ready?)
-       (free-gpu-resources)
        (h/call wasm/internal-module "_clean_up"))
 
      ;; Ensure the WebGL context is properly disposed so browsers do not keep
@@ -2184,6 +2390,7 @@
          force-sync false}
     :as payload}]
   (ug/dispatch! (ug/event "penpot:wasm:reload-start"))
+  (reset! wasm/reloading? true)
   (let [fonts (derive-font-resources base-objects fonts)]
     (-> (p/resolved nil)
         ;; Keep teardown strict (`_clean_up` + deleteContext) but do not
@@ -2220,58 +2427,68 @@
            (sync-rulers-to-wasm! (rulers-state/from-store @st/state))
            (request-render "reload-renderer")
            (ug/dispatch! (ug/event "penpot:wasm:reload-complete"))
+           (reset! wasm/reloading? false)
            payload))
         (p/catch
          (fn [cause]
            (ug/dispatch! (ug/event "penpot:wasm:reload-failed"))
+           (reset! wasm/reloading? false)
+           (reset! wasm/context-lost? true)
            (clear-canvas)
            (p/rejected cause))))))
 
 (defn show-grid
   [id]
-  (let [buffer (uuid/get-u32 id)]
-    (h/call wasm/internal-module "_show_grid"
-            (aget buffer 0)
-            (aget buffer 1)
-            (aget buffer 2)
-            (aget buffer 3)))
-  (request-render "show-grid"))
+  (when (initialized?)
+    (let [buffer (uuid/get-u32 id)]
+      (h/call wasm/internal-module "_show_grid"
+              (aget buffer 0)
+              (aget buffer 1)
+              (aget buffer 2)
+              (aget buffer 3)))
+    (request-render "show-grid")))
 
 (defn set-rulers-visible!
   [visible?]
-  (h/call wasm/internal-module "_set_rulers_visible" (if visible? 1 0)))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_set_rulers_visible" (if visible? 1 0))))
 
 (defn set-rulers-frame-visible!
   [visible?]
-  (h/call wasm/internal-module "_set_rulers_frame_visible" (if visible? 1 0)))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_set_rulers_frame_visible" (if visible? 1 0))))
 
 (defn set-rulers-offsets!
   [offset-x offset-y]
-  (h/call wasm/internal-module "_set_rulers_offsets"
-          (or offset-x 0) (or offset-y 0)))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_set_rulers_offsets"
+            (or offset-x 0) (or offset-y 0))))
 
 (defn set-rulers-selection!
   [rect]
-  (if (some? rect)
-    (h/call wasm/internal-module "_set_rulers_selection" 1
-            (or (:x rect) 0) (or (:y rect) 0)
-            (or (:width rect) 0) (or (:height rect) 0))
-    (h/call wasm/internal-module "_set_rulers_selection" 0 0 0 0 0)))
+  (when (wasm/live?)
+    (if (some? rect)
+      (h/call wasm/internal-module "_set_rulers_selection" 1
+              (or (:x rect) 0) (or (:y rect) 0)
+              (or (:width rect) 0) (or (:height rect) 0))
+      (h/call wasm/internal-module "_set_rulers_selection" 0 0 0 0 0))))
 
 (defn set-rulers-colors!
   "Push ruler chrome / accent colors as ARGB u32. Inputs are hex strings
    (e.g. \"#181818\"); call once on theme change."
   [bg-hex border-hex label-hex accent-hex]
-  (h/call wasm/internal-module "_set_rulers_colors"
-          (sr-clr/hex->u32argb bg-hex 1)
-          (sr-clr/hex->u32argb border-hex 1)
-          (sr-clr/hex->u32argb label-hex 1)
-          (sr-clr/hex->u32argb accent-hex 1)))
+  (when (wasm/live?)
+    (h/call wasm/internal-module "_set_rulers_colors"
+            (sr-clr/hex->u32argb bg-hex 1)
+            (sr-clr/hex->u32argb border-hex 1)
+            (sr-clr/hex->u32argb label-hex 1)
+            (sr-clr/hex->u32argb accent-hex 1))))
 
 (defn clear-grid
   []
-  (h/call wasm/internal-module "_hide_grid")
-  (request-render "clear-grid"))
+  (when (initialized?)
+    (h/call wasm/internal-module "_hide_grid")
+    (request-render "clear-grid")))
 
 ;; Ruler guides ----------------------------------------------------------------
 
@@ -2280,13 +2497,14 @@
   `guides` is the page `:guides` map (id -> guide); `objects` is the page
   objects map, used to resolve each guide's board clip range."
   [guides objects]
-  (let [size    (sr/get-guides-byte-size guides)
-        offset  (mem/alloc->offset-32 size)
-        heapu32 (mem/get-heap-u32)
-        heapf32 (mem/get-heap-f32)]
-    (sr/write-guides guides objects heapu32 heapf32 offset)
-    (h/call wasm/internal-module "_set_guides")
-    (request-render "set-guides")))
+  (when (initialized?)
+    (let [size    (sr/get-guides-byte-size guides)
+          offset  (mem/alloc->offset-32 size)
+          heapu32 (mem/get-heap-u32)
+          heapf32 (mem/get-heap-f32)]
+      (sr/write-guides guides objects heapu32 heapf32 offset)
+      (h/call wasm/internal-module "_set_guides")
+      (request-render "set-guides"))))
 
 ;; Screen-space hit tolerance for ruler guides. Must match
 ;; `guide-active-area` in `app.main.ui.workspace.viewport.guides`.
@@ -2296,41 +2514,45 @@
   "Returns the serialized guide index at `position` (viewport coordinates),
   or -1 when no guide is within the hit tolerance."
   [position zoom]
-  (h/call wasm/internal-module "_find_guide_at"
-          (:x position)
-          (:y position)
-          zoom
-          guide-active-area))
+  (if (initialized?)
+    (h/call wasm/internal-module "_find_guide_at"
+            (:x position)
+            (:y position)
+            zoom
+            guide-active-area)
+    -1))
 
 (defn get-grid-coords
   [position]
-  (let [offset  (h/call wasm/internal-module
-                        "_get_grid_coords"
-                        (get position :x)
-                        (get position :y))
-        heapi32 (mem/get-heap-i32)
-        row     (aget heapi32 (mem/->offset-32 (+ offset 0)))
-        column  (aget heapi32 (mem/->offset-32 (+ offset 4)))]
-    (mem/free)
-    [row column]))
+  (when (initialized?)
+    (let [offset  (h/call wasm/internal-module
+                          "_get_grid_coords"
+                          (get position :x)
+                          (get position :y))
+          heapi32 (mem/get-heap-i32)
+          row     (aget heapi32 (mem/->offset-32 (+ offset 0)))
+          column  (aget heapi32 (mem/->offset-32 (+ offset 4)))]
+      (mem/free)
+      [row column])))
 
 (defn shape-to-path
   [id]
-  (use-shape id)
-  (try
-    (let [offset (-> (h/call wasm/internal-module "_current_to_path")
-                     (mem/->offset-32))
-          heap   (mem/get-heap-u32)
-          length (aget heap offset)
-          data   (mem/slice heap
-                            (+ offset 1)
-                            (* length path.impl/SEGMENT-U32-SIZE))
-          content (path/from-bytes data)]
-      (mem/free)
-      content)
-    (catch :default cause
-      (mem/free)
-      (throw cause))))
+  (when (initialized?)
+    (use-shape id)
+    (try
+      (let [offset (-> (h/call wasm/internal-module "_current_to_path")
+                       (mem/->offset-32))
+            heap   (mem/get-heap-u32)
+            length (aget heap offset)
+            data   (mem/slice heap
+                              (+ offset 1)
+                              (* length path.impl/SEGMENT-U32-SIZE))
+            content (path/from-bytes data)]
+        (mem/free)
+        content)
+      (catch :default cause
+        (mem/free)
+        (throw cause)))))
 
 (defn stroke-to-path
   "Converts a shape's stroke at the given index into a filled path.
@@ -2339,25 +2561,26 @@
    the segments: [even-odd flag][length] (the flat segment list can't encode
    the fill rule itself)."
   [id stroke-index]
-  (use-shape id)
-  (try
-    (let [offset    (-> (h/call wasm/internal-module "_convert_stroke_to_path" stroke-index)
-                        (mem/->offset-32))
-          heap      (mem/get-heap-u32)
-          even-odd? (not (zero? (aget heap offset)))
-          length    (aget heap (inc offset))]
-      (if (pos? length)
-        (let [data    (mem/slice heap
-                                 (+ offset 2)
-                                 (* length path.impl/SEGMENT-U32-SIZE))
-              content (path/from-bytes data)]
-          (mem/free)
-          {:content content :even-odd? even-odd?})
-        (do (mem/free)
-            nil)))
-    (catch :default cause
-      (mem/free)
-      (throw cause))))
+  (when (initialized?)
+    (use-shape id)
+    (try
+      (let [offset    (-> (h/call wasm/internal-module "_convert_stroke_to_path" stroke-index)
+                          (mem/->offset-32))
+            heap      (mem/get-heap-u32)
+            even-odd? (not (zero? (aget heap offset)))
+            length    (aget heap (inc offset))]
+        (if (pos? length)
+          (let [data    (mem/slice heap
+                                   (+ offset 2)
+                                   (* length path.impl/SEGMENT-U32-SIZE))
+                content (path/from-bytes data)]
+            (mem/free)
+            {:content content :even-odd? even-odd?})
+          (do (mem/free)
+              nil)))
+      (catch :default cause
+        (mem/free)
+        (throw cause)))))
 
 (defn calculate-bool*
   [bool-type ids]
@@ -2387,6 +2610,12 @@
         (throw cause)))))
 
 (defn calculate-bool
+  "WASM implementation of `path/calc-bool-content`.
+
+  It must always return content: the result is stored as the bool shape's `:content`
+  and persisted as a file change, so returning `nil` would destroy the path.
+  When the render context is unusable, we fall back to the pure CLJS calculation,
+  which needs no render context."
   [shape objects]
 
   ;; We need to be able to calculate the boolean data but we cannot
@@ -2395,24 +2624,27 @@
   ;; temporary and then we serialize the objects needed to calculate the
   ;; boolean object.
   ;; After the content is returned we discard that temporary context
-  (h/call wasm/internal-module "_start_temp_objects")
+  (if-not (initialized?)
+    (path/calc-bool-content shape objects)
+    (do
+      (h/call wasm/internal-module "_start_temp_objects")
 
-  (try
-    (let [bool-type (get shape :bool-type)
-          ids (get shape :shapes)
-          all-children
-          (->> ids
-               (mapcat #(cfh/get-children-with-self objects %)))]
+      (try
+        (let [bool-type (get shape :bool-type)
+              ids (get shape :shapes)
+              all-children
+              (->> ids
+                   (mapcat #(cfh/get-children-with-self objects %)))]
 
-      (h/call wasm/internal-module "_init_shapes_pool" (count all-children))
-      (run! set-object all-children)
+          (h/call wasm/internal-module "_init_shapes_pool" (count all-children))
+          (run! set-object all-children)
 
-      (-> (calculate-bool* bool-type ids)
-          (path.impl/path-data)))
-    (finally
-      ;; Always restore the main shapes pool: leaving the temp pool
-      ;; active would make the next `_start_temp_objects` panic.
-      (h/call wasm/internal-module "_end_temp_objects"))))
+          (-> (calculate-bool* bool-type ids)
+              (path.impl/path-data)))
+        (finally
+          ;; Always restore the main shapes pool: leaving the temp pool
+          ;; active would make the next `_start_temp_objects` panic.
+          (h/call wasm/internal-module "_end_temp_objects"))))))
 
 (def POSITION-DATA-U8-SIZE 36)
 (def POSITION-DATA-U32-SIZE (/ POSITION-DATA-U8-SIZE 4))
@@ -2494,60 +2726,67 @@
         (reset! transition-image* snapshot)))))
 
 (defn render-shape-pixels
-  [shape-id scale]
-  (let [buffer (uuid/get-u32 shape-id)
+  "Renders a shape subtree to encoded image bytes. `format` is :png, :jpeg or
+  :webp; jpeg is flattened onto white on the Rust side, since it has no alpha
+  channel."
+  [shape-id scale format]
+  (when (initialized?)
+    (let [buffer (uuid/get-u32 shape-id)
 
-        offset
-        (h/call wasm/internal-module "_render_shape_pixels"
-                (aget buffer 0)
-                (aget buffer 1)
-                (aget buffer 2)
-                (aget buffer 3)
-                scale)
+          offset
+          (h/call wasm/internal-module "_render_shape_pixels"
+                  (aget buffer 0)
+                  (aget buffer 1)
+                  (aget buffer 2)
+                  (aget buffer 3)
+                  scale
+                  (sr/translate-raster-format format))
 
-        heap (mem/get-heap-u8)
-        heapu32 (mem/get-heap-u32)
-        length (aget heapu32 (mem/->offset-32 offset))
-        result (dr/read-image-bytes heap (+ offset 12) length)]
-    (mem/free)
-    result))
+          heap (mem/get-heap-u8)
+          heapu32 (mem/get-heap-u32)
+          length (aget heapu32 (mem/->offset-32 offset))
+          result (dr/read-image-bytes heap (+ offset 12) length)]
+      (mem/free)
+      result)))
 
 (defn get-shape-extrect
   [shape-id]
-  (let [buffer (uuid/get-u32 shape-id)
-        offset (h/call wasm/internal-module "_get_shape_extrect"
-                       (aget buffer 0)
-                       (aget buffer 1)
-                       (aget buffer 2)
-                       (aget buffer 3))]
-    (when (and (number? offset) (pos? offset))
-      (let [heapf32 (mem/get-heap-f32)
-            base    (mem/->offset-32 offset)
-            x       (aget heapf32 base)
-            y       (aget heapf32 (+ base 1))
-            w       (aget heapf32 (+ base 2))
-            h       (aget heapf32 (+ base 3))]
-        (mem/free)
-        {:x x :y y :width w :height h}))))
+  (when (initialized?)
+    (let [buffer (uuid/get-u32 shape-id)
+          offset (h/call wasm/internal-module "_get_shape_extrect"
+                         (aget buffer 0)
+                         (aget buffer 1)
+                         (aget buffer 2)
+                         (aget buffer 3))]
+      (when (and (number? offset) (pos? offset))
+        (let [heapf32 (mem/get-heap-f32)
+              base    (mem/->offset-32 offset)
+              x       (aget heapf32 base)
+              y       (aget heapf32 (+ base 1))
+              w       (aget heapf32 (+ base 2))
+              h       (aget heapf32 (+ base 3))]
+          (mem/free)
+          {:x x :y y :width w :height h})))))
 
 (defn render-shape-pdf
   [shape-id scale]
-  (let [buffer (uuid/get-u32 shape-id)
+  (when (initialized?)
+    (let [buffer (uuid/get-u32 shape-id)
 
-        offset
-        (h/call wasm/internal-module "_render_shape_pdf"
-                (aget buffer 0)
-                (aget buffer 1)
-                (aget buffer 2)
-                (aget buffer 3)
-                scale)
+          offset
+          (h/call wasm/internal-module "_render_shape_pdf"
+                  (aget buffer 0)
+                  (aget buffer 1)
+                  (aget buffer 2)
+                  (aget buffer 3)
+                  scale)
 
-        heap (mem/get-heap-u8)
-        heapu32 (mem/get-heap-u32)
-        length (aget heapu32 (mem/->offset-32 offset))
-        result (dr/read-image-bytes heap (+ offset 4) length)]
-    (mem/free)
-    result))
+          heap (mem/get-heap-u8)
+          heapu32 (mem/get-heap-u32)
+          length (aget heapu32 (mem/->offset-32 offset))
+          result (dr/read-image-bytes heap (+ offset 4) length)]
+      (mem/free)
+      result)))
 
 (defn init-wasm-module
   [module]
diff --git a/frontend/src/app/render_wasm/api/enums.cljs b/frontend/src/app/render_wasm/api/enums.cljs
new file mode 100644
index 0000000000..de132c4638
--- /dev/null
+++ b/frontend/src/app/render_wasm/api/enums.cljs
@@ -0,0 +1,19 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.render-wasm.api.enums
+  "Binds this build's generated enums into the shared bridge.
+
+  `shared.js` is emitted next to this file by `render-wasm/build frontend` and
+  is not committed. Requiring this namespace is what makes
+  `app.common.render-wasm.wasm/serializers` usable."
+  (:require
+   ["./shared.js" :as shared]
+   [app.common.render-wasm.wasm :as wasm])
+  (:require-macros
+   [app.common.render-wasm.enums :as enums]))
+
+(wasm/init-serializers! (enums/serializers shared))
diff --git a/frontend/src/app/render_wasm/api/fonts.cljs b/frontend/src/app/render_wasm/api/fonts.cljs
index 5937ebc014..f6a9c83b6e 100644
--- a/frontend/src/app/render_wasm/api/fonts.cljs
+++ b/frontend/src/app/render_wasm/api/fonts.cljs
@@ -8,57 +8,37 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.fonts :as cfnt]
    [app.common.logging :as log]
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.text :as txt]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.main.fonts :as fonts]
    [app.main.store :as st]
-   [app.render-wasm.fallback-fonts :as fbf]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.wasm :as wasm]
    [app.util.http :as http]
+   [app.util.timers :as tm]
    [beicon.v2.core :as rx]
    [cuerdas.core :as str]
    [goog.object :as gobj]
    [lambdaisland.uri :as u]
-   [okulary.core :as l]
-   [potok.v2.core :as ptk]))
+   [okulary.core :as l]))
 
-(def ^:private fonts
+;; Custom fonts uploaded to the current team, keyed by id (`fonts` is taken by
+;; the `app.main.fonts` alias).
+(def ^:private custom-fonts
   (l/derived :fonts st/state))
 
+;; Emits the font-id of every font whose glyphs wasm can already shape and
+;; measure with. The browser-side loading of `app.main.fonts` is a separate
+;; signal: it only says the DOM can render the font.
+(defonce font-stored-stream (rx/subject))
+
 (def ^:private default-font-size 14)
 (def ^:private default-line-height 1.2)
 (def ^:private default-letter-spacing 0.0)
 
-(defn- google-font-id->uuid
-  "Returns the UUID for a Google Font ID. Uses uuid/zero as fallback when the
-  font is not found in fontsdb. uuid/zero maps to the default font (Source
-  Sans Pro) in WASM.
-  A font id may not exist for different reasons:
-  - the gfonts.json catalog was updated and fonts were renamed or removed,
-  - the file was imported from another Penpot instance with different fonts,
-  ..."
-  [font-id]
-  (let [font (fonts/get-font-data font-id)
-        result (:uuid font)]
-    (or result uuid/zero)))
-
-(defn- custom-font-id->uuid
-  [font-id]
-  (uuid/uuid (subs font-id (inc (str/index-of font-id "-")))))
-
-(defn- font-backend
-  [font-id]
-  (cond
-    (str/starts-with? font-id "gfont-")
-    :google
-    (str/starts-with? font-id "custom-")
-    :custom
-    :else
-    :builtin))
-
 (defn- font-db-data
   [font-id font-variant-id font-weight-fallback font-style-fallback]
   (let [font (fonts/get-font-data font-id)
@@ -68,15 +48,6 @@
       variant
       closest-variant)))
 
-(defn- font-id->uuid [font-id]
-  (case (font-backend font-id)
-    :google
-    (google-font-id->uuid font-id)
-    :custom
-    (custom-font-id->uuid font-id)
-    :builtin
-    uuid/zero))
-
 (defn uuid->font-id
   [font-uuid]
   (if (= font-uuid uuid/zero)
@@ -93,17 +64,17 @@
         "regular")))
 
 (defn ^:private font-id->asset-id [font-id font-variant-id font-weight font-style]
-  (case (font-backend font-id)
+  (case (cfnt/font-id->backend font-id)
     :google
     font-id
     :custom
-    (let [font-uuid (custom-font-id->uuid font-id)
+    (let [font-uuid (cfnt/font-id->uuid font-id)
           matching-font (some (fn [[_ font]]
                                 (and (= (:font-id font) font-uuid)
                                      (= (str (:font-weight font)) (str font-weight))
                                      (= (:font-style font) font-style)
                                      font))
-                              (seq @fonts))]
+                              (seq @custom-fonts))]
       (when matching-font
         (:ttf-file-id matching-font)))
     :builtin
@@ -112,7 +83,7 @@
 
 (defn update-text-layout
   [id]
-  (when wasm/context-initialized?
+  (when (wasm/live?)
     (let [shape-id-buffer (uuid/get-u32 id)]
       (h/call wasm/internal-module "_update_shape_text_layout_for"
               (aget shape-id-buffer 0)
@@ -122,7 +93,7 @@
 
 (defn force-update-text-layout
   [id]
-  (when wasm/context-initialized?
+  (when (wasm/live?)
     (let [shape-id-buffer (uuid/get-u32 id)]
       (h/call wasm/internal-module "_force_update_shape_text_layout_for"
               (aget shape-id-buffer 0)
@@ -133,7 +104,7 @@
 ;; IMPORTANT: Only TTF fonts can be stored.
 (defn- store-font-buffer
   [font-data font-array-buffer emoji? fallback?]
-  (when wasm/context-initialized?
+  (when (wasm/live?)
     (let [font-id-buffer  (:family-id-buffer font-data)
           size (.-byteLength font-array-buffer)
           ptr  (h/call wasm/internal-module "_alloc_bytes" size)
@@ -141,7 +112,6 @@
           mem  (js/Uint8Array. (.-buffer heap) ptr size)]
 
       (.set mem (js/Uint8Array. font-array-buffer))
-      (st/emit! (ptk/data-event :font-loaded {:font-id (:font-id font-data)}))
       (h/call wasm/internal-module "_store_font"
               (aget font-id-buffer 0)
               (aget font-id-buffer 1)
@@ -151,6 +121,8 @@
               (:style font-data)
               emoji?
               fallback?)
+      ;; Reported after the store call: subscribers react by measuring text.
+      (rx/push! font-stored-stream (:font-id font-data))
       true)))
 
 ;; Tracks fonts currently being fetched: {url -> fallback?}
@@ -186,13 +158,12 @@
 (defn- google-font-ttf-url
   [font-id font-variant-id font-weight font-style]
   (let [variant (font-db-data font-id font-variant-id font-weight font-style)]
-    (if-let [ttf-url (:ttf-url variant)]
-      (str/replace ttf-url "https://fonts.gstatic.com/s/" (u/join cf/public-uri "internal/gfonts/font/"))
-      nil)))
+    (when-let [ttf-url (:ttf-url variant)]
+      (cfnt/gstatic->proxy-url ttf-url (u/join cf/public-uri "internal/gfonts/font")))))
 
 (defn- font-id->ttf-url
   [font-id asset-id font-variant-id font-weight font-style]
-  (case (font-backend font-id)
+  (case (cfnt/font-id->backend font-id)
     :google
     (google-font-ttf-url font-id font-variant-id font-weight font-style)
     :custom
@@ -224,7 +195,9 @@
           font-data (assoc font-data :family-id-buffer id-buffer)
           font-stored? (font-stored? font-data emoji?)]
       (if font-stored?
-        (st/async-emit! (ptk/data-event :font-loaded {:font-id (:font-id font-data)}))
+        ;; Deferred so consumers, which subscribe after dispatching the sync
+        ;; that lands here, are listening when an already-stored font reports.
+        (tm/schedule #(rx/push! font-stored-stream (:font-id font-data)))
         (fetch-font font-data uri emoji? fallback?)))))
 
 (defn serialize-font-style
@@ -235,18 +208,6 @@
     "italic" 1
     0))
 
-(defn normalize-font-id
-  [font-id]
-  (try
-    (if ^boolean (str/starts-with? font-id "gfont-")
-      (google-font-id->uuid font-id)
-      (let [no-prefix (subs font-id (inc (str/index-of font-id "-")))]
-        (if (or (nil? no-prefix) (not (string? no-prefix)) (str/blank? no-prefix))
-          uuid/zero
-          (uuid/parse no-prefix))))
-    (catch :default _e
-      uuid/zero)))
-
 (defn normalize-span-font
   [span paragraph]
   (let [font-id (:font-id span)
@@ -348,7 +309,7 @@
         emoji? (get font :is-emoji false)
         fallback? (get font :is-fallback false)
         font-data (font-db-data font-id normalized-variant-id font-weight-fallback font-style-fallback)
-        wasm-id (font-id->uuid font-id)
+        wasm-id (cfnt/font-id->uuid font-id)
         raw-weight (or (:weight font-data) font-weight-fallback)
         weight (serialize-font-weight raw-weight)
         style (cond
@@ -405,7 +366,3 @@
 (defn store-fonts
   [fonts]
   (keep (fn [font] (store-font font)) fonts))
-
-(def add-emoji-font fbf/add-emoji-font)
-(def noto-fonts fbf/noto-fonts)
-(def add-noto-fonts fbf/add-noto-fonts)
diff --git a/frontend/src/app/render_wasm/api/texts.cljs b/frontend/src/app/render_wasm/api/texts.cljs
index 3ea55dfdb3..5a6565bc1e 100644
--- a/frontend/src/app/render_wasm/api/texts.cljs
+++ b/frontend/src/app/render_wasm/api/texts.cljs
@@ -6,21 +6,13 @@
 
 (ns app.render-wasm.api.texts
   (:require
-   [app.render-wasm.api.fonts :as f]
-   [app.render-wasm.fallback-fonts :as fbf]
-   [app.render-wasm.text-content :as tc]))
+   [app.common.render-wasm.text-content :as tc]
+   [app.render-wasm.api.fonts :as f]))
 
 (defn write-shape-text
   "Workspace text serialization: the byte writing is shared via
-  `app.render-wasm.text-content`; font resolution is the workspace's (fonts DB)."
+  `app.common.render-wasm.text-content`; font resolution is the workspace's (fonts DB)."
   [spans paragraph text]
   (tc/write-shape-text! spans paragraph text
-                        {:normalize-font-id   f/normalize-font-id
-                         :normalize-paragraph f/normalize-paragraph-font
+                        {:normalize-paragraph f/normalize-paragraph-font
                          :normalize-span      f/normalize-span-font}))
-
-;; Emoji/script detection lives in the host-agnostic
-;; `app.render-wasm.fallback-fonts`; kept re-exported here for existing
-;; workspace callers.
-(def contains-emoji? fbf/contains-emoji?)
-(def collect-used-languages fbf/collect-used-languages)
diff --git a/frontend/src/app/render_wasm/api/webgl.cljs b/frontend/src/app/render_wasm/api/webgl.cljs
index 23b8d57810..268dfe4462 100644
--- a/frontend/src/app/render_wasm/api/webgl.cljs
+++ b/frontend/src/app/render_wasm/api/webgl.cljs
@@ -8,13 +8,13 @@
   "WebGL utilities for pixel capture and rendering"
   (:require
    [app.common.logging :as log]
-   [app.render-wasm.wasm :as wasm]
+   [app.common.render-wasm.wasm :as wasm]
    [promesa.core :as p]))
 
 (defn get-webgl-context
   "Gets the WebGL context from the WASM module"
   []
-  (when wasm/context-initialized?
+  (when (wasm/live?)
     (let [gl-obj (unchecked-get wasm/internal-module "GL")]
       (when gl-obj
         ;; Get the current WebGL context from Emscripten
diff --git a/frontend/src/app/render_wasm/shape.cljs b/frontend/src/app/render_wasm/shape.cljs
index 403a1314ee..19e43e8eea 100644
--- a/frontend/src/app/render_wasm/shape.cljs
+++ b/frontend/src/app/render_wasm/shape.cljs
@@ -15,7 +15,6 @@
    [app.main.refs :as refs]
    [app.render-wasm.api :as api]
    [app.render-wasm.svg-filters :as svg-filters]
-   [app.render-wasm.wasm :as wasm]
    [beicon.v2.core :as rx]
    [cljs.core :as c]
    [cuerdas.core :as str]))
@@ -129,7 +128,7 @@
 ;; The `set-wasm-attr!` can return a list of callbacks to be executed in a second pass.
 (defn- set-wasm-attr!
   [shape k]
-  (when wasm/context-initialized?
+  (when (api/initialized?)
     (let [shape (case k
                   :svg-attrs (svg-filters/apply-svg-derived (assoc shape :svg-attrs (get shape :svg-attrs)))
                   (:fills :blur :shadow) (svg-filters/apply-svg-derived shape)
@@ -334,14 +333,15 @@
 
 (defn process-shape-changes!
   [objects shape-changes]
-  (let [shape-changes
-        (->> shape-changes
-             ;; We don't need to update the model for shapes not in the current page
-             (filter (fn [[shape-id _]] (shape-in-current-page? shape-id))))]
-    (when (d/not-empty? shape-changes)
-      (->> (rx/from shape-changes)
-           (rx/mapcat (fn [[shape-id props]] (process-shape! (get objects shape-id) props)))
-           (rx/subs! #(api/request-render "set-wasm-attrs"))))))
+  (when (api/initialized?)
+    (let [shape-changes
+          (->> shape-changes
+               ;; We don't need to update the model for shapes not in the current page
+               (filter (fn [[shape-id _]] (shape-in-current-page? shape-id))))]
+      (when (d/not-empty? shape-changes)
+        (->> (rx/from shape-changes)
+             (rx/mapcat (fn [[shape-id props]] (process-shape! (get objects shape-id) props)))
+             (rx/subs! #(api/request-render "set-wasm-attrs")))))))
 
 ;; `conj` empty set initialization
 (def conj* (fnil conj (d/ordered-set)))
diff --git a/frontend/src/app/render_wasm/text_editor.cljs b/frontend/src/app/render_wasm/text_editor.cljs
index d630346159..3c26916b2f 100644
--- a/frontend/src/app/render_wasm/text_editor.cljs
+++ b/frontend/src/app/render_wasm/text_editor.cljs
@@ -7,16 +7,18 @@
 (ns app.render-wasm.text-editor
   "Text editor WASM bindings"
   (:require
+   [app.common.render-wasm.helpers :as h]
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.serializers :as sr]
+   [app.common.render-wasm.serializers.color :as sr-clr]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.fills.impl :as types.fills.impl]
    [app.common.types.text :as txt]
    [app.common.uuid :as uuid]
    [app.main.fonts :as main-fonts]
+   ;; Required for side effects: binds the generated enums.
+   [app.render-wasm.api.enums]
    [app.render-wasm.api.fonts :as fonts]
-   [app.render-wasm.helpers :as h]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.serializers :as sr]
-   [app.render-wasm.serializers.color :as sr-clr]
-   [app.render-wasm.wasm :as wasm]
    [app.util.color :as uc]
    [app.util.dom :as dom]))
 
@@ -128,7 +130,6 @@
       nil)))
 
 (def ^:private selection-color-css-var "--text-editor-selection-background-color")
-(def ^:private caret-color-css-var "--text-editor-caret-color")
 
 (defn- resolve-theme-color
   "Resolve a themed CSS color variable (read from the document body) into a
@@ -140,21 +141,58 @@
               (dom/get-css-variable css-var js/document.body))]
     (sr-clr/hex->u32argb color opacity)))
 
+;; ARGB u32 for opaque white, painted with a Difference blend mode so the caret
+;; always shows the inverted color of the background.
+(def ^:private caret-invert-color 0xffffffff)
+
 (defn text-editor-apply-theme
-  "Push the current theme's selection and caret colors (read from the CSS
-   custom properties on the document body) into the WASM text editor. The
-   editor theme is a persistent singleton, so call once after init and again
-   on every color-scheme change."
+  "Push the current theme's selection color (read from the CSS custom properties
+   on the document body) into the WASM text editor, together with the default
+   caret: white with invert, so it shows the inverted color of the background.
+   The caret only switches to a solid text color (invert off) via
+   `text-editor-apply-caret-color`. The editor theme is a persistent singleton,
+   so call once after init and again on every color-scheme change."
   []
+  (when wasm/context-initialized?
+    (let [selection (resolve-theme-color selection-color-css-var)]
+      (when selection
+        (h/call wasm/internal-module "_text_editor_apply_theme" selection caret-invert-color true)))))
+
+(defn- solid-fill?
+  [fill]
+  (some? (:fill-color fill)))
+
+(defn resolve-caret-color
+  "Compute the caret color from the text `fills` at the caret (as returned by
+   `text-editor-get-current-styles`), as `{:color <argb-u32> :invert? bool}`:
+
+   - when there is at least one solid fill, match the topmost (visible) one,
+     painted normally (`:invert? false`);
+   - otherwise (no fill, gradient, image fills, mixed selection, …) use white
+     with `:invert? true`, which the renderer paints with a Difference blend so
+     the caret is the inverted color of whatever is behind it."
+  [fills]
+  (if-let [solid (and (sequential? fills)
+                      (some #(when (solid-fill? %) %) fills))]
+    {:color (sr-clr/hex->u32argb (:fill-color solid) (:fill-opacity solid))
+     :invert? false}
+    {:color caret-invert-color
+     :invert? true}))
+
+(defn text-editor-apply-caret-color
+  "Update the WASM text-editor caret color so it matches the text at the caret
+   (see `resolve-caret-color`). Re-applies the current theme selection color
+   unchanged, since the WASM theme is a singleton holding both."
+  [fills]
   (when wasm/context-initialized?
     (let [selection (resolve-theme-color selection-color-css-var)
-          caret     (resolve-theme-color caret-color-css-var)]
-      (when (and selection caret)
-        (h/call wasm/internal-module "_text_editor_apply_theme" selection caret)))))
+          {:keys [color invert?]} (resolve-caret-color fills)]
+      (when selection
+        (h/call wasm/internal-module "_text_editor_apply_theme" selection color invert?)))))
 
 (defn text-editor-focus
   [id]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [buffer (uuid/get-u32 id)]
       (when-not (h/call wasm/internal-module "_text_editor_focus"
                         (aget buffer 0)
@@ -166,49 +204,63 @@
 (defn text-editor-set-cursor-from-offset
   "Sets caret position from shape relative coordinates"
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_set_cursor_from_offset" x y)))
 
 (defn text-editor-set-cursor-from-point
   "Sets caret position from screen (canvas) coordinates"
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_set_cursor_from_point" x y)))
 
 (defn text-editor-toggle-overtype-mode
   "Toggles overtype mode"
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_toggle_overtype_mode")))
 
 (defn text-editor-pointer-down
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_pointer_down" x y)))
 
+(defn text-editor-pointer-down-extend
+  "Extends the selection up to the pointer instead of collapsing the caret."
+  [{:keys [x y]}]
+  (when (wasm/ready?)
+    (h/call wasm/internal-module "_text_editor_pointer_down_extend" x y)))
+
 (defn text-editor-pointer-move
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_pointer_move" x y)))
 
 (defn text-editor-pointer-up
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_pointer_up" x y)))
 
 (defn text-editor-update-blink
   [timestamp-ms]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_update_blink" timestamp-ms)))
 
 (defn text-editor-render-overlay
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_render_overlay")))
 
+(defn text-editor-render-caret
+  "Re-compose the frame from the Backbuffer (the last full render) and draw the
+   caret/selection overlay on top, submitting one atomic frame. Pixel identical
+   to the last full render at any zoom, so the blink does not flash."
+  []
+  (when wasm/context-initialized?
+    (h/call wasm/internal-module "_text_editor_render_caret")))
+
 (defn text-editor-poll-event
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [res (h/call wasm/internal-module "_text_editor_poll_event")]
       res)))
 
@@ -222,53 +274,6 @@
      2 :multiple
      0)))
 
-(defn- text-editor-translate-vertical-align
-  [vertical-align]
-  (case vertical-align
-    0 "top"
-    1 "center"
-    2 "bottom"))
-
-(defn- text-editor-translate-text-align
-  [text-align]
-  (case text-align
-    0 "left"
-    1 "center"
-    2 "right"
-    text-align))
-
-(defn- text-editor-translate-text-direction
-  [text-direction]
-  (case text-direction
-    0 "ltr"
-    1 "rtl"
-    text-direction))
-
-(defn- text-editor-translate-text-transform
-  [text-transform]
-  (case text-transform
-    0 "none"
-    1 "lowercase"
-    2 "uppercase"
-    3 "capitalize"
-    text-transform))
-
-(defn- text-editor-translate-text-decoration
-  [text-decoration]
-  (case text-decoration
-    0 "none"
-    1 "underline"
-    2 "linethrough"
-    3 "overline"
-    text-decoration))
-
-(defn- text-editor-translate-font-style
-  [font-style]
-  (case font-style
-    0 "normal"
-    1 "italic"
-    font-style))
-
 (defn- text-editor-compute-font-variant-id
   [font-id font-weight font-style]
   (let [font-data (main-fonts/get-font-data font-id)
@@ -279,7 +284,7 @@
 
 (defn text-editor-get-current-styles
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [ptr (h/call wasm/internal-module "_text_editor_get_current_styles")]
       (when (and ptr (not (zero? ptr)))
         (let [heap-u8 (mem/get-heap-u8)
@@ -318,7 +323,7 @@
               line-height-value (aget heap-f32 (+ u32-offset 29))
               letter-spacing-value (aget heap-f32 (+ u32-offset 30))
               font-id (fonts/uuid->font-id font-family-id-value)
-              font-style-value (text-editor-translate-font-style (text-editor-get-style-property font-style-state font-style-raw-value))
+              font-style-value (sr/untranslate-font-style (text-editor-get-style-property font-style-state font-style-raw-value))
               font-variant-id-computed (text-editor-compute-font-variant-id font-id font-weight-value font-style-value)
               ;; A font variant is defined by its family + weight + style, so it
               ;; is "mixed" when any of those is mixed. When the family itself is
@@ -343,11 +348,11 @@
               selected-colors (if (= multiple-fills 1) fills nil)
               fills (if (= multiple-fills 1) :multiple fills)
 
-              result {:vertical-align (text-editor-translate-vertical-align vertical-align)
-                      :text-align (text-editor-translate-text-align (text-editor-get-style-property text-align-state text-align-value))
-                      :text-direction (text-editor-translate-text-direction (text-editor-get-style-property text-direction-state text-direction-value))
-                      :text-decoration (text-editor-translate-text-decoration (text-editor-get-style-property text-decoration-state text-decoration-value))
-                      :text-transform (text-editor-translate-text-transform (text-editor-get-style-property text-transform-state text-transform-value))
+              result {:vertical-align (sr/untranslate-vertical-align vertical-align)
+                      :text-align (sr/untranslate-text-align (text-editor-get-style-property text-align-state text-align-value))
+                      :text-direction (sr/untranslate-text-direction (text-editor-get-style-property text-direction-state text-direction-value))
+                      :text-decoration (sr/untranslate-text-decoration (text-editor-get-style-property text-decoration-state text-decoration-value))
+                      :text-transform (sr/untranslate-text-transform (text-editor-get-style-property text-transform-state text-transform-value))
                       :line-height (text-editor-get-style-property line-height-state line-height-value)
                       :letter-spacing (text-editor-get-style-property letter-spacing-state letter-spacing-value)
                       :font-size (text-editor-get-style-property font-size-state font-size-value)
@@ -367,7 +372,7 @@
 (defn text-editor-encode-text-pre
   [text]
   (when (and (not (empty? text))
-             wasm/context-initialized?)
+             (wasm/ready?))
     (let [encoder (js/TextEncoder.)
           buf (.encode encoder text)
           heapu8 (mem/get-heap-u8)
@@ -378,31 +383,31 @@
 (defn text-editor-encode-text-post
   [text]
   (when (and (not (empty? text))
-             wasm/context-initialized?)
+             (wasm/ready?))
     (mem/free)))
 
 (defn text-editor-composition-start
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_composition_start")))
 
 (defn text-editor-composition-update
   [text]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (text-editor-encode-text-pre text)
     (h/call wasm/internal-module "_text_editor_composition_update")
     (text-editor-encode-text-post text)))
 
 (defn text-editor-composition-end
   [text]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (text-editor-encode-text-pre text)
     (h/call wasm/internal-module "_text_editor_composition_end")
     (text-editor-encode-text-post text)))
 
 (defn text-editor-insert-text
   [text]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (text-editor-encode-text-pre text)
     (h/call wasm/internal-module "_text_editor_insert_text")
     (text-editor-encode-text-post text)))
@@ -411,62 +416,62 @@
   ([]
    (text-editor-delete-backward false))
   ([word-boundary]
-   (when wasm/context-initialized?
+   (when (wasm/ready?)
      (h/call wasm/internal-module "_text_editor_delete_backward" word-boundary))))
 
 (defn text-editor-delete-forward
   ([]
    (text-editor-delete-forward false))
   ([word-boundary]
-   (when wasm/context-initialized?
+   (when (wasm/ready?)
      (h/call wasm/internal-module "_text_editor_delete_forward" word-boundary))))
 
 (defn text-editor-insert-paragraph []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_insert_paragraph")))
 
 (defn text-editor-move-cursor
   [direction word-boundary extend-selection]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_move_cursor" direction word-boundary (if extend-selection 1 0))))
 
 (defn text-editor-select-all
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_select_all")))
 
 (defn text-editor-select-word-boundary
   [{:keys [x y]}]
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_select_word_boundary" x y)))
 
 (defn text-editor-blur
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (when-not (h/call wasm/internal-module "_text_editor_blur")
       (throw (js/Error. "TextEditor blur failed")))))
 
 (defn text-editor-dispose
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (h/call wasm/internal-module "_text_editor_dispose")))
 
 (defn text-editor-has-focus?
   ([id]
-   (when wasm/context-initialized?
+   (when (wasm/ready?)
      (not (zero? (h/call wasm/internal-module "_text_editor_has_focus_with_id" id)))))
   ([]
-   (when wasm/context-initialized?
+   (when (wasm/ready?)
      (not (zero? (h/call wasm/internal-module "_text_editor_has_focus"))))))
 
 (defn text-editor-has-selection?
   ([]
-   (when wasm/context-initialized?
+   (when (wasm/ready?)
      (not (zero? (h/call wasm/internal-module "_text_editor_has_selection"))))))
 
 (defn text-editor-export-content
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [ptr (h/call wasm/internal-module "_text_editor_export_content")]
       (when (and ptr (not (zero? ptr)))
         (let [json-str (mem/read-string ptr)]
@@ -476,7 +481,7 @@
 (defn text-editor-export-selection
   "Export only the currently selected text as plain text from the WASM editor. Requires WASM support (_text_editor_export_selection)."
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [ptr (h/call wasm/internal-module "_text_editor_export_selection")]
       (when (and ptr (not (zero? ptr)))
         (let [text (mem/read-string ptr)]
@@ -485,7 +490,7 @@
 
 (defn text-editor-get-active-shape-id
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (try
       (let [byte-offset (mem/alloc 16)
             u32-offset (mem/->offset-32 byte-offset)
@@ -505,7 +510,7 @@
 
 (defn text-editor-get-selection
   []
-  (when wasm/context-initialized?
+  (when (wasm/ready?)
     (let [byte-offset     (mem/alloc 16)
           u32-offset      (mem/->offset-32 byte-offset)
           heap            (mem/get-heap-u32)
@@ -599,7 +604,7 @@
   shape-id and the fully merged content map ready for
   v2-update-text-shape-content."
   []
-  (when (and wasm/context-initialized? (text-editor-has-focus?))
+  (when (and (wasm/ready?) (text-editor-has-focus?))
     (let [shape-id  (text-editor-get-active-shape-id)
           new-texts (text-editor-export-content)]
       (when (and shape-id new-texts)
@@ -626,10 +631,9 @@
     {:start-para focus-para :start-offset focus-offset
      :end-para anchor-para :end-offset anchor-offset}))
 
-(defn- apply-attrs-to-paragraph
-  "Apply attrs to spans within [sel-start, sel-end) char range of a single paragraph.
-   Splits spans at boundaries as needed."
-  [para sel-start sel-end attrs]
+(defn apply-attrs-to-paragraph
+  "Apply `styles` (attrs map, or a fn per span) within [sel-start, sel-end), splitting spans."
+  [para sel-start sel-end styles]
   (let [spans  (:children para)
 
         result (loop [spans spans
@@ -648,8 +652,10 @@
                        (recur (rest spans) span-end (conj acc span))
                        (let [before   (when (> ol-start pos)
                                         (assoc span :text (subs text 0 (- ol-start pos))))
-                             selected (merge span attrs
-                                             {:text (subs text (- ol-start pos) (- ol-end pos))})
+                             selected (-> (if (fn? styles)
+                                            (styles span)
+                                            (merge span styles))
+                                          (assoc :text (subs text (- ol-start pos) (- ol-end pos))))
                              after    (when (< ol-end span-end)
                                         (assoc span :text (subs text (- ol-end pos))))]
                          (recur (rest spans) span-end
@@ -661,10 +667,51 @@
   [para]
   (apply + (map (fn [span] (count (:text span))) (:children para))))
 
+(defn- paragraph-selected-spans
+  "Return the spans of `para` that overlap the [sel-start, sel-end) char range."
+  [para sel-start sel-end]
+  (loop [spans (:children para)
+         pos   0
+         acc   []]
+    (if (empty? spans)
+      acc
+      (let [span     (first spans)
+            span-end (+ pos (count (:text span)))
+            overlap? (< (max pos sel-start) (min span-end sel-end))]
+        (recur (rest spans) span-end (cond-> acc overlap? (conj span)))))))
+
+(defn selection-fills
+  "The selection's fills: shared vector if all spans match, `:multiple` if not, nil if empty."
+  [content {:keys [start-para start-offset end-para end-offset]}]
+  (let [paragraphs (:children (first (:children content)))
+        selected   (mapcat (fn [idx para]
+                             (cond
+                               (or (< idx start-para) (> idx end-para)) nil
+                               (= start-para end-para) (paragraph-selected-spans para start-offset end-offset)
+                               (= idx start-para)      (paragraph-selected-spans para start-offset (para-char-count para))
+                               (= idx end-para)        (paragraph-selected-spans para 0 end-offset)
+                               :else                   (paragraph-selected-spans para 0 (para-char-count para))))
+                           (range (count paragraphs))
+                           paragraphs)
+        fills-set  (into #{} (map :fills) selected)]
+    (cond
+      (empty? selected)       nil
+      (= 1 (count fills-set)) (first fills-set)
+      :else                   :multiple)))
+
 (defn apply-styles-to-selection
-  [attrs use-shape-fn set-shape-text-content-fn]
-  (when wasm/context-initialized?
-    (let [shape-id  (text-editor-get-active-shape-id)
+  "Apply `styles` (attrs map, or a fn per span) to the selected spans; `:with-fills?` also returns `:fills`."
+  [styles use-shape-fn set-shape-text-content-fn & [{:keys [with-fills?]}]]
+  (when (wasm/ready?)
+    (let [;; Drop nil-valued attrs so they are never merged onto text spans.
+          ;; The DOM editor path strips these in `attrs->styles`; the WASM merge
+          ;; here (`apply-attrs-to-paragraph`) does not, so an unresolved attr
+          ;; (e.g. nil :font-family/:font-weight/:font-style from an unloaded
+          ;; font) would corrupt the span and fail the backend schema.
+          styles    (if (fn? styles)
+                      styles
+                      (into {} (remove (comp nil? val)) styles))
+          shape-id  (text-editor-get-active-shape-id)
           selection (text-editor-get-selection)]
 
       (when (and shape-id selection)
@@ -688,19 +735,19 @@
 
                               ;; same paragraph.
                               (= start-para end-para)
-                              (apply-attrs-to-paragraph para start-offset end-offset attrs)
+                              (apply-attrs-to-paragraph para start-offset end-offset styles)
 
                               ;; first paragraph
                               (= idx start-para)
-                              (apply-attrs-to-paragraph para start-offset (para-char-count para) attrs)
+                              (apply-attrs-to-paragraph para start-offset (para-char-count para) styles)
 
                               ;; final paragraph
                               (= idx end-para)
-                              (apply-attrs-to-paragraph para 0 end-offset attrs)
+                              (apply-attrs-to-paragraph para 0 end-offset styles)
 
                               ;; any other paragraph
                               :else
-                              (apply-attrs-to-paragraph para 0 (para-char-count para) attrs)))
+                              (apply-attrs-to-paragraph para 0 (para-char-count para) styles)))
 
                           (range (count paragraphs))
                           paragraphs))
@@ -713,5 +760,33 @@
                 (update-cached-content! shape-id new-content)
                 (use-shape-fn shape-id)
                 (set-shape-text-content-fn shape-id new-content)
-                {:shape-id shape-id
-                 :content  new-content}))))))))
+                (cond-> {:shape-id shape-id
+                         :content  new-content}
+                  with-fills?
+                  (assoc :fills (selection-fills new-content normalized-selection)))))))))))
+
+(defn apply-paragraph-attrs-to-selection
+  "Apply paragraph level attrs (text-align, text-direction) to the whole
+   paragraphs the editor selection touches; a collapsed caret means just the one
+   it sits in."
+  [attrs use-shape-fn set-shape-text-content-fn]
+  (when (wasm/ready?)
+    (let [shape-id  (text-editor-get-active-shape-id)
+          selection (text-editor-get-selection)]
+      (when (and shape-id selection)
+        (when-let [content (get-cached-content shape-id)]
+          (let [{:keys [start-para end-para]} (normalize-selection selection)
+                paragraph-set  (first (:children content))
+                new-paragraphs (into []
+                                     (map-indexed (fn [idx para]
+                                                    (if (<= start-para idx end-para)
+                                                      (merge para attrs)
+                                                      para)))
+                                     (:children paragraph-set))
+                new-content    (assoc content :children
+                                      [(assoc paragraph-set :children new-paragraphs)])]
+            (update-cached-content! shape-id new-content)
+            (use-shape-fn shape-id)
+            (set-shape-text-content-fn shape-id new-content)
+            {:shape-id shape-id
+             :content  new-content}))))))
diff --git a/frontend/src/app/render_wasm/wasm.cljs b/frontend/src/app/render_wasm/wasm.cljs
deleted file mode 100644
index 77d8726347..0000000000
--- a/frontend/src/app/render_wasm/wasm.cljs
+++ /dev/null
@@ -1,84 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC Sucursal en España SL
-
-(ns app.render-wasm.wasm
-  (:require ["./api/shared.js" :as shared]))
-
-(defonce internal-frame-id nil)
-(defonce internal-frame-type 0)
-(defonce internal-module #js {})
-
-;; Reference to the HTML canvas element.
-(defonce canvas nil)
-;; Snapshot of the current canvas as an `ImageBitmap`, suitable for painting
-;; into an overlay canvas. Created via `createImageBitmap` so capturing never
-;; encodes pixels on the main thread.
-(defonce canvas-snapshot nil)
-
-;; Reference to the Emscripten GL context wrapper.
-(defonce gl-context-handle nil)
-
-;; Reference to the actual WebGL Context returned
-;; by the `.getContext` method of the canvas.
-(defonce gl-context nil)
-
-(defonce context-initialized? false)
-(defonce context-lost? (atom false))
-
-;; When we're rendering in a sync way we want to stop the asynchrous `request-render`
-(defonce disable-request-render? (atom false))
-
-(defn module-ready?
-  []
-  (and internal-module (fn? (unchecked-get internal-module "_init"))))
-
-(defn reset-context-state!
-  []
-  (set! internal-frame-id nil)
-  (set! canvas nil)
-  (set! canvas-snapshot nil)
-  (set! gl-context-handle nil)
-  (set! gl-context nil)
-  (set! context-initialized? false)
-  (reset! context-lost? false))
-
-(defonce serializers
-  #js {:blur-type shared/RawBlurType
-       :blend-mode shared/RawBlendMode
-       :bool-type shared/RawBoolType
-       :font-style shared/RawFontStyle
-       :flex-direction shared/RawFlexDirection
-       :grid-direction shared/RawGridDirection
-       :grow-type shared/RawGrowType
-       :align-items shared/RawAlignItems
-       :align-self shared/RawAlignSelf
-       :align-content shared/RawAlignContent
-       :justify-items shared/RawJustifyItems
-       :justify-content shared/RawJustifyContent
-       :justify-self shared/RawJustifySelf
-       :wrap-type shared/RawWrapType
-       :grid-track-type shared/RawGridTrackType
-       :shadow-style shared/RawShadowStyle
-       :guide-kind shared/RawGuideKind
-       :stroke-style shared/RawStrokeStyle
-       :stroke-cap shared/RawStrokeCap
-       :shape-type shared/RawShapeType
-       :constraint-h shared/RawConstraintH
-       :constraint-v shared/RawConstraintV
-       :sizing shared/RawSizing
-       :vertical-align shared/RawVerticalAlign
-       :fill-data shared/RawFillData
-       :text-align shared/RawTextAlign
-       :text-direction shared/RawTextDirection
-       :text-decoration shared/RawTextDecoration
-       :text-transform shared/RawTextTransform
-       :multiple-state shared/MultipleState
-       :transform-entry-kind shared/RawTransformEntryKind
-       :segment-data shared/RawSegmentData
-       :stroke-linecap shared/RawStrokeLineCap
-       :stroke-linejoin shared/RawStrokeLineJoin
-       :fill-rule shared/RawFillRule})
-
diff --git a/frontend/src/app/util/clipboard.cljs b/frontend/src/app/util/clipboard.cljs
index 0d73774b37..3bc1f1bba3 100644
--- a/frontend/src/app/util/clipboard.cljs
+++ b/frontend/src/app/util/clipboard.cljs
@@ -9,7 +9,8 @@
    ["./clipboard.js" :as impl]
    [app.common.transit :as t]
    [app.util.dom :as dom]
-   [beicon.v2.core :as rx]))
+   [beicon.v2.core :as rx]
+   [cuerdas.core :as str]))
 
 (def image-types
   ["image/webp"
@@ -123,32 +124,81 @@
         (.write ^js clipboard #js [data]))
       (unavailable-error))))
 
+(defn- get-clipboard-item-ctor
+  "Return the `ClipboardItem` constructor, or nil on the browsers that
+   expose `clipboard.write` without it (Chrome < 116)."
+  []
+  (unchecked-get js/globalThis "ClipboardItem"))
+
+(defn- writable-mime?
+  "Browsers keep an allowlist of MIME types accepted by
+   `clipboard.write`; `image/svg+xml` is outside Firefox's (#10596).
+   `ClipboardItem.supports` exposes it when available; assume writable
+   otherwise, since `write` is still guarded by a rejection fallback."
+  [mime]
+  (let [ctor     (get-clipboard-item-ctor)
+        supports (some-> ctor (unchecked-get "supports"))]
+    (if (fn? supports)
+      (boolean (.call ^js supports ctor mime))
+      true)))
+
+(defn- unsupported-mime-error?
+  "True when `cause` is the `DOMException` a browser raises for a MIME
+   type outside its clipboard allowlist (#10596): \"Type 'image/svg+xml'
+   not supported for write\". Any other rejection (document not focused,
+   permission denied, insecure origin) must reach the caller instead of
+   being degraded to a text-only write."
+  [cause]
+  (let [message (str (when (some? cause) (unchecked-get cause "message")))]
+    (str/includes? message "not supported")))
+
+(defn- create-multi-clipboard-item
+  [items]
+  (js/ClipboardItem.
+   (reduce-kv
+    (fn [acc mime payload]
+      (let [blob (js/Blob. #js [payload] #js {:type mime})]
+        (unchecked-set acc mime (js/Promise.resolve blob))
+        acc))
+    #js {} items)))
+
+(defn- to-clipboard-text
+  [clipboard items]
+  (if-let [text (or (get items "text/plain")
+                    (first (vals items)))]
+    (if (unchecked-get clipboard "writeText")
+      (.writeText ^js clipboard text)
+      (unavailable-error))
+    (js/Promise.resolve)))
+
 (defn to-clipboard-multi
   "Write multiple MIME representations as a single ClipboardItem.
    `items` is a map of mime-type (string) -> string payload.
 
-   Falls back to `writeText` with the `text/plain` payload (or the
-   first available payload) when the asynchronous `clipboard.write`
-   API is unavailable. If neither path is reachable (e.g. insecure
-   origin), returns a rejected Promise mirroring `to-clipboard`'s
-   contract instead of throwing synchronously."
+   MIME types the browser refuses to write (per `ClipboardItem.supports`)
+   are dropped, and a `clipboard.write` rejected for an unsupported MIME
+   type falls back to `writeText` with the `text/plain` payload (or the
+   first available payload), which is also the path taken when
+   `clipboard.write` or `ClipboardItem` are missing altogether. Any other
+   rejection is propagated. If no path is reachable (e.g. insecure origin),
+   returns a rejected Promise mirroring `to-clipboard`'s contract instead
+   of throwing synchronously."
   [items]
-  (let [clipboard (get-clipboard)]
+  (let [clipboard (get-clipboard)
+        writable  (when clipboard
+                    (into {} (filter (comp writable-mime? key)) items))]
     (cond
-      (and clipboard (unchecked-get clipboard "write"))
-      (let [obj  (reduce-kv
-                  (fn [acc mime payload]
-                    (let [blob (js/Blob. #js [payload] #js {:type mime})]
-                      (unchecked-set acc mime (js/Promise.resolve blob))
-                      acc))
-                  #js {} items)
-            item (js/ClipboardItem. obj)]
-        (.write ^js clipboard #js [item]))
+      (and clipboard (seq writable)
+           (unchecked-get clipboard "write")
+           (some? (get-clipboard-item-ctor)))
+      (-> (.write ^js clipboard #js [(create-multi-clipboard-item writable)])
+          (.catch (fn [cause]
+                    (if (unsupported-mime-error? cause)
+                      (to-clipboard-text clipboard items)
+                      (js/Promise.reject cause)))))
 
-      (and clipboard (unchecked-get clipboard "writeText"))
-      (when-let [text (or (get items "text/plain")
-                          (first (vals items)))]
-        (.writeText ^js clipboard text))
+      (some? clipboard)
+      (to-clipboard-text clipboard items)
 
       :else
       (unavailable-error))))
diff --git a/frontend/src/app/util/code_gen/style_css.cljs b/frontend/src/app/util/code_gen/style_css.cljs
index f2b8e76418..85cf87ee0b 100644
--- a/frontend/src/app/util/code_gen/style_css.cljs
+++ b/frontend/src/app/util/code_gen/style_css.cljs
@@ -76,6 +76,10 @@ body {
    :transform
    :background
    :border
+   :border-block-start-width
+   :border-inline-end-width
+   :border-block-end-width
+   :border-inline-start-width
    :border-start-start-radius
    :border-start-end-radius
    :border-end-start-radius
diff --git a/frontend/src/app/util/code_gen/style_css_formats.cljs b/frontend/src/app/util/code_gen/style_css_formats.cljs
index 85e305fa4d..5f3741a638 100644
--- a/frontend/src/app/util/code_gen/style_css_formats.cljs
+++ b/frontend/src/app/util/code_gen/style_css_formats.cljs
@@ -34,6 +34,10 @@
    :border-end-start-radius   :string-or-size-array
    :border-end-end-radius     :string-or-size-array
    :border-width              :border-width
+   :border-block-start-width  :border-width
+   :border-inline-end-width   :border-width
+   :border-block-end-width    :border-width
+   :border-inline-start-width :border-width
    :border-style              :border-style
    :border-color              :border-color
    :box-shadow                :shadows
diff --git a/frontend/src/app/util/code_gen/style_css_values.cljs b/frontend/src/app/util/code_gen/style_css_values.cljs
index 9f53bea5ed..7bfda75b53 100644
--- a/frontend/src/app/util/code_gen/style_css_values.cljs
+++ b/frontend/src/app/util/code_gen/style_css_values.cljs
@@ -213,11 +213,32 @@
     (when (and (not (cgc/svg-markup? shape)) (not (cfh/group-shape? shape)) single-fill?)
       (fill->color (first fills)))))
 
+(defn stroke-per-side-widths
+  "Returns [top right bottom left] when the stroke has per-side widths
+  enabled and the sides actually differ; nil otherwise."
+  [stroke]
+  (when (:stroke-per-side stroke)
+    (let [width  (:stroke-width stroke)
+          top    (d/nilv (:stroke-width-top stroke) width)
+          right  (d/nilv (:stroke-width-right stroke) width)
+          bottom (d/nilv (:stroke-width-bottom stroke) width)
+          left   (d/nilv (:stroke-width-left stroke) width)]
+      (when-not (= top right bottom left)
+        [top right bottom left]))))
+
 (defn- get-border
   [shape]
   (when-not (cgc/svg-markup? shape)
     (get-stroke-data (first (:strokes shape)))))
 
+(defn- get-border-side-width
+  [shape-or-stroke index]
+  (let [stroke (if (contains? shape-or-stroke :strokes)
+                 (first (:strokes shape-or-stroke))
+                 shape-or-stroke)]
+    (when-let [widths (stroke-per-side-widths stroke)]
+      {:width (nth widths index)})))
+
 (defn- get-border-radius
   [{:keys [rx r1 r2 r3 r4] :as shape}]
   (cond
@@ -565,6 +586,10 @@
     :border-style (get-border-style shape)
     :border-width (get-border-width shape)
     :border-color (get-border-color shape)
+    :border-block-start-width (get-border-side-width shape 0)
+    :border-inline-end-width (get-border-side-width shape 1)
+    :border-block-end-width (get-border-side-width shape 2)
+    :border-inline-start-width (get-border-side-width shape 3)
     :border-radius (get-border-radius shape)
     :border-start-start-radius (get-border-start-start-radius shape)
     :border-start-end-radius (get-border-start-end-radius shape)
diff --git a/frontend/src/app/util/dom.cljs b/frontend/src/app/util/dom.cljs
index ca2809cfba..6bdc663f42 100644
--- a/frontend/src/app/util/dom.cljs
+++ b/frontend/src/app/util/dom.cljs
@@ -707,6 +707,13 @@
   (when (some? node)
     (.setAttribute node attr value)))
 
+(defn focus-and-untabbable!
+  [^js node]
+  (when (some? node)
+    (set-attribute! node "tabindex" "0")
+    (focus! node)
+    (set-attribute! node "tabindex" "-1")))
+
 (defn set-style!
   [^js node ^string style value]
   (when (some? node)
@@ -795,10 +802,8 @@
 (defn trigger-download
   [filename blob]
   (let [uri (wapi/create-uri blob)]
-    (try
-      (trigger-download-uri filename (.-type ^js blob) uri)
-      (finally
-        (wapi/revoke-uri uri)))))
+    (trigger-download-uri filename (.-type ^js blob) uri)
+    (js/setTimeout #(wapi/revoke-uri uri) 1000)))
 
 (defn event
   "Create an instance of DOM Event"
diff --git a/frontend/src/app/util/dom/dnd.cljs b/frontend/src/app/util/dom/dnd.cljs
index 2a1732d6c2..bb647db785 100644
--- a/frontend/src/app/util/dom/dnd.cljs
+++ b/frontend/src/app/util/dom/dnd.cljs
@@ -115,13 +115,13 @@
   ([e]
    (get-data e "penpot/data"))
   ([e data-type]
-   (let [dt (.-dataTransfer e)
-         data (.getData dt data-type)]
-     (cond-> data
-       (and (some? data) (not= data "")
-            (or (str/starts-with? data-type "penpot")
-                (= data-type "application/json")))
-       (t/decode-str)))))
+   (when-let [dt (.-dataTransfer e)]
+     (let [data (.getData dt data-type)]
+       (cond-> data
+         (and (some? data) (not= data "")
+              (or (str/starts-with? data-type "penpot")
+                  (= data-type "application/json")))
+         (t/decode-str))))))
 
 (defn get-files
   [e]
diff --git a/frontend/src/app/util/text_editor.cljs b/frontend/src/app/util/text_editor.cljs
index f46ed9aa35..4e91ee80ef 100644
--- a/frontend/src/app/util/text_editor.cljs
+++ b/frontend/src/app/util/text_editor.cljs
@@ -60,12 +60,14 @@
 
 (defn get-editor-block-data
   [block]
-  (-> (.getData ^js block)
-      (immutable-map->map)))
+  (when (some? block)
+    (-> (.getData ^js block)
+        (immutable-map->map))))
 
 (defn get-editor-block-type
   [block]
-  (.getType ^js block))
+  (when (some? block)
+    (.getType ^js block)))
 
 (defn get-editor-current-block-data
   [state]
diff --git a/frontend/src/app/util/theme.cljs b/frontend/src/app/util/theme.cljs
index 7291fe043e..07b21ec6cb 100644
--- a/frontend/src/app/util/theme.cljs
+++ b/frontend/src/app/util/theme.cljs
@@ -45,6 +45,17 @@
     (.removeAttribute node "class")
     (.add ^js (.-classList ^js node) class)))
 
+(defn resolve-theme
+  "Resolves the profile's theme setting to the effective UI theme ('dark' or
+  'light'): 'system' follows the given system theme, 'default' and an unset
+  theme mean dark, and any other value is taken as-is. Single source of truth
+  for the app's own theme and the theme reported to plugins."
+  [profile-theme system-theme]
+  (cond
+    (= profile-theme "system") system-theme
+    (= profile-theme "default") "dark"
+    :else (d/nilv profile-theme "dark")))
+
 (defn use-initialize
   [{profile-theme :theme}]
   (let [system-theme* (mf/use-state get-system-theme)
@@ -58,9 +69,5 @@
           (rx/dispose! s))))
 
     (mf/with-effect [system-theme profile-theme]
-      (set-color-scheme
-       (cond
-         (= profile-theme "system") system-theme
-         (= profile-theme "default") "dark"
-         :else (d/nilv profile-theme "dark")))
+      (set-color-scheme (resolve-theme profile-theme system-theme))
       (notify-color-scheme-listeners!))))
diff --git a/frontend/src/app/util/zip.cljs b/frontend/src/app/util/zip.cljs
index 72571f2e79..2288cbdaae 100644
--- a/frontend/src/app/util/zip.cljs
+++ b/frontend/src/app/util/zip.cljs
@@ -82,6 +82,10 @@
 
 (defn read-as-text
   [entry]
+  (when (nil? entry)
+    (ex/raise :type :assertion
+              :code :invalid-entry
+              :hint "cannot read zip entry: entry is nil"))
   (let [writer (new zip/TextWriter)]
     (.getData entry writer)))
 
diff --git a/frontend/src/app/worker/import.cljs b/frontend/src/app/worker/import.cljs
index e03bcaa4c8..ba6a49ce1e 100644
--- a/frontend/src/app/worker/import.cljs
+++ b/frontend/src/app/worker/import.cljs
@@ -7,6 +7,7 @@
 (ns app.worker.import
   (:refer-clojure :exclude [resolve])
   (:require
+   [app.common.exceptions :as ex]
    [app.common.json :as json]
    [app.common.logging :as log]
    [app.common.schema :as sm]
@@ -44,10 +45,15 @@
 
 (def conjv (fnil conj []))
 
-(defn- read-zip-manifest
+(defn read-zip-manifest
   [zip-reader]
   (->> (rx/from (uz/get-entry zip-reader "manifest.json"))
-       (rx/mapcat uz/read-as-text)
+       (rx/mapcat (fn [entry]
+                    (if (nil? entry)
+                      (rx/throw (ex/error :type :validation
+                                          :code :invalid-penpot-file
+                                          :hint "Not a valid Penpot file: manifest.json is missing"))
+                      (uz/read-as-text entry))))
        (rx/map json/decode)))
 
 (defn slurp-uri
@@ -98,7 +104,7 @@
                                      (if (= (:type manifest) "penpot/export-files")
                                        (let [manifest (decode-manifest manifest)]
                                          (assoc file :type :binfile-v3 :files (:files manifest)))
-                                       (assoc file :type :legacy-zip :body body))))
+                                       (assoc file :type :unknown))))
                                   (rx/finalize (partial uz/close zip-reader))))
 
                            (= "application/octet-stream" mtype)
diff --git a/frontend/src/app/worker/thumbnails.cljs b/frontend/src/app/worker/thumbnails.cljs
index 21d4e37190..0dd8916cf7 100644
--- a/frontend/src/app/worker/thumbnails.cljs
+++ b/frontend/src/app/worker/thumbnails.cljs
@@ -11,6 +11,7 @@
    [app.common.geom.rect :as grc]
    [app.common.geom.shapes.bounds :as gsb]
    [app.common.logging :as log]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.types.color :as cc]
    [app.common.uri :as u]
    [app.common.uuid :as uuid]
@@ -18,7 +19,6 @@
    [app.main.fonts :as fonts]
    [app.main.render :as render]
    [app.render-wasm.api :as wasm.api]
-   [app.render-wasm.wasm :as wasm]
    [app.util.http :as http]
    [app.worker.impl :as impl]
    [beicon.v2.core :as rx]
diff --git a/frontend/src/debug.cljs b/frontend/src/debug.cljs
index fb5cd5b5fe..f2ec88f412 100644
--- a/frontend/src/debug.cljs
+++ b/frontend/src/debug.cljs
@@ -15,6 +15,9 @@
    [app.common.json :as json]
    [app.common.logging :as l]
    [app.common.pprint :as pp]
+   [app.common.render-wasm.helpers :as wasm.h]
+   [app.common.render-wasm.mem :as wasm.mem]
+   [app.common.render-wasm.wasm :as wasm]
    [app.common.transit :as t]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
@@ -36,9 +39,6 @@
    [app.main.errors :as errors]
    [app.main.repo :as rp]
    [app.main.store :as st]
-   [app.render-wasm.helpers :as wasm.h]
-   [app.render-wasm.mem :as wasm.mem]
-   [app.render-wasm.wasm :as wasm]
    [app.util.debug :as dbg]
    [app.util.dom :as dom]
    [app.util.http :as http]
diff --git a/frontend/src/features.cljs b/frontend/src/features.cljs
index be61548a1b..d9f387e144 100644
--- a/frontend/src/features.cljs
+++ b/frontend/src/features.cljs
@@ -7,22 +7,22 @@
 ;; This namespace is only to export the functions for toggle features
 (ns features
   (:require
-   [app.main.features :as features]
+   [app.main.features :as feat]
    [app.main.store :as st]
    [app.plugins :as plugins]
    [app.util.timers :as tm]))
 
 (defn ^:export grid []
-  (tm/schedule-on-idle #(st/emit! (features/toggle-feature "layout/grid")))
+  (tm/schedule-on-idle #(st/emit! (feat/toggle-feature "layout/grid")))
   nil)
 
 (defn ^:export get-enabled []
-  (clj->js features/global-enabled-features))
+  (clj->js feat/global-enabled-features))
 
 (defn ^:export get-team-enabled []
   (clj->js (get @st/state :features)))
 
 (defn ^:export plugins []
-  (st/emit! (features/enable-feature "plugins/runtime"))
+  (st/emit! (feat/enable-feature "plugins/runtime"))
   (plugins/init-plugins-runtime)
   nil)
diff --git a/frontend/test/frontend_tests/composable_tests/interpreter.cljs b/frontend/test/frontend_tests/composable_tests/interpreter.cljs
index 0a6f3b9734..2d799246e5 100644
--- a/frontend/test/frontend_tests/composable_tests/interpreter.cljs
+++ b/frontend/test/frontend_tests/composable_tests/interpreter.cljs
@@ -47,11 +47,13 @@
    [app.main.data.workspace.transforms :as dwt]
    [app.main.data.workspace.undo :as dwu]
    [app.main.data.workspace.variants :as dwv]
+   [app.main.repo :as rp]
    [app.main.store :as st]
    [beicon.v2.core :as rx]
    [cljs.test :as t]
    [frontend-tests.composable-tests.comp.nodes :as n]
    [frontend-tests.composable-tests.core :as tm]
+   [frontend-tests.helpers.mock :as mock]
    [potok.v2.core :as ptk]))
 
 ;; --------------------------------------------------------------------------
@@ -351,17 +353,11 @@
       situation)))
 
 (defn- op-grace-ms
-  "Extra wait AFTER an event-op has settled, before proceeding. Zero for all ops
-   except `SyncFromLibrary`: the production `sync-file` event additionally
-   schedules `rx/timer 3000` + an `:update-file-library-sync-status` RPC. There is
-   no backend in the headless runner, so that delayed call fails (benignly) — but
-   3s after the sync it would land INSIDE whatever test is then running, leaking
-   an error trace across test boundaries (and historically destabilising
-   whole-suite runs). Waiting it out here absorbs the failure within the test that
-   caused it."
-  [op]
-  (let [op (if (tm/recorded-choice? op) (tm/choice-of op) op)]
-    (if (instance? n/SyncFromLibrary op) 3200 0)))
+  "Extra wait AFTER an event-op has settled, before proceeding. Always zero:
+   the `rx/timer` and `rp/cmd!` calls that `SyncFromLibrary` schedules are
+   mocked (see `check`) so they fire instantly and succeed."
+  [_op]
+  0)
 
 (defn- run-ops
   "Async fold over `ops` (concrete operation units, in order — plain ops and/or
@@ -464,22 +460,31 @@
    references the test holds (e.g. `has-property-of` on a change node). In-file
    propagation is AUTOMATIC (the watcher) — no propagate op is added.
 
+   Mocks are installed for the duration of the check: `rp/cmd!` returns
+   success (recording calls) and `rx/timer` fires instantly, so the
+   `SyncFromLibrary` op's delayed RPC does not produce network errors.
+
    Arities: `(check done case-map)` or `(check done case-map asserter)`."
   ([done case-map] (check done case-map nil))
   ([done {:keys [setup operation]} asserter]
-   (let [variants (tm/enumerate operation)]
-     (letfn [(run-next [vs]
-               (if (empty? vs)
-                 (done)
-                 (run-variant
-                  setup
-                  ;; a variant is a composed operation; flatten to its ordered leaf
-                  ;; ops. `enumerate` already removed all one-of choices, so the
-                  ;; variant is a Sequence (or a single op).
-                  (tm/sequence-ops (first vs))
-                  (fn [situation]
-                    (when asserter
-                      (t/testing (str "operations:\n  " (tm/describe-applied situation))
-                        (asserter situation)))
-                    (run-next (rest vs))))))]
-       (run-next variants)))))
+   (mock/with-mocks
+     {rp/cmd!  mock/rpc-cmd-mock
+      rx/timer mock/timer-mock}
+     (fn [inner-done]
+       (let [variants (tm/enumerate operation)]
+         (letfn [(run-next [vs]
+                   (if (empty? vs)
+                     (inner-done)
+                     (run-variant
+                      setup
+                      ;; a variant is a composed operation; flatten to its ordered leaf
+                      ;; ops. `enumerate` already removed all one-of choices, so the
+                      ;; variant is a Sequence (or a single op).
+                      (tm/sequence-ops (first vs))
+                      (fn [situation]
+                        (when asserter
+                          (t/testing (str "operations:\n  " (tm/describe-applied situation))
+                            (asserter situation)))
+                        (run-next (rest vs))))))]
+           (run-next variants))))
+     done)))
diff --git a/frontend/test/frontend_tests/data/dashboard_test.cljs b/frontend/test/frontend_tests/data/dashboard_test.cljs
new file mode 100644
index 0000000000..e73ebb889a
--- /dev/null
+++ b/frontend/test/frontend_tests/data/dashboard_test.cljs
@@ -0,0 +1,84 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.data.dashboard-test
+  (:require
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
+   [app.main.data.common :as dcm]
+   [app.main.repo :as rp]
+   [app.main.router :as rt]
+   [beicon.v2.core :as rx]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.mock :as mock]
+   [potok.v2.core :as ptk]))
+
+(t/deftest moving-current-team-into-sso-organization-redirects
+  (t/async done
+    (let [team-id      (uuid/next)
+          organization {:id (uuid/next) :name "OrgA"}
+          current-url  (str "https://penpot.example.com/#/dashboard/recent?team-id=" team-id)
+          redirect-url "https://idp.example.com/authorize"
+          state        {:current-team-id team-id}
+          event        (dcm/handle-change-team-organization
+                        {:team {:id team-id :organization organization}
+                         :notification nil})]
+      (mock/with-mocks
+        {cf/flags (conj cf/flags :admin-console)
+         rp/cmd! (mock/stub
+                  (fn [cmd params]
+                    (if (= [:check-nitrate-sso
+                            {:team-id team-id :url current-url}]
+                           [cmd params])
+                      (rx/of {:authorized false :redirect-uri redirect-url})
+                      (rx/throw (ex-info "unexpected RPC" {:cmd cmd :params params})))))
+         rt/get-current-href (mock/stub (constantly current-url))}
+        (fn [done']
+          (->> (ptk/watch event state nil)
+               (rx/reduce conj [])
+               (rx/subs!
+                (fn [events]
+                  (t/is (= [::rt/nav-raw] (mapv ptk/type events))))
+                (fn [error]
+                  (t/is false (str "unexpected error: " error))
+                  (done'))
+                (fn []
+                  (done')))))
+        done))))
+
+(t/deftest organization-sso-activation-redirects-current-team
+  (t/async done
+    (let [team-id      (uuid/next)
+          organization-id       (uuid/next)
+          current-url  (str "https://penpot.example.com/#/workspace?team-id=" team-id)
+          redirect-url "https://idp.example.com/authorize"
+          state        {:current-team-id team-id
+                        :teams {team-id {:id team-id
+                                         :organization {:id organization-id}}}}
+          event        (dcm/handle-organization-change-sso
+                        {:organization-id organization-id})]
+      (mock/with-mocks
+        {cf/flags (conj cf/flags :admin-console)
+         rp/cmd! (mock/stub
+                  (fn [cmd params]
+                    (if (= [:check-nitrate-sso
+                            {:team-id team-id :url current-url}]
+                           [cmd params])
+                      (rx/of {:authorized false :redirect-uri redirect-url})
+                      (rx/throw (ex-info "unexpected RPC" {:cmd cmd :params params})))))
+         rt/get-current-href (mock/stub (constantly current-url))}
+        (fn [done']
+          (->> (ptk/watch event state nil)
+               (rx/reduce conj [])
+               (rx/subs!
+                (fn [events]
+                  (t/is (= [::rt/nav-raw] (mapv ptk/type events))))
+                (fn [error]
+                  (t/is false (str "unexpected error: " error))
+                  (done'))
+                (fn []
+                  (done')))))
+        done))))
diff --git a/frontend/test/frontend_tests/data/exports_assets_test.cljs b/frontend/test/frontend_tests/data/exports_assets_test.cljs
new file mode 100644
index 0000000000..d4ae9edea8
--- /dev/null
+++ b/frontend/test/frontend_tests/data/exports_assets_test.cljs
@@ -0,0 +1,99 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.data.exports-assets-test
+  (:require
+   [app.common.uuid :as uuid]
+   [app.main.data.exports.assets :as de]
+   [app.main.data.persistence :as dwp]
+   [app.main.repo :as repo]
+   [app.main.store :as st]
+   [app.util.dom :as dom]
+   [app.util.websocket :as ws]
+   [beicon.v2.core :as rx]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.events :as the]
+   [frontend-tests.helpers.mock :as mock]
+   [potok.v2.core :as ptk]))
+
+(def ^:private export {:id (uuid/next)
+                       :object-id (uuid/next)
+                       :type :png
+                       :suffix ""
+                       :scale 1})
+
+(defn- export-with-name
+  [name]
+  (merge export {:name name}))
+
+(defn- test-state
+  []
+  {:profile-id (:id export)
+   :ws-conn nil})
+
+(t/deftest normalize-export-preserves-existing-name
+  (t/is (= (export-with-name "Layer 1")
+           (de/normalize-export (export-with-name "Layer 1")))))
+
+(t/deftest normalize-export-replaces-nil-name-with-object-id
+  (t/is (= (export-with-name (str (:object-id export)))
+           (de/normalize-export (assoc export :name nil)))))
+
+(t/deftest normalize-export-replaces-empty-name-with-object-id
+  (t/is (= (export-with-name (str (:object-id export)))
+           (de/normalize-export (assoc export :name "")))))
+
+(t/deftest request-simple-export-sends-normalized-export
+  (t/async done
+    (let [export (export-with-name "")
+          observed (atom nil)]
+      (mock/with-mocks {repo/cmd! (mock/stub (fn [_ params]
+                                               (reset! observed params)
+                                               (rx/of {:filename "export.png"
+                                                       :mtype "image/png"
+                                                       :uri "blob:export"})))
+                        dwp/force-persist-and-wait (mock/stub (fn [_] (rx/of ::force-persisted)))
+                        dom/trigger-download-uri (mock/stub (fn [& _] nil))}
+        (fn [done']
+          (let [completed (fn [_state]
+                            (t/is (= (export-with-name (str (:object-id export)))
+                                     (-> @observed :exports first))))]
+            (ptk/emit! (the/prepare-store (test-state) done' completed)
+                       (de/request-simple-export {:export export})
+                       :the/end)))
+        done))))
+
+(t/deftest request-multiple-export-sends-normalized-enabled-exports
+  (t/async done
+    (let [exports [{:id "enabled-1"
+                    :object-id "enabled-1"
+                    :shape {:id "enabled-1"}
+                    :type :png
+                    :suffix ""
+                    :scale 1
+                    :enabled true
+                    :name ""}]
+          observed (atom nil)]
+      (mock/with-mocks {repo/cmd! (mock/stub (fn [_ params]
+                                               (reset! observed params)
+                                               (rx/of {:id (:id export)})))
+                        ws/get-rcv-stream (mock/stub (fn [_] (rx/empty)))
+                        st/ongoing-tasks (atom #{})}
+        (fn [done']
+          (let [completed (fn [_state]
+                            (t/is (= [{:id "enabled-1"
+                                       :object-id "enabled-1"
+                                       :shape {:id "enabled-1"}
+                                       :type :png
+                                       :suffix ""
+                                       :scale 1
+                                       :enabled true
+                                       :name "enabled-1"}]
+                                     (:exports @observed))))]
+            (ptk/emit! (the/prepare-store (test-state) done' completed)
+                       (de/request-multiple-export {:exports exports})
+                       :the/end)))
+        done))))
diff --git a/frontend/test/frontend_tests/data/nitrate_test.cljs b/frontend/test/frontend_tests/data/nitrate_test.cljs
index bd5175f277..2c59912c70 100644
--- a/frontend/test/frontend_tests/data/nitrate_test.cljs
+++ b/frontend/test/frontend_tests/data/nitrate_test.cljs
@@ -6,14 +6,167 @@
 
 (ns frontend-tests.data.nitrate-test
   (:require
+   [app.common.time :as ct]
    [app.common.uri :as u]
+   [app.main.data.event :as ev]
    [app.main.data.nitrate :as dnt]
+   [app.main.data.nitrate-audit :as nitrate-audit]
+   [app.main.store :as st]
+   [app.main.ui.auth.verify-token :as verify-token]
    [cljs.test :as t :include-macros true]))
 
+(t/deftest account-age-days-test
+  (with-redefs [ct/now (constantly (ct/inst "2026-07-27T12:00:00Z"))]
+    (t/testing "returns the number of complete days since account creation"
+      (t/is (= 10
+               (dnt/account-age-days
+                {:created-at (ct/inst "2026-07-17T00:00:00Z")}))))
+
+    (t/testing "does not return negative ages"
+      (t/is (= 0
+               (dnt/account-age-days
+                {:created-at (ct/inst "2026-07-28T00:00:00Z")}))))
+
+    (t/testing "returns nil when the creation date is not an instant"
+      (t/is (nil? (dnt/account-age-days {})))
+      (t/is (nil? (dnt/account-age-days {:created-at "invalid"}))))))
+
+(t/deftest add-team-to-organization-audit-event-test
+  (with-redefs [ct/now (constantly (ct/inst "2026-07-27T12:00:00Z"))]
+    (t/testing "reports creating the first team in an organization"
+      (let [event @(nitrate-audit/add-team-to-organization-event
+                    {:organization-id "organization-1"
+                     :organization-team-count-before 0
+                     :team-previous-organization-status "no-organization"
+                     :add-method "create-team-in-organization"
+                     :subscription-status "trialing"})]
+        (t/is (= "add-team-to-organization" (::ev/name event)))
+        (t/is (= "dashboard:create-team-in-organization" (::ev/origin event)))
+        (t/is (= {:is-your-penpot false
+                  :add-method "create-team-in-organization"
+                  :organization-id "organization-1"
+                  :organization-team-count-before 0
+                  :team-previous-organization-status "no-organization"
+                  :is-first-team-in-organization true
+                  :subscription-status "trialing"}
+                 (dissoc event ::ev/name ::ev/origin)))))
+
+    (t/testing "reports moving an older team from another organization"
+      (let [event @(nitrate-audit/add-team-to-organization-event
+                    {:team {:id "team-2"
+                            :created-at (ct/inst "2026-07-17T12:00:00Z")}
+                     :organization-id "organization-2"
+                     :organization-team-count-before 3
+                     :team-previous-organization-status "other-organization"
+                     :add-method "move-existing-team-to-organization"
+                     :subscription-status "active"})]
+        (t/is (= "dashboard:move-team-to-organization" (::ev/origin event)))
+        (t/is (= 10 (:team-age-days event)))
+        (t/is (false? (:is-first-team-in-organization event)))))))
+
+(t/deftest organization-team-count-test
+  (let [organization-id "organization-1"
+        teams [{:id "default"
+                :is-default true
+                :organization-id organization-id}
+               {:id "team-1"
+                :is-default false
+                :organization-id organization-id}
+               {:id "team-2"
+                :is-default false
+                :organization {:id organization-id}}
+               {:id "other-team"
+                :is-default false
+                :organization-id "organization-2"}]]
+    (t/is (= 2
+             (nitrate-audit/organization-team-count
+              teams
+              organization-id)))))
+
+(t/deftest delete-organization-member-audit-event-test
+  (with-redefs [ct/now (constantly (ct/inst "2026-07-27T12:00:00Z"))]
+    (let [event @(nitrate-audit/delete-organization-member-event
+                  {:organization-id "organization-1"
+                   :user-id "profile-1"
+                   :user-who-delete-member "profile-1"
+                   :deleted-by-role "organization-member"
+                   :member-added-at (ct/inst "2026-07-17T12:00:00Z")
+                   :organization-member-count-before 4
+                   :subscription-status "trial"})]
+      (t/is (= "delete-organization-member" (::ev/name event)))
+      (t/is (nil? (::ev/origin event)))
+      (t/is (= {:organization-id "organization-1"
+                :user-id "profile-1"
+                :user-who-delete-member "profile-1"
+                :deleted-by-role "organization-member"
+                :days-since-member-added 10
+                :organization-member-count-before 4
+                :subscription-status "trial"}
+               (dissoc event ::ev/name))))
+
+    (t/testing "keeps a null age when the membership date is unavailable"
+      (let [event @(nitrate-audit/delete-organization-member-event
+                    {:organization-id "organization-1"
+                     :user-id "profile-1"
+                     :user-who-delete-member "profile-1"
+                     :deleted-by-role "organization-member"
+                     :organization-member-count-before 4
+                     :subscription-status "active"})]
+        (t/is (contains? event :days-since-member-added))
+        (t/is (nil? (:days-since-member-added event)))))))
+
+(t/deftest accept-organization-invitation-audit-event-test
+  (let [emitted (atom [])
+        props   {:team-id "team-1"
+                 :organization-id "organization-1"
+                 :role :editor
+                 :invitation-id "invitation-1"
+                 :organization-member-add-source "team-invitation"
+                 :belongs-to-team-on-add true
+                 :organization-member-count-before 4}]
+    (with-redefs [st/emit! (fn
+                             ([event]
+                              (swap! emitted conj event))
+                             ([event & events]
+                              (swap! emitted into (cons event events))))]
+      (verify-token/handle-token
+       {:iss :team-invitation
+        :state :created
+        :team-id "team-1"
+        :organization-invitation-audit
+        {:origin "team-invitation-acceptance"
+         :props props}}))
+
+    (let [event @(first @emitted)]
+      (t/is (= "accept-organization-invitation" (::ev/name event)))
+      (t/is (= "team-invitation-acceptance" (::ev/origin event)))
+      (t/is (= props (dissoc event ::ev/name ::ev/origin))))))
+
+(t/deftest build-admin-console-url-preserves-public-uri-subpath
+  (t/testing "builds admin console routes below the configured Penpot subpath"
+    (let [public-uri (u/uri "https://example.com/penpot/")]
+      (t/is (= "https://example.com/penpot/admin-console/"
+               (dnt/build-admin-console-url public-uri "" nil)))
+      (t/is (= "https://example.com/penpot/admin-console/organization/my-organization/organization-id/people/"
+               (dnt/build-admin-console-url
+                public-uri
+                "organization/my-organization/organization-id/people/"
+                nil)))
+      (t/is (= {:action "create-organization"
+                :origin "dashboard:organization-switcher"}
+               (-> (dnt/build-admin-console-url
+                    public-uri
+                    ""
+                    {:action "create-organization"
+                     :origin "dashboard:organization-switcher"})
+                   u/uri
+                   :query
+                   u/query-string->map))))))
+
 (t/deftest build-nitrate-callback-urls-preserves-hash-query
   (t/testing "appends subscription to an existing query inside the hash route"
-    (let [callbacks (dnt/build-nitrate-callback-urls
-                     "https://localhost:3449/#/dashboard/recent?team-id=e6666530-0216-81c8-8007-f17d6087b74f")]
+    (let [base-url  "https://localhost:3449/#/dashboard/recent?team-id=e6666530-0216-81c8-8007-f17d6087b74f"
+          callbacks (dnt/build-nitrate-callback-urls base-url base-url)]
       (t/is (= "https://localhost:3449/#/dashboard/recent?team-id=e6666530-0216-81c8-8007-f17d6087b74f&subscription=subscribed-to-penpot-nitrate"
                (:success-callback callbacks)))
       (t/is (= "https://localhost:3449/#/dashboard/recent?team-id=e6666530-0216-81c8-8007-f17d6087b74f&subscription=nitrate-checkout-error"
@@ -25,21 +178,51 @@
 
 (t/deftest build-nitrate-callback-urls-adds-hash-query-when-missing
   (t/testing "adds a hash query when the route has no query string yet"
-    (let [callbacks (dnt/build-nitrate-callback-urls
-                     "https://localhost:3449/#/settings/subscriptions")]
+    (let [base-url  "https://localhost:3449/#/settings/subscriptions"
+          callbacks (dnt/build-nitrate-callback-urls base-url base-url)]
       (t/is (= "https://localhost:3449/#/settings/subscriptions?subscription=subscribed-to-penpot-nitrate"
                (:success-callback callbacks))))))
 
 (t/deftest build-nitrate-callback-urls-adds-regular-query-without-hash
   (t/testing "falls back to the regular URL query when there is no hash route"
-    (let [callbacks (dnt/build-nitrate-callback-urls
-                     "https://localhost:3449/admin-console/licenses/billing?foo=bar")]
+    (let [base-url  "https://localhost:3449/admin-console/licenses/billing?foo=bar"
+          callbacks (dnt/build-nitrate-callback-urls base-url base-url)]
       (t/is (= "https://localhost:3449/admin-console/licenses/billing?foo=bar&subscription=subscribed-to-penpot-nitrate"
                (:success-callback callbacks))))))
 
 (t/deftest build-nitrate-callback-urls-accepts-uri-object
   (t/testing "accepts a URI object as base url (used by the nitrate-form modal)"
-    (let [callbacks (dnt/build-nitrate-callback-urls
-                     (u/uri "https://localhost:3449/#/settings/subscriptions"))]
+    (let [base-url  (u/uri "https://localhost:3449/#/settings/subscriptions")
+          callbacks (dnt/build-nitrate-callback-urls base-url base-url)]
       (t/is (= "https://localhost:3449/#/settings/subscriptions?subscription=nitrate-checkout-error"
                (:error-callback callbacks))))))
+
+(t/deftest build-nitrate-callback-urls-uses-separate-error-base
+  (t/testing "error callbacks use base-error-url while success/cancel use base-url"
+    (let [callbacks (dnt/build-nitrate-callback-urls
+                     "https://localhost:3449/#/dashboard/recent"
+                     "https://localhost:3449/#/settings/subscriptions")]
+      (t/is (= "https://localhost:3449/#/dashboard/recent?subscription=subscribed-to-penpot-nitrate"
+               (:success-callback callbacks)))
+      (t/is (= "https://localhost:3449/#/settings/subscriptions?subscription=nitrate-checkout-error"
+               (:error-callback callbacks)))
+      (t/is (= "https://localhost:3449/#/settings/subscriptions?subscription=nitrate-checkout-finish-error"
+               (:finish-error-callback callbacks)))
+      (t/is (= "https://localhost:3449/#/dashboard/recent?subscription=nitrate-checkout-cancelled"
+               (:cancel-callback callbacks))))))
+
+(t/deftest go-to-subscription-url-is-a-string
+  (t/testing "must be a string so licenses/billing?callback=... survives query encoding"
+    (t/is (string? dnt/go-to-subscription-url))
+    (t/is (not (u/uri? dnt/go-to-subscription-url)))))
+
+(t/deftest build-admin-console-billing-url-encodes-string-callback
+  (t/testing "billing callback query param round-trips as a real URL string"
+    (let [public-uri (u/uri "https://localhost:3449/")
+          callback   "https://localhost:3449/#/settings/subscriptions"
+          href       (dnt/build-admin-console-url
+                      public-uri
+                      "licenses/billing"
+                      {:callback callback})
+          parsed     (-> href u/uri :query u/query-string->map :callback)]
+      (t/is (= callback parsed)))))
diff --git a/frontend/test/frontend_tests/data/store_test.cljs b/frontend/test/frontend_tests/data/store_test.cljs
new file mode 100644
index 0000000000..56d29fec85
--- /dev/null
+++ b/frontend/test/frontend_tests/data/store_test.cljs
@@ -0,0 +1,49 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.data.store-test
+  "Unit tests for app.main.store.
+  Tests cover:
+    - format-last-events          – empty, single, multi, column alignment"
+  (:require
+   [app.main.store :as st]
+   [cljs.test :as t :include-macros true]
+   [cuerdas.core :as str]))
+
+(t/deftest format-last-events-empty
+  (t/testing "empty events produce empty string"
+    (t/is (= "" (st/format-last-events [])))))
+
+(t/deftest format-last-events-single
+  (t/testing "a single event shows (+0ms) and its name"
+    (let [result (st/format-last-events [{:name ":test/event" :t (js/Date. 1000)}])]
+      (t/is (str/includes? result "(+0ms)"))
+      (t/is (str/includes? result ":test/event"))
+      (t/is (= 1 (count (str/split result "\n")))))))
+
+(t/deftest format-last-events-multi
+  (t/testing "multiple events show correct deltas and event names"
+    (let [events [{:name ":event/a" :t (js/Date. 0)}
+                  {:name ":event/b" :t (js/Date. 500)}
+                  {:name ":event/c" :t (js/Date. 2500)}]
+          lines  (str/split (st/format-last-events events) "\n")]
+      (t/is (= 3 (count lines)))
+      (t/is (some #(str/includes? % ":event/a") lines))
+      (t/is (some #(str/includes? % ":event/b") lines))
+      (t/is (some #(str/includes? % ":event/c") lines))
+      (t/is (str/includes? (nth lines 0) "(+0ms)"))
+      (t/is (str/includes? (nth lines 1) "(+500ms)"))
+      (t/is (str/includes? (nth lines 2) "(+2000ms)")))))
+
+(t/deftest format-last-events-alignment
+  (t/testing "event names start at the same column across all lines"
+    (let [events [{:name ":evt-a" :t (js/Date. 0)}
+                  {:name ":evt-b" :t (js/Date. 500)}]
+          lines  (str/split (st/format-last-events events) "\n")
+          col-a  (.indexOf (nth lines 0) ":evt-a")
+          col-b  (.indexOf (nth lines 1) ":evt-b")]
+      (t/is (pos? col-a))
+      (t/is (= col-a col-b)))))
diff --git a/frontend/test/frontend_tests/data/workspace_pages_test.cljs b/frontend/test/frontend_tests/data/workspace_pages_test.cljs
new file mode 100644
index 0000000000..f5d2d9d2eb
--- /dev/null
+++ b/frontend/test/frontend_tests/data/workspace_pages_test.cljs
@@ -0,0 +1,129 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.data.workspace-pages-test
+  (:require
+   [app.common.data :as d]
+   [app.common.files.changes-builder :as pcb]
+   [app.common.test-helpers.files :as cthf]
+   [app.common.test-helpers.ids-map :as cthi]
+   [app.main.data.workspace.pages :as dwpg]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.state :as ths]))
+
+(t/use-fixtures :each
+  {:before cthi/reset-idmap!})
+
+(defn- pages
+  [state]
+  (let [file-id (:current-file-id state)]
+    (get-in state [:files file-id :data :pages])))
+
+(defn- make-five-pages
+  []
+  (-> (cthf/sample-file :file1 :page-label :page1)
+      (cthf/add-sample-page :page2)
+      (cthf/add-sample-page :page3)
+      (cthf/add-sample-page :page4)
+      (cthf/add-sample-page :page5)
+      (cthf/switch-to-page :page1)))
+
+;; ---------------------------------------------------------------------------
+;; Verify the order of undo changes so that when pages are restored they
+;; appear in the original page order (not reversed).
+;; ---------------------------------------------------------------------------
+
+(defn- add-page-ids-from-undo-changes
+  "Extract the sequence of page ids from the `:add-page` undo changes list."
+  [changes]
+  (->> (:undo-changes changes)
+       (keep (fn [change]
+               (when (= :add-page (:type change))
+                 (:id change))))))
+
+(t/deftest delete-pages-undo-changes-are-in-page-order
+  (let [file      (make-five-pages)
+        fdata     (:data file)
+        pindex    (:pages-index fdata)
+        pages     (:pages fdata)
+        page2-id  (cthi/id :page2)
+        page4-id  (cthi/id :page4)
+        del-ids   (filter #{page2-id page4-id} pages)
+
+        ;; Simulate the reduction from delete-pages but in REVERSE order
+        ;; (the fix iterates (reverse del-ids) so undo changes are in correct order)
+        changes   (reduce
+                   (fn [changes id]
+                     (let [page (-> (get pindex id)
+                                    (assoc :index (d/index-of pages id)))]
+                       (pcb/del-page changes page)))
+                   (pcb/empty-changes)
+                   del-ids)
+
+        undo-before-fix (add-page-ids-from-undo-changes changes)
+
+        changes-fixed   (reduce
+                         (fn [changes id]
+                           (let [page (-> (get pindex id)
+                                          (assoc :index (d/index-of pages id)))]
+                             (pcb/del-page changes page)))
+                         (pcb/empty-changes)
+                         (reverse del-ids))
+
+        undo-after-fix (add-page-ids-from-undo-changes changes-fixed)]
+
+    (t/is (= [page4-id page2-id] undo-before-fix)
+          "before fix: undo changes are reversed (page order)")
+    (t/is (= [page2-id page4-id] undo-after-fix)
+          "after fix: undo changes are in correct page order")))
+
+;; ---------------------------------------------------------------------------
+;; delete-pages removes the correct pages and keeps remaining pages in order
+;; ---------------------------------------------------------------------------
+
+(t/deftest delete-pages-removes-pages-and-keeps-remaining-in-order
+  (t/async
+    done
+    (let [file      (make-five-pages)
+          page2-id  (cthi/id :page2)
+          page4-id  (cthi/id :page4)
+          store     (ths/setup-store file)
+          events    [(dwpg/delete-pages [page2-id page4-id])]]
+
+      (ths/run-store
+       store done events
+       (fn [state]
+         (let [pgs (pages state)]
+           (t/is (= 3 (count pgs))
+                 "3 pages remain after deleting 2")
+           (t/is (= [(cthi/id :page1) (cthi/id :page3) (cthi/id :page5)]
+                    pgs)
+                 "remaining pages stay in the original order")))))))
+
+;; ---------------------------------------------------------------------------
+;; delete-pages keeps at least one page in the file
+;; ---------------------------------------------------------------------------
+
+(t/deftest delete-pages-keeps-at-least-one-page
+  (t/async
+    done
+    (let [file      (make-five-pages)
+          page1-id  (cthi/id :page1)
+          page2-id  (cthi/id :page2)
+          page3-id  (cthi/id :page3)
+          page4-id  (cthi/id :page4)
+          page5-id  (cthi/id :page5)
+          store     (ths/setup-store file)
+          events    [(dwpg/delete-pages [page1-id page2-id page3-id page4-id page5-id])]]
+
+      (ths/run-store
+       store done events
+       (fn [state]
+         (let [pgs (pages state)]
+           (t/is (= 1 (count pgs))
+                 "at least one page remains")
+           (t/is (= page1-id (first pgs))
+                 "the first page (in page order) is kept")))))))
diff --git a/frontend/test/frontend_tests/data/workspace_reflow_test.cljs b/frontend/test/frontend_tests/data/workspace_reflow_test.cljs
new file mode 100644
index 0000000000..a1a50bf985
--- /dev/null
+++ b/frontend/test/frontend_tests/data/workspace_reflow_test.cljs
@@ -0,0 +1,159 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.data.workspace-reflow-test
+  "Tests the reflow tasks the layout and text pipelines feed to
+  `app.main.data.workspace.reflow`, which is what plugin waits observe."
+  (:require
+   [app.common.uuid :as uuid]
+   [app.main.data.workspace.reflow :as wrf]
+   [app.main.data.workspace.shape-layout :as dwsl]
+   [app.main.data.workspace.texts :as dwtxt]
+   [cljs.test :as t :include-macros true]
+   [potok.v2.core :as ptk]))
+
+(t/use-fixtures :each {:before wrf/reset-pending!
+                       :after wrf/reset-pending!})
+
+;; Starts the `:layout/update` pipeline on a throwaway store; its empty state
+;; resolves every buffered update to no shapes and applies no modifiers.
+(defn- start-pipeline!
+  []
+  (doto (ptk/store {:state {} :on-error #(js/console.error %)})
+    (ptk/emit! (dwsl/initialize-shape-layout))))
+
+(defn- stop-pipeline!
+  [store]
+  (ptk/emit! store (dwsl/finalize-shape-layout)))
+
+(defn- start-text-pipeline!
+  []
+  (doto (ptk/store {:state {} :on-error #(js/console.error %)})
+    (ptk/emit! (dwtxt/initialize-text-reflow))))
+
+(defn- stop-text-pipeline!
+  [store]
+  (ptk/emit! store (dwtxt/finalize-text-reflow)))
+
+(t/deftest root-only-layout-update-is-not-pending-work
+  ;; The root lays out nothing, so an update with only its id holds no wait.
+  (t/async done
+    (let [store (start-pipeline!)]
+      (ptk/emit! store (ptk/data-event :layout/update {:ids [uuid/zero]}))
+      (-> (wrf/wait-for-layout-update nil 20)
+          (.then #(t/is true "resolved with no pending work"))
+          (.catch #(t/is false "a root-only update was marked as pending work"))
+          (.then (fn []
+                   (stop-pipeline! store)
+                   (done)))))))
+
+(t/deftest stale-task-cannot-finish-current-work
+  ;; Delayed callbacks from a finalized workspace carry the old generation and
+  ;; must not drain a new workspace task for the same shape id.
+  (t/async done
+    (let [id           (uuid/next)
+          stale-task   (wrf/start! :text-measure [id])
+          _             (wrf/reset-pending!)
+          current-task (wrf/start! :text-measure [id])]
+      (wrf/finish! stale-task)
+      (-> (wrf/wait-for-layout-update [id] 20)
+          (.then #(t/is false "a stale completion drained current work"))
+          (.catch #(t/is true "current work stayed pending"))
+          (.then (fn []
+                   (wrf/finish! current-task)
+                   (wrf/wait-for-layout-update [id] 100)))
+          (.then #(t/is true "the exact current task drained normally"))
+          (.catch #(t/is false "the current task did not drain"))
+          (.then (fn [] (done)))))))
+
+(t/deftest pending-promise-finishes-at-the-operation-boundary
+  ;; Imperative render work is pending from before its thunk starts until the
+  ;; exact promise returned by that thunk settles; no timer is involved.
+  (t/async done
+    (let [id       (uuid/next)
+          resolve* (atom nil)
+          started? (atom false)]
+      (wrf/run-pending!
+       :text-measure
+       [id]
+       (fn []
+         (reset! started? true)
+         (js/Promise. (fn [resolve _] (reset! resolve* resolve)))))
+      (-> (wrf/wait-for-layout-update [id] 20)
+          (.then #(t/is false "resolved while the render operation was pending"))
+          (.catch #(t/is @started? "the task was opened before running the operation"))
+          (.then (fn []
+                   (@resolve*)
+                   (wrf/wait-for-layout-update [id] 100)))
+          (.then #(t/is true "resolved as soon as the render operation settled"))
+          (.catch #(t/is false "the settled render operation stayed pending"))
+          (.then (fn [] (done)))))))
+
+(t/deftest pending-promise-finishes-after-a-synchronous-error
+  (let [id (uuid/next)]
+    (try
+      (wrf/run-pending! :text-measure [id] #(throw (js/Error. "boom")))
+      (catch :default _))
+    (t/async done
+      (-> (wrf/wait-for-layout-update [id] 100)
+          (.then #(t/is true "a synchronous failure drained its exact task"))
+          (.catch #(t/is false "a synchronous failure leaked pending work"))
+          (.then (fn [] (done)))))))
+
+(t/deftest deleted-shapes-cancel-only-their-work
+  (t/async done
+    (let [id-a   (uuid/next)
+          id-b   (uuid/next)
+          task-a (wrf/start! :text-bridge [id-a])
+          task-b (wrf/start! :text-bridge [id-b])]
+      (wrf/cancel-shapes! [id-a])
+      (-> (wrf/wait-for-layout-update [id-a] 100)
+          (.then #(t/is true "deleted shape work was cancelled"))
+          (.catch #(t/is false "deleted shape work stayed pending"))
+          (.then #(wrf/wait-for-layout-update [id-b] 20))
+          (.then #(t/is false "cancelling one shape drained its sibling"))
+          (.catch #(t/is true "sibling work stayed pending"))
+          (.then (fn []
+                   (wrf/finish! task-a)
+                   (wrf/finish! task-b)
+                   (done)))))))
+
+(t/deftest text-bridge-waits-for-each-shape
+  ;; Starting measurement for one id must not release sibling bridge tasks.
+  (t/async done
+    (let [store (start-text-pipeline!)
+          id-a  (uuid/next)
+          id-b  (uuid/next)]
+      (ptk/emit! store (ptk/data-event :text/reflow {:ids [id-a id-b]}))
+      (let [task-a (wrf/start! :text-measure [id-a])]
+        (wrf/finish! task-a))
+      (-> (wrf/wait-for-layout-update [id-b] 20)
+          (.then #(t/is false "the first text released its sibling bridge"))
+          (.catch #(t/is true "the sibling bridge stayed pending"))
+          (.then (fn []
+                   (let [task-b (wrf/start! :text-measure [id-b])]
+                     (wrf/finish! task-b))
+                   (wrf/wait-for-layout-update [id-b] 100)))
+          (.then #(t/is true "the sibling drained after its own measurement"))
+          (.catch #(t/is false "the sibling never drained"))
+          (.then (fn []
+                   (stop-text-pipeline! store)
+                   (done)))))))
+
+(t/deftest layout-update-is-pending-until-the-buffer-flushes
+  ;; A shape id is marked on arrival and drained when the update is processed.
+  (t/async done
+    (let [store (start-pipeline!)]
+      (ptk/emit! store (ptk/data-event :layout/update {:ids [(uuid/next) uuid/zero]}))
+      (-> (wrf/wait-for-layout-update nil 20)
+          (.then #(t/is false "resolved while the update was still buffered"))
+          (.catch #(t/is true "stayed pending until the flush"))
+          (.then #(wrf/wait-for-layout-update nil 5000))
+          (.then #(t/is true "resolved once the update was processed"))
+          (.catch #(t/is false "the pipeline never drained its mark"))
+          (.then (fn []
+                   (stop-pipeline! store)
+                   (done)))))))
diff --git a/frontend/test/frontend_tests/data/workspace_texts_test.cljs b/frontend/test/frontend_tests/data/workspace_texts_test.cljs
index ee438672c5..a52202bc48 100644
--- a/frontend/test/frontend_tests/data/workspace_texts_test.cljs
+++ b/frontend/test/frontend_tests/data/workspace_texts_test.cljs
@@ -407,3 +407,51 @@
           result    (vth/fix-position shape')]
       (t/is (some? result))
       (t/is (some? (:selrect result))))))
+
+;; ---------------------------------------------------------------------------
+;; Tests: ensure-valid-text-content
+;; ---------------------------------------------------------------------------
+
+(t/deftest ensure-valid-text-content-empty-children-repaired
+  (t/testing "root with empty :children vector is repaired to canonical tree"
+    (let [broken  {:type         "root"
+                   :vertical-align "top"
+                   :children     []}
+          fixed   (dwt/ensure-valid-text-content broken)]
+      (t/is (= "root" (:type fixed)))
+      (t/is (vector? (:children fixed)))
+      (t/is (= 1 (count (:children fixed)))
+            "exactly one paragraph-set is seeded")
+      (t/is (= "paragraph-set" (get-in fixed [:children 0 :type])))
+      (t/is (pos? (count (get-in fixed [:children 0 :children])))
+            "paragraph-set has at least one paragraph")
+      (t/is (= "" (get-in fixed [:children 0 :children 0 :children 0 :text]))
+            "seeded span has empty text")
+      (t/is (= "top" (:vertical-align fixed))
+            "preserves the original :vertical-align"))))
+
+(t/deftest ensure-valid-text-content-missing-children-repaired
+  (t/testing "root with no :children key is repaired to canonical tree"
+    (let [broken  {:type "root" :vertical-align "center"}
+          fixed   (dwt/ensure-valid-text-content broken)]
+      (t/is (vector? (:children fixed)))
+      (t/is (pos? (count (:children fixed))))
+      (t/is (= "center" (:vertical-align fixed))))))
+
+(t/deftest ensure-valid-text-content-healthy-tree-unchanged
+  (t/testing "a well-formed content is returned unchanged"
+    (let [healthy {:type "root"
+                   :children [{:type "paragraph-set"
+                               :children [{:type "paragraph"
+                                           :children [{:text "hello"}]}]}]}
+          fixed   (dwt/ensure-valid-text-content healthy)]
+      (t/is (= healthy fixed)))))
+
+(t/deftest ensure-valid-text-content-nil-unchanged
+  (t/testing "nil content is returned unchanged (no repair)"
+    (t/is (nil? (dwt/ensure-valid-text-content nil)))))
+
+(t/deftest ensure-valid-text-content-non-root-unchanged
+  (t/testing "a non-root content (e.g. paragraph) is left alone"
+    (let [node {:type "paragraph" :children []}]
+      (t/is (= node (dwt/ensure-valid-text-content node))))))
diff --git a/frontend/test/frontend_tests/helpers/state.cljs b/frontend/test/frontend_tests/helpers/state.cljs
index 90e4c995d0..eb7914b72c 100644
--- a/frontend/test/frontend_tests/helpers/state.cljs
+++ b/frontend/test/frontend_tests/helpers/state.cljs
@@ -33,17 +33,20 @@
     (pprint (sm/humanize-explain data))))
 
 (defn setup-store
-  [file]
-  (let [state (-> initial-state
-                  (assoc :current-file-id (:id file)
-                         :current-page-id (cthf/current-page-id file)
-                         :permissions {:can-edit true}
-                         :files {(:id file) file}))
-        store (ptk/store {:state state :on-error on-error})]
-    ;; Unit tests skip team/workspace bootstrap; mirror team init so
-    ;; :features is populated the same way as features/initialize does in app.
-    (ptk/emit! store (features/initialize #{}))
-    store))
+  ([file] (setup-store file nil))
+  ([file {:keys [renderer] :as _opts}]
+   (let [state (-> initial-state
+                   (assoc :current-file-id (:id file)
+                          :current-page-id (cthf/current-page-id file)
+                          :permissions {:can-edit true}
+                          :files {(:id file) file})
+                   (cond-> (some? renderer)
+                     (assoc-in [:profile :props :renderer] renderer)))
+         store (ptk/store {:state state :on-error on-error})]
+     ;; Unit tests skip team/workspace bootstrap; mirror team init so
+     ;; :features is populated the same way as features/initialize does in app.
+     (ptk/emit! store (features/initialize #{}))
+     store)))
 
 (defn run-store
   ([store done events completed-cb]
diff --git a/frontend/test/frontend_tests/helpers/wasm.cljs b/frontend/test/frontend_tests/helpers/wasm.cljs
index 4529e34582..1b05e203ac 100644
--- a/frontend/test/frontend_tests/helpers/wasm.cljs
+++ b/frontend/test/frontend_tests/helpers/wasm.cljs
@@ -86,6 +86,20 @@
   (track! :set-shape-grow-type)
   nil)
 
+(defn- mock-set-modifiers-start
+  []
+  (track! :set-modifiers-start)
+  nil)
+
+(defn- mock-set-modifiers-end
+  []
+  (track! :set-modifiers-end)
+  nil)
+
+(defn- mock-get-selection-rect
+  ([_ids] (track! :get-selection-rect) nil)
+  ([_ids _] (track! :get-selection-rect) nil))
+
 (defn- mock-initialized?
   []
   (track! :initialized?)
@@ -161,12 +175,26 @@
   "Stores the original WASM function values so they can be restored."
   (atom {}))
 
+;; Nesting depth of setup/teardown pairs. Only the outermost setup saves the
+;; originals and installs the mocks, and only the outermost teardown restores
+;; them, so a `with-wasm-mocks*` inside a fixture that already installed the
+;; mocks does not capture mocks as "originals" and leak them.
+(def ^:private install-depth (atom 0))
+
+(declare install-wasm-mocks!)
+
 (defn setup-wasm-mocks!
   "Install WASM mocks via `set!` that persist across async boundaries.
-   Also resets call counts. Call `teardown-wasm-mocks!` to restore."
+   Also resets call counts. Call `teardown-wasm-mocks!` to restore.
+   Nested calls are no-ops apart from resetting call counts."
   []
   ;; Reset call tracking
   (reset-call-counts!)
+  (when (= 1 (swap! install-depth inc))
+    (install-wasm-mocks!)))
+
+(defn- install-wasm-mocks!
+  []
   ;; Save originals
   (reset! originals
           {:initialized?            wasm.api/initialized?
@@ -181,6 +209,9 @@
            :set-shape-text-content  wasm.api/set-shape-text-content
            :set-shape-text-images   wasm.api/set-shape-text-images
            :get-text-dimensions     wasm.api/get-text-dimensions
+           :set-modifiers-start     wasm.api/set-modifiers-start
+           :set-modifiers-end       wasm.api/set-modifiers-end
+           :get-selection-rect      wasm.api/get-selection-rect
            :font-stored?            wasm.fonts/font-stored?
            :make-font-data          wasm.fonts/make-font-data
            :get-content-fonts       wasm.fonts/get-content-fonts})
@@ -197,16 +228,23 @@
   (set! wasm.api/set-shape-text-content  mock-set-shape-text-content)
   (set! wasm.api/set-shape-text-images   mock-set-shape-text-images)
   (set! wasm.api/get-text-dimensions     mock-get-text-dimensions)
+  (set! wasm.api/set-modifiers-start     mock-set-modifiers-start)
+  (set! wasm.api/set-modifiers-end       mock-set-modifiers-end)
+  (set! wasm.api/get-selection-rect      mock-get-selection-rect)
   (set! wasm.fonts/font-stored?          mock-font-stored?)
   (set! wasm.fonts/make-font-data        mock-make-font-data)
   (set! wasm.fonts/get-content-fonts     mock-get-content-fonts))
 
+(declare restore-wasm-mocks!)
+
 (defn teardown-wasm-mocks!
   "Restore the original WASM functions saved by `setup-wasm-mocks!`.
-   No-op when there is nothing to restore (`originals` empty): restoring from an
-   empty snapshot would `set!` every WASM function to nil, breaking any later
-   code that calls them (e.g. a leaked debounced event firing during a
-   subsequent test namespace)."
+   Nested calls are no-ops; only the outermost teardown restores."
+  []
+  (when (zero? (swap! install-depth #(max 0 (dec %))))
+    (restore-wasm-mocks!)))
+
+(defn- restore-wasm-mocks!
   []
   (when-let [orig (not-empty @originals)]
     (set! wasm.api/initialized?            (:initialized? orig))
@@ -221,6 +259,9 @@
     (set! wasm.api/set-shape-text-content  (:set-shape-text-content orig))
     (set! wasm.api/set-shape-text-images   (:set-shape-text-images orig))
     (set! wasm.api/get-text-dimensions     (:get-text-dimensions orig))
+    (set! wasm.api/set-modifiers-start     (:set-modifiers-start orig))
+    (set! wasm.api/set-modifiers-end       (:set-modifiers-end orig))
+    (set! wasm.api/get-selection-rect      (:get-selection-rect orig))
     (set! wasm.fonts/font-stored?          (:font-stored? orig))
     (set! wasm.fonts/make-font-data        (:make-font-data orig))
     (set! wasm.fonts/get-content-fonts     (:get-content-fonts orig)))
diff --git a/frontend/test/frontend_tests/logic/nudge_selected_shapes_test.cljs b/frontend/test/frontend_tests/logic/nudge_selected_shapes_test.cljs
new file mode 100644
index 0000000000..0d182e5fd3
--- /dev/null
+++ b/frontend/test/frontend_tests/logic/nudge_selected_shapes_test.cljs
@@ -0,0 +1,172 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.logic.nudge-selected-shapes-test
+  "Regression tests for the keyboard-nudge transform stream.
+
+  Holding an arrow key on a selection drives `nudge-selected-shapes`
+  through OS key-repeat. Before the throttle introduced for issue #10726,
+  every key-repeat was mapped 1:1 into a `set-modifiers`/`set-wasm-modifiers`
+  store write, which could starve the renderer and trip React error #185
+  (Maximum update depth exceeded).
+
+  These tests do NOT reproduce the render storm (that requires real React
+  renders and real OS key-repeat timing the unit harness cannot simulate).
+  They guard the invariant the throttle must preserve: after a burst of
+  `move-selected` events, the final committed shape position equals exactly
+  `(event-count) * nudge-step` — i.e. the throttle drops no displacement.
+  The legacy (non-WASM) branch case specifically guards the new un-sampled
+  `rx/last` commit substream against `sample` dropping the tail value on
+  completion."
+  (:require
+   [app.common.geom.rect :as grc]
+   [app.common.test-helpers.compositions :as ctho]
+   [app.common.test-helpers.files :as cthf]
+   [app.common.test-helpers.ids-map :as cthi]
+   [app.common.test-helpers.shapes :as cths]
+   [app.main.data.workspace.selection :as dws]
+   [app.main.data.workspace.transforms :as dwt]
+   [beicon.v2.core :as rx]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.state :as ths]
+   [frontend-tests.helpers.wasm :as thw]))
+
+(t/use-fixtures :each
+  {:before (fn []
+             (cthi/reset-idmap!)
+             ;; The Node test environment has no real WASM binary, so the
+             ;; WASM-branch cases below would throw inside `wasm.api/*`
+             ;; calls. Install lightweight mocks that let the CLJS-side
+             ;; logic (`apply-wasm-modifiers`'s `dwsh/update-shapes`)
+             ;; run normally while stubbing the WASM heap boundary.
+             (thw/setup-wasm-mocks!))
+   :after  (fn []
+             ;; Teardown runs after the async test's `done` fires.
+             (thw/teardown-wasm-mocks!))})
+
+(def ^:private nudge-event-count
+  "Number of `move-selected` events emitted in a burst. Chosen large enough
+  that, with a 16 ms `sample` cadence and the unit harness's synchronous
+  dispatch, the throttled live-preview substream would coalesce emissions
+  were it not for the final `rx/last` commit honoring the exact cumulative
+  position."
+  20)
+
+(def ^:private run-store-timeout-ms
+  "Delay before `run-store` invokes its completion callback.
+
+  `nudge-selected-shapes` does not complete its transform streams on source
+  completion alone; its internal stopper fires either after 1000 ms of idle
+  time or 250 ms after a key-up event (see `transforms.cljs`). The unit
+  harness emits no keyboard events, so only the 1000 ms idle timer can fire.
+  We let the harness wait long enough for that timer to fire and run the
+  final `apply-modifiers`/`finish-transform` before reading the store."
+  1500)
+
+(defn- run-nudge-store
+  "Like `ths/run-store` but the outer subscription completes on a fixed
+  timer instead of immediately on `:the/end`, giving the nudge's idle
+  stopper time to fire and commit the cumulative displacement."
+  [store done events completed-cb]
+  (ths/run-store store done events completed-cb (fn [_stream] (rx/timer run-store-timeout-ms))))
+
+(defn- shape-x
+  "Read a shape's committed x position from its points-derived rect."
+  [file label]
+  (let [shape (cths/get-shape file label)
+        rect  (grc/points->rect (:points shape))]
+    (:x rect)))
+
+(defn- shape-y
+  "Read a shape's committed y position from its points-derived rect."
+  [file label]
+  (let [shape (cths/get-shape file label)
+        rect  (grc/points->rect (:points shape))]
+    (:y rect)))
+
+(defn- make-file
+  []
+  (-> (cthf/sample-file :file1)
+      (ctho/add-rect :rect1 :x 100 :y 200 :width 50 :height 50)))
+
+(defn- burst-move-events
+  "Builds the event sequence: select rect, then `n` `move-selected` events
+  in the given `direction` (with `shift?` controlling the nudge big/small
+  step size — false = 1 px, true = 10 px)."
+  [file direction shift? n]
+  (let [rect (cths/get-shape file :rect1)]
+    (into [(dws/select-shape (:id rect))]
+          (repeat n (dwt/move-selected direction shift?)))))
+
+;; ---------------------------------------------------------------------------
+;; Default (WASM) branch — `render-wasm/v1` active (helpers/state default).
+;; ---------------------------------------------------------------------------
+
+(t/deftest nudge-burst-wasm-branches-commits-exact-final-position-right-small
+  (t/async
+    done
+    (let [file   (make-file)
+          store  (ths/setup-store file)
+          events (burst-move-events file :right false nudge-event-count)]
+      (run-nudge-store
+       store done events
+       (fn [new-state]
+         (let [file'    (ths/get-file-from-state new-state)
+               final-x  (shape-x file' :rect1)]
+           ;; nudge small = 1 px, direction :right => +x.
+           (t/is (= (+ 100 nudge-event-count) final-x)
+                 "WASM branch: final x equals original + N * small-nudge after a throttled burst")))))))
+
+(t/deftest nudge-burst-wasm-branches-commits-exact-final-position-up-big
+  (t/async
+    done
+    (let [file   (make-file)
+          store  (ths/setup-store file)
+          events (burst-move-events file :up true nudge-event-count)]
+      (run-nudge-store
+       store done events
+       (fn [new-state]
+         (let [file'    (ths/get-file-from-state new-state)
+               final-y  (shape-y file' :rect1)]
+           ;; nudge big = 10 px, direction :up => -y.
+           (t/is (= (- 200 (* 10 nudge-event-count)) final-y)
+                 "WASM branch: final y equals original - N * big-nudge after a throttled burst")))))))
+
+;; ---------------------------------------------------------------------------
+;; Legacy (non-WASM) branch — :renderer :svg disables render-wasm/v1.
+;; This case specifically guards the new `rx/last` commit substream added
+;; alongside the live-preview sample: if `sample` drops the tail value on
+;; completion, the un-sampled `rx/last` write still delivers the exact
+;; cumulative position to `apply-modifiers`.
+;; ---------------------------------------------------------------------------
+
+(t/deftest nudge-burst-legacy-branch-commits-exact-final-position-right-small
+  (t/async
+    done
+    (let [file   (make-file)
+          store  (ths/setup-store file {:renderer :svg})
+          events (burst-move-events file :right false nudge-event-count)]
+      (run-nudge-store
+       store done events
+       (fn [new-state]
+         (let [file'    (ths/get-file-from-state new-state)
+               final-x  (shape-x file' :rect1)]
+           (t/is (= (+ 100 nudge-event-count) final-x)
+                 "Legacy branch: final x equals original + N * small-nudge after a throttled burst")))))))
+
+(t/deftest nudge-burst-legacy-branch-commits-exact-final-position-up-big
+  (t/async
+    done
+    (let [file   (make-file)
+          store  (ths/setup-store file {:renderer :svg})
+          events (burst-move-events file :up true nudge-event-count)]
+      (run-nudge-store
+       store done events
+       (fn [new-state]
+         (let [file'    (ths/get-file-from-state new-state)
+               final-y  (shape-y file' :rect1)]
+           (t/is (= (- 200 (* 10 nudge-event-count)) final-y)
+                 "Legacy branch: final y equals original - N * big-nudge after a throttled burst")))))))
\ No newline at end of file
diff --git a/frontend/test/frontend_tests/plugins/context_shapes_test.cljs b/frontend/test/frontend_tests/plugins/context_shapes_test.cljs
index 0bba39cd40..c417b43dab 100644
--- a/frontend/test/frontend_tests/plugins/context_shapes_test.cljs
+++ b/frontend/test/frontend_tests/plugins/context_shapes_test.cljs
@@ -9,9 +9,14 @@
    [app.common.math :as m]
    [app.common.test-helpers.files :as cthf]
    [app.common.uuid :as uuid]
+   [app.main.data.workspace.reflow :as wrf]
+   [app.main.data.workspace.shapes :as dwsh]
+   [app.main.data.workspace.wasm-text :as dwwt]
    [app.main.store :as st]
    [app.plugins.api :as api]
+   [app.plugins.shape :as shape]
    [app.util.object :as obj]
+   [beicon.v2.core :as rx]
    [cljs.test :as t :include-macros true]
    [frontend-tests.helpers.state :as ths]
    [frontend-tests.helpers.wasm :as thw]
@@ -404,3 +409,270 @@
           (let [shadows (.-shadows shape)]
             (t/is (array? shadows))
             (t/is (= 0 (.-length shadows)))))))))
+
+;; ---- waitForLayoutUpdate tests ------------------------------------------
+;;
+;; `waitForLayoutUpdate` resolves once the shapes with reflow work in flight
+;; have drained from the `app.main.data.workspace.reflow` pending task map.
+;; The tests drive that map directly with `start!` / `finish!` instead
+;; of replaying internal pipeline events. A minimal store is still installed so
+;; `create-context` / `shape-proxy` can resolve the global st/state.
+
+(def ^:private original-st-state st/state)
+(def ^:private original-st-stream st/stream)
+(def ^:private zero-id "00000000-0000-0000-0000-000000000000")
+
+(t/use-fixtures :each
+  {:before (fn []
+             ;; Keep the WASM mocks installed across the async test bodies:
+             ;; debounced text-resize timers leaked by earlier test namespaces
+             ;; can fire inside this namespace's async waits, and in Node they
+             ;; would otherwise reach the real (unavailable) WASM API.
+             (thw/setup-wasm-mocks!)
+             (wrf/reset-pending!))
+   :after (fn []
+            (thw/teardown-wasm-mocks!)
+            (wrf/reset-pending!)
+            (set! st/state original-st-state)
+            (set! st/stream original-st-stream))})
+
+(defn- make-test-store
+  "Creates a minimal potok store with an empty state map and installs it as the
+  global st/state and st/stream for the duration of the calling test."
+  []
+  (let [test-store (ptk/store {:state {} :on-error (fn [e] (js/console.error e))})]
+    (set! st/state test-store)
+    (set! st/stream (ptk/input-stream test-store))
+    test-store))
+
+(t/deftest test-wait-for-layout-update-no-pending
+  ;; When nothing is pending the promise resolves immediately via the fast path
+  ;; (the behavior-subject replays the empty map on subscribe).
+  (t/async done
+    (make-test-store)
+    (let [^js ctx (api/create-context zero-id)]
+      (-> (.waitForLayoutUpdate ctx)
+          (.then (fn []
+                   (t/is true "resolved with no pending work")
+                   (done)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err))
+                    (done)))))))
+
+(t/deftest test-wait-for-layout-update-pending
+  ;; While a shape is pending the context promise stays unresolved; it resolves
+  ;; once that shape is marked done.
+  (t/async done
+    (make-test-store)
+    (wrf/start! :layout [(uuid/next)])
+    (let [^js ctx (api/create-context zero-id)
+          resolved (atom false)]
+      (-> (.waitForLayoutUpdate ctx)
+          (.then (fn [] (reset! resolved true)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err)))))
+      (js/setTimeout
+       (fn []
+         (t/is (false? @resolved) "must not resolve while a shape is pending")
+         ;; Draining everything resolves the context wait.
+         (wrf/reset-pending!)
+         (js/setTimeout
+          (fn []
+            (t/is (true? @resolved) "resolves once nothing is pending")
+            (done))
+          20))
+       20))))
+
+(t/deftest test-wait-for-layout-update-per-shape
+  ;; `shape.waitForLayoutUpdate()` only waits for that shape: draining another
+  ;; shape must not resolve it; draining its own id does.
+  (t/async done
+    (make-test-store)
+    (let [id-a (uuid/next)
+          id-b (uuid/next)
+          task-a (wrf/start! :layout [id-a])
+          task-b (wrf/start! :layout [id-b])
+          ^js shape-a (shape/shape-proxy zero-id uuid/zero uuid/zero id-a)
+          resolved (atom false)]
+      (-> (.waitForLayoutUpdate shape-a)
+          (.then (fn [] (reset! resolved true)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err)))))
+      ;; Draining the other shape leaves A pending.
+      (wrf/finish! task-b)
+      (js/setTimeout
+       (fn []
+         (t/is (false? @resolved) "shape A wait must stay pending while A is pending")
+         (wrf/finish! task-a)
+         (js/setTimeout
+          (fn []
+            (t/is (true? @resolved) "resolves once shape A drains")
+            (done))
+          20))
+       20))))
+
+(t/deftest test-wait-for-layout-update-overlapping-tasks
+  ;; Two overlapping operations on the same shape: finishing one task must not
+  ;; resolve the wait while the second operation is still in flight.
+  (t/async done
+    (make-test-store)
+    (let [id (uuid/next)
+          task-a (wrf/start! :layout [id])
+          task-b (wrf/start! :layout [id])
+          ^js shape (shape/shape-proxy zero-id uuid/zero uuid/zero id)
+          resolved (atom false)]
+      (-> (.waitForLayoutUpdate shape)
+          (.then (fn [] (reset! resolved true)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err)))))
+      ;; First operation finishes; second is still pending.
+      (wrf/finish! task-a)
+      (js/setTimeout
+       (fn []
+         (t/is (false? @resolved) "must not resolve while a second op is in flight")
+         (wrf/finish! task-b)
+         (js/setTimeout
+          (fn []
+            (t/is (true? @resolved) "resolves once both operations drain")
+            (done))
+          20))
+       20))))
+
+(t/deftest test-wait-for-layout-update-timeout
+  ;; When the optional timeout fires before the shape drains the promise should
+  ;; reject with an Error whose message mentions "timeout".
+  (t/async done
+    (make-test-store)
+    (wrf/start! :layout [(uuid/next)])
+    (let [^js ctx (api/create-context zero-id)]
+      (-> (.waitForLayoutUpdate ctx 20)
+          (.then (fn []
+                   (t/is false "expected rejection but promise resolved")
+                   (done)))
+          (.catch (fn [^js err]
+                    (t/is (instance? js/Error err) "rejection value should be an Error")
+                    (t/is (some? (re-find #"timeout" (.-message err))) "error message should mention timeout")
+                    (done)))))))
+
+(t/deftest test-wait-for-layout-update-subtree
+  ;; A shape wait covers its whole subtree: reflow work is often marked on the
+  ;; children rather than on the shape the caller holds (a group is re-measured
+  ;; through its texts), so a pending child must block the parent.
+  (t/async done
+    (let [store (ths/setup-store (cthf/sample-file :file1 :page-label :page1))]
+      (set! st/state store)
+      (set! st/stream (ptk/input-stream store))
+      (let [^js ctx   (api/create-context zero-id)
+            ^js board (.createBoard ctx)
+            ^js rect  (.createRectangle ctx)]
+        (.appendChild board rect)
+        (let [child-id (obj/get rect "$id")
+              task (wrf/start! :layout [child-id])
+              resolved (atom false)]
+          (-> (.waitForLayoutUpdate board)
+              (.then (fn [] (reset! resolved true)))
+              (.catch (fn [err]
+                        (t/is false (str "unexpected rejection: " err)))))
+          (js/setTimeout
+           (fn []
+             (t/is (false? @resolved) "parent wait must block on a pending child")
+             (wrf/finish! task)
+             (js/setTimeout
+              (fn []
+                (t/is (true? @resolved) "resolves once the child drains")
+                (done))
+              20))
+           20))))))
+
+(t/deftest test-wait-for-layout-update-invalid-timeout
+  ;; A non-numeric or non-positive timeout is an invalid argument. The method
+  ;; always hands back a promise and rejects it, whatever the plugin's
+  ;; throwValidationErrors flag says.
+  (t/async done
+    (make-test-store)
+    (let [^js ctx   (api/create-context zero-id)
+          ^js shape (shape/shape-proxy zero-id uuid/zero uuid/zero (uuid/next))
+          rejected? (fn [^js promise]
+                      (t/is (instance? js/Promise promise) "must return a promise")
+                      (-> promise
+                          (.then (fn [] false))
+                          (.catch (fn [] true))))]
+      (-> (js/Promise.all
+           #js [(rejected? (.waitForLayoutUpdate ctx "soon"))
+                (rejected? (.waitForLayoutUpdate ctx 0))
+                (rejected? (.waitForLayoutUpdate ctx -5))
+                (rejected? (.waitForLayoutUpdate ctx js/NaN))
+                (rejected? (.waitForLayoutUpdate ctx js/Infinity))
+                (rejected? (.waitForLayoutUpdate shape "soon"))])
+          (.then (fn [results]
+                   (t/is (every? true? (array-seq results))
+                         "every invalid timeout must reject")
+                   (done)))))))
+
+(t/deftest test-with-pending-marks-on-subscribe
+  ;; `with-pending` marks on subscription, not while the observable is being
+  ;; built, so an observable that is never subscribed leaves nothing pending.
+  (t/async done
+    (make-test-store)
+    (let [id      (uuid/next)
+          ;; Built but never subscribed.
+          _       (wrf/with-pending :layout [id] (rx/of :ignored))
+          ^js ctx (api/create-context zero-id)]
+      (-> (.waitForLayoutUpdate ctx 50)
+          (.then (fn []
+                   (t/is true "an unsubscribed with-pending must not mark anything")
+                   (done)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err))
+                    (done)))))))
+
+(t/deftest test-with-pending-drains-on-terminate
+  ;; Once subscribed, the shape is pending for the lifetime of the wrapped
+  ;; observable and drains when it completes.
+  (t/async done
+    (make-test-store)
+    (let [id       (uuid/next)
+          subject  (rx/subject)
+          ^js shape (shape/shape-proxy zero-id uuid/zero uuid/zero id)
+          resolved (atom false)]
+      (rx/sub! (wrf/with-pending :layout [id] subject) (fn [_] nil))
+      (-> (.waitForLayoutUpdate shape)
+          (.then (fn [] (reset! resolved true)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err)))))
+      (js/setTimeout
+       (fn []
+         (t/is (false? @resolved) "must stay pending while the wrapped stream is alive")
+         (rx/end! subject)
+         (js/setTimeout
+          (fn []
+            (t/is (true? @resolved) "resolves once the wrapped stream completes")
+            (done))
+          20))
+       20))))
+
+(t/deftest test-resize-wasm-text-all-pending-across-buffer-commit
+  ;; While a shape-update buffer is open (token propagation) `resize-wasm-text-all`
+  ;; holds the resizes back until the commit lands, and the shapes stay pending
+  ;; for that whole wait.
+  (t/async done
+    (let [store    (ths/setup-store (cthf/sample-file :file1 :page-label :page1))
+          id       (uuid/next)
+          resolved (atom false)]
+      (ptk/emit! store (dwsh/update-shapes-buffer-start))
+      (ptk/emit! store (dwwt/resize-wasm-text-all [id]))
+      (-> (wrf/wait-for-layout-update [id] nil)
+          (.then (fn [] (reset! resolved true)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err)))))
+      (js/setTimeout
+       (fn []
+         (t/is (false? @resolved) "must stay pending while the buffer has not committed")
+         (ptk/emit! store (dwsh/update-shapes-buffer-commit))
+         ;; Covers the commit plus the per-shape debounce the resizes go through.
+         (js/setTimeout
+          (fn []
+            (t/is (true? @resolved) "resolves once the commit releases the resizes")
+            (done))
+          300))
+       50))))
diff --git a/frontend/test/frontend_tests/plugins/tokens_test.cljs b/frontend/test/frontend_tests/plugins/tokens_test.cljs
index f064f234e0..5c6122f346 100644
--- a/frontend/test/frontend_tests/plugins/tokens_test.cljs
+++ b/frontend/test/frontend_tests/plugins/tokens_test.cljs
@@ -262,7 +262,7 @@
                   (fn [id theme]
                     (swap! captured conj {:id id :theme theme})
                     :update-token-theme)
-                  st/emit! identity]
+                  st/emit! mock/noop]
       (.addSet theme set)
       (.removeSet theme set)
       (t/is (= [theme-id theme-id] (mapv :id @captured)))
@@ -385,18 +385,18 @@
         theme-id  (uuid/next)
         theme     (ctob/make-token-theme :id theme-id :group "mode" :name "Light")
         emitted   (atom [])
-        invalid   (atom [])]
-    (with-redefs [u/locate-token-set   (constantly nil)
-                  u/locate-token-theme (fn [_ id] (when (= id theme-id) theme))
-                  u/not-valid          (fn [_ code value] (swap! invalid conj [code value]))
-                  dwtl/update-token-theme (fn [id theme] {:id id :theme theme})
-                  st/emit!             (fn ([event] (swap! emitted conj event) nil)
-                                         ([event & _] (swap! emitted conj event) nil))]
+        errors    (atom [])]
+    (with-redefs [u/locate-token-set         (constantly nil)
+                  u/locate-token-theme       (fn [_ id] (when (= id theme-id) theme))
+                  u/throw-validation-errors? (constantly true)
+                  dwtl/update-token-theme    (fn [id theme] {:id id :theme theme})
+                  st/emit!                   (fn ([event] (swap! emitted conj event) nil)
+                                               ([event & _] (swap! emitted conj event) nil))]
       (let [theme-proxy (ptok/token-theme-proxy plugin-id file-id theme-id)]
         ;; Non-id, non-proxy arguments are rejected by the schema coercer.
-        (.addSet theme-proxy 42)
-        (.removeSet theme-proxy nil)
+        (try (.addSet theme-proxy 42) (catch :default e (swap! errors conj e)))
+        (try (.removeSet theme-proxy nil) (catch :default e (swap! errors conj e)))
         (t/is (empty? @emitted))
-        (t/is (= 2 (count @invalid)))
-        (t/is (every? #(= :error (first %)) @invalid))))))
+        (t/is (= 2 (count @errors)))
+        (t/is (every? #(instance? js/Error %) @errors))))))
 
diff --git a/frontend/test/frontend_tests/render_dimensions_test.cljs b/frontend/test/frontend_tests/render_dimensions_test.cljs
new file mode 100644
index 0000000000..d3773f6b36
--- /dev/null
+++ b/frontend/test/frontend_tests/render_dimensions_test.cljs
@@ -0,0 +1,78 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.render-dimensions-test
+  (:require
+   [app.common.geom.rect :as grc]
+   [app.common.geom.shapes.bounds :as gsb]
+   [app.common.test-helpers.files :as cthf]
+   [app.common.test-helpers.ids-map :as cthi]
+   [app.common.test-helpers.shapes :as cths]
+   [app.common.types.shape :as cts]
+   [app.common.uuid :as uuid]
+   [app.main.render :as render]
+   [cljs.test :as t :include-macros true]))
+
+(defn- make-objects
+  "Create a proper objects map with a root frame and the given shapes."
+  [& shapes]
+  (let [root-frame (cts/setup-shape {:id uuid/zero
+                                     :type :frame
+                                     :parent-id uuid/zero
+                                     :frame-id uuid/zero
+                                     :name "Root Frame"
+                                     :shapes (mapv :id shapes)})
+        objects {uuid/zero root-frame}]
+    (reduce (fn [objs shape]
+              (assoc objs (:id shape) (assoc shape :frame-id uuid/zero)))
+            objects
+            shapes)))
+
+(t/deftest calculate-dimensions-normal-bounds
+  (t/testing "Normal bounding box should pass"
+    (let [shape1 (cts/setup-shape {:type :rect :x 100 :y 100 :width 200 :height 150})
+          shape2 (cts/setup-shape {:type :rect :x 400 :y 300 :width 100 :height 100})
+          objects (make-objects shape1 shape2)
+          result (render/calculate-dimensions objects nil)]
+      (t/is (some? result))
+      (t/is (<= (:width result) render/max-export-dimension))
+      (t/is (<= (:height result) render/max-export-dimension)))))
+
+(t/deftest calculate-dimensions-extreme-width
+  (t/testing "Extreme width should throw export-area-too-large"
+    (let [shape (cts/setup-shape {:type :rect :x 0 :y 0 :width 200000 :height 100})
+          objects (make-objects shape)]
+      (t/is (thrown-with-msg?
+             js/Error
+             #"export area exceeds maximum allowed dimensions"
+             (render/calculate-dimensions objects nil))))))
+
+(t/deftest calculate-dimensions-extreme-height
+  (t/testing "Extreme height should throw export-area-too-large"
+    (let [shape (cts/setup-shape {:type :rect :x 0 :y 0 :width 100 :height 200000})
+          objects (make-objects shape)]
+      (t/is (thrown-with-msg?
+             js/Error
+             #"export area exceeds maximum allowed dimensions"
+             (render/calculate-dimensions objects nil))))))
+
+(t/deftest calculate-dimensions-extreme-position
+  (t/testing "Shape at extreme position should throw export-area-too-large"
+    (let [shape (cts/setup-shape {:type :rect :x 500000 :y 500000 :width 100 :height 100})
+          objects (make-objects shape)]
+      (t/is (thrown-with-msg?
+             js/Error
+             #"export area exceeds maximum allowed dimensions"
+             (render/calculate-dimensions objects nil))))))
+
+(t/deftest calculate-dimensions-exactly-at-limit
+  (t/testing "Bounding box exactly at limit should pass"
+    (let [shape (cts/setup-shape {:type :rect :x 0 :y 0 :width render/max-export-dimension :height render/max-export-dimension})
+          objects (make-objects shape)
+          result (render/calculate-dimensions objects nil)]
+      (t/is (some? result))
+      (t/is (<= (:width result) render/max-export-dimension))
+      (t/is (<= (:height result) render/max-export-dimension)))))
diff --git a/frontend/test/frontend_tests/render_wasm/process_objects_test.cljs b/frontend/test/frontend_tests/render_wasm/process_objects_test.cljs
index c985b336ae..cf9e68670a 100644
--- a/frontend/test/frontend_tests/render_wasm/process_objects_test.cljs
+++ b/frontend/test/frontend_tests/render_wasm/process_objects_test.cljs
@@ -15,9 +15,9 @@
    font URL get no callback (fetch-font returns nil when the URL is already
    in :fetching) and are permanently stuck with fallback-font layout metrics."
   (:require
+   [app.common.render-wasm.mem :as mem]
+   [app.common.render-wasm.wasm :as wasm]
    [app.render-wasm.api :as wasm.api]
-   [app.render-wasm.mem :as mem]
-   [app.render-wasm.wasm :as wasm]
    [beicon.v2.core :as rx]
    [cljs.test :as t :include-macros true]))
 
diff --git a/frontend/test/frontend_tests/render_wasm/text_editor_apply_styles_test.cljs b/frontend/test/frontend_tests/render_wasm/text_editor_apply_styles_test.cljs
new file mode 100644
index 0000000000..a6756b8951
--- /dev/null
+++ b/frontend/test/frontend_tests/render_wasm/text_editor_apply_styles_test.cljs
@@ -0,0 +1,102 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.render-wasm.text-editor-apply-styles-test
+  "Unit tests for applying styles to a selection of text spans.
+
+   `apply-attrs-to-paragraph` splits the affected spans at the selection
+   boundaries and either merges a map of attrs onto the selected spans or, when
+   given a function, transforms each selected span. The function form is what
+   fill operations (add, remove, reorder...) rely on to preserve each span's
+   existing fills instead of overwriting them."
+  (:require
+   [app.render-wasm.text-editor :as text-editor]
+   [cljs.test :as t :include-macros true]))
+
+(def ^:private apply-attrs-to-paragraph text-editor/apply-attrs-to-paragraph)
+
+(defn- span [text fills]
+  {:text text :fills fills})
+
+(def ^:private red {:fill-color "#ff0000" :fill-opacity 1})
+(def ^:private green {:fill-color "#00ff00" :fill-opacity 1})
+
+(defn- prepend-fill
+  "Mirrors the `add-fill` node transform: prepend a fill to the span's fills."
+  [fill]
+  (fn [node] (update node :fills #(into [fill] %))))
+
+(t/deftest apply-map-attrs
+  (t/testing "a map of attrs is merged onto the selected span"
+    (let [para   {:children [(span "hello world" [red])]}
+          result (apply-attrs-to-paragraph para 0 5 {:font-size "20"})]
+      (t/is (= [(assoc (span "hello" [red]) :font-size "20")
+                (span " world" [red])]
+               (:children result))))))
+
+(t/deftest apply-fn-preserves-existing-fills
+  (t/testing "the fn form prepends to the selected span's existing fills"
+    (let [para   {:children [(span "hello world" [red])]}
+          result (apply-attrs-to-paragraph para 0 5 (prepend-fill green))]
+      (t/is (= [(span "hello" [green red])
+                (span " world" [red])]
+               (:children result)))))
+
+  (t/testing "each selected span keeps its own fills across multiple spans"
+    (let [para   {:children [(span "foo" [red])
+                             (span "bar" [green])]}
+          ;; select the whole paragraph (6 chars) and prepend green
+          result (apply-attrs-to-paragraph para 0 6 (prepend-fill green))]
+      (t/is (= [(span "foo" [green red])
+                (span "bar" [green green])]
+               (:children result)))))
+
+  (t/testing "a span outside the selection is left untouched"
+    (let [para   {:children [(span "abcdef" [red])]}
+          ;; select only "cd"
+          result (apply-attrs-to-paragraph para 2 4 (prepend-fill green))]
+      (t/is (= [(span "ab" [red])
+                (span "cd" [green red])
+                (span "ef" [red])]
+               (:children result))))))
+
+(defn- content [paras]
+  {:children [{:children paras}]})
+
+(defn- para [spans]
+  {:children spans})
+
+(defn- selection [start-para start-offset end-para end-offset]
+  {:start-para start-para :start-offset start-offset
+   :end-para end-para :end-offset end-offset})
+
+(t/deftest selection-fills
+  (t/testing "a selection where every span shares the same fills returns that vector"
+    (let [c (content [(para [(span "hello world" [red])])])]
+      (t/is (= [red] (text-editor/selection-fills c (selection 0 0 0 5))))))
+
+  (t/testing "a selection within a single span returns that span's fills"
+    (let [c (content [(para [(span "abcdef" [red])])])]
+      (t/is (= [red] (text-editor/selection-fills c (selection 0 2 0 4))))))
+
+  (t/testing "a selection spanning spans with different fills is :multiple"
+    (let [c (content [(para [(span "foo" [red])
+                             (span "bar" [green])])])]
+      (t/is (= :multiple (text-editor/selection-fills c (selection 0 0 0 6))))))
+
+  (t/testing "a selection restricted to one uniform span is not :multiple"
+    (let [c (content [(para [(span "foo" [red])
+                             (span "bar" [green])])])]
+      (t/is (= [green] (text-editor/selection-fills c (selection 0 3 0 6))))))
+
+  (t/testing "a selection across paragraphs with the same fills returns that vector"
+    (let [c (content [(para [(span "foo" [red])])
+                      (para [(span "bar" [red])])])]
+      (t/is (= [red] (text-editor/selection-fills c (selection 0 0 1 3))))))
+
+  (t/testing "a collapsed selection has no selected spans"
+    (let [c (content [(para [(span "hello" [red])])])]
+      (t/is (nil? (text-editor/selection-fills c (selection 0 2 0 2)))))))
diff --git a/frontend/test/frontend_tests/render_wasm/text_editor_caret_color_test.cljs b/frontend/test/frontend_tests/render_wasm/text_editor_caret_color_test.cljs
new file mode 100644
index 0000000000..09203f4bae
--- /dev/null
+++ b/frontend/test/frontend_tests/render_wasm/text_editor_caret_color_test.cljs
@@ -0,0 +1,67 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.render-wasm.text-editor-caret-color-test
+  "Unit tests for the text-editor caret color resolution.
+
+   The caret matches the topmost solid fill of the text at the caret. For
+   anything else (no fill, gradient, image fills, mixed selection) it falls back
+   to an inverted caret (white painted with a Difference blend)."
+  (:require
+   [app.common.render-wasm.serializers.color :as sr-clr]
+   [app.render-wasm.text-editor :as text-editor]
+   [cljs.test :as t :include-macros true]))
+
+(def ^:private white 0xffffffff)
+
+(defn- solid [color opacity]
+  {:fill-color color :fill-opacity opacity})
+
+(defn- gradient [stops]
+  {:fill-color-gradient {:type :linear :stops stops}})
+
+(t/deftest resolve-caret-color-solid
+  (t/testing "a single solid fill is matched, painted normally"
+    (t/is (= {:color (sr-clr/hex->u32argb "#ff0000" 1) :invert? false}
+             (text-editor/resolve-caret-color [(solid "#ff0000" 1)]))))
+
+  (t/testing "the topmost (first, visible) solid fill wins over the ones below"
+    (t/is (= {:color (sr-clr/hex->u32argb "#ff0000" 1) :invert? false}
+             (text-editor/resolve-caret-color [(solid "#ff0000" 1) (solid "#00ff00" 1)]))))
+
+  (t/testing "the solid fill opacity is preserved"
+    (t/is (= {:color (sr-clr/hex->u32argb "#00ff00" 0.5) :invert? false}
+             (text-editor/resolve-caret-color [{:fill-image {:id "x"}} (solid "#00ff00" 0.5)]))))
+
+  (t/testing "a solid fill takes precedence over a gradient"
+    (t/is (= {:color (sr-clr/hex->u32argb "#ff0000" 1) :invert? false}
+             (text-editor/resolve-caret-color
+              [(solid "#ff0000" 1)
+               (gradient [{:color "#000000" :opacity 1 :offset 0}
+                          {:color "#ffffff" :opacity 1 :offset 1}])])))))
+
+(t/deftest resolve-caret-color-inverted
+  (t/testing "a gradient falls back to the inverted caret"
+    (t/is (= {:color white :invert? true}
+             (text-editor/resolve-caret-color
+              [(gradient [{:color "#ff0000" :opacity 1 :offset 0}
+                          {:color "#0000ff" :opacity 1 :offset 1}])]))))
+
+  (t/testing "an image-only fill falls back to the inverted caret"
+    (t/is (= {:color white :invert? true}
+             (text-editor/resolve-caret-color [{:fill-image {:id "x"}}]))))
+
+  (t/testing "no fills fall back to the inverted caret"
+    (t/is (= {:color white :invert? true}
+             (text-editor/resolve-caret-color []))))
+
+  (t/testing "nil falls back to the inverted caret"
+    (t/is (= {:color white :invert? true}
+             (text-editor/resolve-caret-color nil))))
+
+  (t/testing "a mixed selection (:multiple) falls back to the inverted caret"
+    (t/is (= {:color white :invert? true}
+             (text-editor/resolve-caret-color :multiple)))))
diff --git a/frontend/test/frontend_tests/runner.cljs b/frontend/test/frontend_tests/runner.cljs
index 2adae3e61e..98b918ba9d 100644
--- a/frontend/test/frontend_tests/runner.cljs
+++ b/frontend/test/frontend_tests/runner.cljs
@@ -8,8 +8,11 @@
    [frontend-tests.code-gen-style-test]
    [frontend-tests.composable-tests.comp.sync-test]
    [frontend-tests.copy-as-svg-test]
+   [frontend-tests.data.dashboard-test]
+   [frontend-tests.data.exports-assets-test]
    [frontend-tests.data.nitrate-test]
    [frontend-tests.data.repo-test]
+   [frontend-tests.data.store-test]
    [frontend-tests.data.uploads-test]
    [frontend-tests.data.viewer-test]
    [frontend-tests.data.workspace-colors-test]
@@ -17,6 +20,8 @@
    [frontend-tests.data.workspace-interactions-test]
    [frontend-tests.data.workspace-mcp-test]
    [frontend-tests.data.workspace-media-test]
+   [frontend-tests.data.workspace-pages-test]
+   [frontend-tests.data.workspace-reflow-test]
    [frontend-tests.data.workspace-shortcuts-test]
    [frontend-tests.data.workspace-texts-test]
    [frontend-tests.data.workspace-thumbnails-test]
@@ -27,6 +32,7 @@
    [frontend-tests.logic.copying-and-duplicating-test]
    [frontend-tests.logic.frame-guides-test]
    [frontend-tests.logic.groups-test]
+   [frontend-tests.logic.nudge-selected-shapes-test]
    [frontend-tests.logic.pasting-in-containers-test]
    [frontend-tests.main-errors-test]
    [frontend-tests.plugins.comments-test]
@@ -45,8 +51,13 @@
    [frontend-tests.plugins.tokens-test]
    [frontend-tests.plugins.utils-test]
    [frontend-tests.plugins.value-objects-test]
+   [frontend-tests.render-dimensions-test]
    [frontend-tests.render-wasm.process-objects-test]
+   [frontend-tests.render-wasm.text-editor-apply-styles-test]
+   [frontend-tests.render-wasm.text-editor-caret-color-test]
    [frontend-tests.svg-fills-test]
+   [frontend-tests.text-editor-paste-guard-test]
+   [frontend-tests.tokens.copy-paste-props-test]
    [frontend-tests.tokens.import-export-test]
    [frontend-tests.tokens.logic.token-actions-test]
    [frontend-tests.tokens.logic.token-data-test]
@@ -54,15 +65,23 @@
    [frontend-tests.tokens.style-dictionary-test]
    [frontend-tests.tokens.token-errors-test]
    [frontend-tests.tokens.workspace-tokens-remap-test]
+   [frontend-tests.ui.colorpicker-token-set-order-test]
    [frontend-tests.ui.comments-clustering-test]
    [frontend-tests.ui.comments-position-modifier-test]
    [frontend-tests.ui.ds-controls-numeric-input-test]
+   [frontend-tests.ui.gradient-handlers-test]
    [frontend-tests.ui.layout-container-multiple-test]
    [frontend-tests.ui.measures-menu-props-test]
+   [frontend-tests.ui.settings-password-schema-test]
+   [frontend-tests.ui.settings-shortcuts-test]
+   [frontend-tests.util-clipboard-test]
    [frontend-tests.util-object-test]
    [frontend-tests.util-range-tree-test]
    [frontend-tests.util-simple-math-test]
+   [frontend-tests.util-text-editor-test]
    [frontend-tests.util-webapi-test]
+   [frontend-tests.util-zip-test]
+   [frontend-tests.util.dom.dnd-test]
    [frontend-tests.worker-snap-test]
    [goog.object :as gobj]))
 
@@ -82,8 +101,11 @@
    'frontend-tests.code-gen-style-test
    'frontend-tests.composable-tests.comp.sync-test
    'frontend-tests.copy-as-svg-test
+   'frontend-tests.data.dashboard-test
    'frontend-tests.data.nitrate-test
    'frontend-tests.data.repo-test
+   'frontend-tests.data.store-test
+   'frontend-tests.data.exports-assets-test
    'frontend-tests.data.uploads-test
    'frontend-tests.data.viewer-test
    'frontend-tests.data.workspace-colors-test
@@ -91,6 +113,8 @@
    'frontend-tests.data.workspace-interactions-test
    'frontend-tests.data.workspace-mcp-test
    'frontend-tests.data.workspace-media-test
+   'frontend-tests.data.workspace-pages-test
+   'frontend-tests.data.workspace-reflow-test
    'frontend-tests.data.workspace-shortcuts-test
    'frontend-tests.data.workspace-texts-test
    'frontend-tests.data.workspace-thumbnails-test
@@ -101,6 +125,7 @@
    'frontend-tests.logic.copying-and-duplicating-test
    'frontend-tests.logic.frame-guides-test
    'frontend-tests.logic.groups-test
+   'frontend-tests.logic.nudge-selected-shapes-test
    'frontend-tests.logic.pasting-in-containers-test
    'frontend-tests.main-errors-test
    'frontend-tests.plugins.comments-test
@@ -120,7 +145,10 @@
    'frontend-tests.plugins.utils-test
    'frontend-tests.plugins.value-objects-test
    'frontend-tests.render-wasm.process-objects-test
+   'frontend-tests.render-wasm.text-editor-apply-styles-test
+   'frontend-tests.render-wasm.text-editor-caret-color-test
    'frontend-tests.svg-fills-test
+   'frontend-tests.tokens.copy-paste-props-test
    'frontend-tests.tokens.import-export-test
    'frontend-tests.tokens.logic.token-actions-test
    'frontend-tests.tokens.logic.token-data-test
@@ -128,15 +156,25 @@
    'frontend-tests.tokens.style-dictionary-test
    'frontend-tests.tokens.token-errors-test
    'frontend-tests.tokens.workspace-tokens-remap-test
+   'frontend-tests.ui.colorpicker-token-set-order-test
    'frontend-tests.ui.comments-clustering-test
    'frontend-tests.ui.comments-position-modifier-test
    'frontend-tests.ui.ds-controls-numeric-input-test
+   'frontend-tests.ui.gradient-handlers-test
    'frontend-tests.ui.layout-container-multiple-test
    'frontend-tests.ui.measures-menu-props-test
+   'frontend-tests.render-dimensions-test
+   'frontend-tests.text-editor-paste-guard-test
+   'frontend-tests.ui.settings-password-schema-test
+   'frontend-tests.ui.settings-shortcuts-test
+   'frontend-tests.util-clipboard-test
    'frontend-tests.util-object-test
    'frontend-tests.util-range-tree-test
    'frontend-tests.util-simple-math-test
+   'frontend-tests.util-text-editor-test
    'frontend-tests.util-webapi-test
+   'frontend-tests.util.dom.dnd-test
+   'frontend-tests.util-zip-test
    'frontend-tests.worker-snap-test])
 
 (assert (every? find-ns-obj test-namespaces)
diff --git a/frontend/test/frontend_tests/text_editor_paste_guard_test.cljs b/frontend/test/frontend_tests/text_editor_paste_guard_test.cljs
new file mode 100644
index 0000000000..3a7829f450
--- /dev/null
+++ b/frontend/test/frontend_tests/text_editor_paste_guard_test.cljs
@@ -0,0 +1,62 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.text-editor-paste-guard-test
+  "Regression tests for the Cannot read properties of undefined
+  (reading getData) family of bugs. Each test verifies that the inner
+  getData call is now guarded by an outer when-let on clipboardData
+  so that a synthetic event with no clipboardData no longer throws."
+  (:require
+   [cljs.test :as t :include-macros true]))
+
+(defn- guarded-get-data-text
+  "Mirrors the body of the fixed paste handlers in main/ui/forms.cljs and
+  main/ui/components/forms.cljs."
+  [event]
+  (when-let [clipboard-data (.-clipboardData event)]
+    (.getData clipboard-data "text")))
+
+(defn- guarded-get-data-text-plain
+  "Mirrors the body of the fixed paste handler in
+  main/ui/workspace/shapes/text/v3_editor.cljs."
+  [event]
+  (when-let [clipboard-data (.-clipboardData event)]
+    (.getData clipboard-data "text/plain")))
+
+(t/deftest guarded-paste-handlers-do-not-throw-on-missing-clipboardData
+  (t/testing "event without clipboardData returns nil (no throw)"
+    (t/is (nil? (guarded-get-data-text #js {})))
+    (t/is (nil? (guarded-get-data-text-plain #js {}))))
+  (t/testing "event with explicit nil clipboardData returns nil"
+    (t/is (nil? (guarded-get-data-text #js {:clipboardData nil})))
+    (t/is (nil? (guarded-get-data-text-plain #js {:clipboardData nil}))))
+  (t/testing "event with valid clipboardData returns the text"
+    (let [text-cb (fn [t] (if (= t "text") "hello" nil))
+          text-plain-cb (fn [t] (if (= t "text/plain") "hello" nil))
+          cb #js {:getData (fn [t] (if (= t "text") "hello" nil))}
+          cbp #js {:getData (fn [t] (if (= t "text/plain") "hello" nil))}]
+      (t/is (= "hello" (guarded-get-data-text #js {:clipboardData cb})))
+      (t/is (= "hello" (guarded-get-data-text-plain #js {:clipboardData cbp}))))))
+
+;; Mirrors the fixed styles-fn body in main/ui/workspace/shapes/text/editor.cljs.
+;; The fix adds an (and content ...) guard so getText and getData are never
+;; called on a nil content object.
+(defn- guarded-styles-fn-branch
+  "Returns the data that styles-fn would use for a given content. When content
+  is nil, the function falls back to the styles-only branch and returns :fallback
+  (the real function calls legacy.txt/styles-to-attrs which we don't exercise
+  here — we only verify the guard itself prevents the getText/getData throws)."
+  [content]
+  (if (and content (= (.getText ^js content) ""))
+    (-> ^js (.getData content)
+        (.toJS)
+        (js->clj :keywordize-keys true))
+    :fallback))
+
+(t/deftest guarded-styles-fn-branch-does-not-throw-on-nil-content
+  (t/testing "nil content falls back to the styles branch (no throw)"
+    (t/is (= :fallback (guarded-styles-fn-branch nil)))
+    (t/is (= :fallback (guarded-styles-fn-branch js/undefined)))))
diff --git a/frontend/test/frontend_tests/tokens/copy_paste_props_test.cljs b/frontend/test/frontend_tests/tokens/copy_paste_props_test.cljs
new file mode 100644
index 0000000000..47435af432
--- /dev/null
+++ b/frontend/test/frontend_tests/tokens/copy_paste_props_test.cljs
@@ -0,0 +1,278 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.tokens.copy-paste-props-test
+  (:require
+   [app.common.types.shape :as cts]
+   [cljs.test :as t :include-macros true]))
+
+(defn- rect
+  [attrs]
+  (merge {:type :rect
+          :fills [{:fill-color "#111111" :fill-opacity 1}]
+          :r1 4 :r2 4 :r3 4 :r4 4
+          :opacity 1}
+         attrs))
+
+(defn- content
+  [node]
+  {:type "root"
+   :children [{:type "paragraph-set"
+               :children [{:type "paragraph"
+                           :children [node]}]}]})
+
+(defn- text
+  [attrs]
+  (merge {:type :text
+          :opacity 1
+          :content (content {:text "hello"
+                             :font-size "14"
+                             :fills [{:fill-color "#111111" :fill-opacity 1}]})}
+         attrs))
+
+(defn- paste-props
+  [source target]
+  (cts/patch-props target (cts/extract-props source) {}))
+
+;; ---------------------------------------------------------------------------
+;; Token references must survive a copy/paste of properties
+;; ---------------------------------------------------------------------------
+
+(t/deftest copy-props-keeps-token-references
+  (let [source (rect {:fills [{:fill-color "#ff0000" :fill-opacity 1}]
+                      :r1 12
+                      :applied-tokens {:fill "brand.primary" :r1 "radius.sm"}})
+        target (rect {})
+        result (paste-props source target)]
+
+    (t/testing "the fill token reference is pasted, not only its resolved value"
+      (t/is (= "brand.primary" (get-in result [:applied-tokens :fill]))))
+
+    (t/testing "the border radius token reference is pasted"
+      (t/is (= "radius.sm" (get-in result [:applied-tokens :r1]))))
+
+    (t/testing "the resolved values are still pasted"
+      (t/is (= [{:fill-color "#ff0000" :fill-opacity 1}] (:fills result)))
+      (t/is (= 12 (:r1 result))))))
+
+(t/deftest paste-props-removes-stale-target-tokens
+  (let [source (rect {:fills [{:fill-color "#ff0000" :fill-opacity 1}]})
+        target (rect {:applied-tokens {:fill "brand.secondary"}})
+        result (paste-props source target)]
+
+    (t/testing "a token-less source clears the token of the overwritten property"
+      (t/is (nil? (get-in result [:applied-tokens :fill]))))))
+
+(t/deftest paste-props-keeps-target-tokens-out-of-the-copied-domain
+  (let [source (rect {:applied-tokens {:fill "brand.primary"}})
+        target (rect {:applied-tokens {:width "size.lg"}})
+        result (paste-props source target)]
+
+    (t/testing "tokens of properties that are not copied are left untouched"
+      (t/is (= "size.lg" (get-in result [:applied-tokens :width]))))
+
+    (t/testing "tokens of copied properties are replaced"
+      (t/is (= "brand.primary" (get-in result [:applied-tokens :fill]))))))
+
+(t/deftest copy-props-ignores-tokens-of-non-copied-properties
+  (let [source (rect {:applied-tokens {:width "size.lg" :height "size.lg"}})
+        props  (cts/extract-props source)
+        result (cts/patch-props (rect {}) props {})]
+
+    (t/testing "sizing tokens are not copied because sizing is not a copied property"
+      (t/is (nil? (get-in result [:applied-tokens :width])))
+      (t/is (nil? (get-in result [:applied-tokens :height]))))))
+
+(t/deftest copy-props-without-tokens-adds-no-empty-payload
+  (let [source (rect {})
+        props  (cts/extract-props source)
+        result (cts/patch-props (rect {}) props {})]
+
+    (t/testing "no empty :applied-tokens is introduced in the copied props"
+      (t/is (not (contains? props :applied-tokens))))
+
+    (t/testing "no empty :applied-tokens is introduced in the pasted shape"
+      (t/is (not (contains? result :applied-tokens))))))
+
+(t/deftest copy-props-keeps-layout-tokens-between-layout-frames
+  (let [source (rect {:type :frame
+                      :layout :flex
+                      :layout-padding {:p1 8 :p2 8 :p3 8 :p4 8}
+                      :layout-gap {:row-gap 4 :column-gap 4}
+                      :applied-tokens {:p1 "spacing.md" :row-gap "spacing.sm"}})
+        target (rect {:type :frame :layout :flex})
+        result (paste-props source target)]
+
+    (t/testing "padding and gap tokens travel with the layout properties"
+      (t/is (= "spacing.md" (get-in result [:applied-tokens :p1])))
+      (t/is (= "spacing.sm" (get-in result [:applied-tokens :row-gap])))
+      (t/is (= {:p1 8 :p2 8 :p3 8 :p4 8} (:layout-padding result))))))
+
+;; ---------------------------------------------------------------------------
+;; A token may only leave the target when the value it resolves is overwritten
+;; ---------------------------------------------------------------------------
+
+(t/deftest paste-props-keeps-tokens-of-margin-edges-the-source-does-not-set
+  (let [source (rect {:layout-item-margin {:m1 8 :m3 8}})
+        target (rect {:layout-item-margin {:m4 16}
+                      :applied-tokens {:m4 "spacing.md"}})
+        result (paste-props source target)]
+
+    (t/testing "the edges the source does not set keep their value"
+      (t/is (= {:m1 8 :m3 8 :m4 16} (:layout-item-margin result))))
+
+    (t/testing "and so do the tokens that resolve them"
+      (t/is (= "spacing.md" (get-in result [:applied-tokens :m4]))))))
+
+(t/deftest copy-props-ignores-tokens-of-margin-edges-the-source-does-not-set
+  (let [source (rect {:layout-item-margin {:m1 8}
+                      :applied-tokens {:m1 "spacing.sm" :m2 "spacing.lg"}})
+        target (rect {:layout-item-margin {:m2 2}})
+        result (paste-props source target)]
+
+    (t/testing "the edge the source does not set keeps its value"
+      (t/is (= {:m1 8 :m2 2} (:layout-item-margin result))))
+
+    (t/testing "so its token does not travel either"
+      (t/is (nil? (get-in result [:applied-tokens :m2]))))
+
+    (t/testing "the token of the edge the source does set travels"
+      (t/is (= "spacing.sm" (get-in result [:applied-tokens :m1]))))))
+
+(t/deftest paste-props-keeps-gap-tokens-the-source-does-not-set
+  (let [source (rect {:type :frame
+                      :layout :flex
+                      :layout-gap {:column-gap 4}})
+        target (rect {:type :frame
+                      :layout :flex
+                      :layout-gap {:row-gap 2 :column-gap 2}
+                      :applied-tokens {:row-gap "gap.row" :column-gap "gap.column"}})
+        result (paste-props source target)]
+
+    (t/testing "the gap axis the source does not set keeps its value"
+      (t/is (= {:row-gap 2 :column-gap 4} (:layout-gap result))))
+
+    (t/testing "and so does the token that resolves it"
+      (t/is (= "gap.row" (get-in result [:applied-tokens :row-gap]))))
+
+    (t/testing "the overwritten axis loses its stale token"
+      (t/is (nil? (get-in result [:applied-tokens :column-gap]))))))
+
+(t/deftest paste-props-keeps-padding-tokens-the-source-does-not-set
+  (let [source (rect {:type :frame
+                      :layout :flex
+                      :layout-padding {:p1 8}})
+        target (rect {:type :frame
+                      :layout :flex
+                      :layout-padding {:p1 1 :p3 3}
+                      :applied-tokens {:p1 "padding.top" :p3 "padding.bottom"}})
+        result (paste-props source target)]
+
+    (t/testing "the padding edge the source does not set keeps its value"
+      (t/is (= {:p1 8 :p3 3} (:layout-padding result))))
+
+    (t/testing "and so does the token that resolves it"
+      (t/is (= "padding.bottom" (get-in result [:applied-tokens :p3]))))
+
+    (t/testing "the overwritten edge loses its stale token"
+      (t/is (nil? (get-in result [:applied-tokens :p1]))))))
+
+(t/deftest paste-props-keeps-tokens-of-properties-the-source-does-not-carry
+  (let [source {:type :circle
+                :fills [{:fill-color "#ff0000" :fill-opacity 1}]
+                :opacity 1}
+        target (rect {:shadow [{:color {:color "#000000"}}]
+                      :layout-item-margin {:m1 5 :m2 5 :m3 5 :m4 5}
+                      :applied-tokens {:r1 "radius.sm"
+                                       :m1 "spacing.xs"
+                                       :shadow "shadow.md"}})
+        result (paste-props source target)]
+
+    (t/testing "the values the source does not carry are untouched"
+      (t/is (= 4 (:r1 result)))
+      (t/is (= {:m1 5 :m2 5 :m3 5 :m4 5} (:layout-item-margin result))))
+
+    (t/testing "and so are the tokens that resolve them"
+      (t/is (= "radius.sm" (get-in result [:applied-tokens :r1])))
+      (t/is (= "spacing.xs" (get-in result [:applied-tokens :m1])))
+      (t/is (= "shadow.md" (get-in result [:applied-tokens :shadow]))))))
+
+(t/deftest paste-props-keeps-layout-tokens-of-a-frame-when-the-source-has-no-layout
+  (let [source (rect {:applied-tokens {:fill "brand.primary"}})
+        target (rect {:type :frame
+                      :layout :flex
+                      :layout-padding {:p1 8 :p2 8 :p3 8 :p4 8}
+                      :layout-gap {:row-gap 4 :column-gap 4}
+                      :applied-tokens {:p1 "spacing.md" :row-gap "spacing.sm"}})
+        result (paste-props source target)]
+
+    (t/testing "the layout values are untouched because the source has none"
+      (t/is (= {:p1 8 :p2 8 :p3 8 :p4 8} (:layout-padding result)))
+      (t/is (= {:row-gap 4 :column-gap 4} (:layout-gap result))))
+
+    (t/testing "and so are the padding and gap tokens"
+      (t/is (= "spacing.md" (get-in result [:applied-tokens :p1])))
+      (t/is (= "spacing.sm" (get-in result [:applied-tokens :row-gap]))))
+
+    (t/testing "the copied fill token is still applied"
+      (t/is (= "brand.primary" (get-in result [:applied-tokens :fill]))))))
+
+;; ---------------------------------------------------------------------------
+;; Text shapes carry their fill inside the content nodes
+;; ---------------------------------------------------------------------------
+
+(t/deftest copy-props-of-a-text-shape-carries-the-fill-token
+  (let [source (text {:content (content {:text "hello"
+                                         :font-size "14"
+                                         :fills [{:fill-color "#ff0000" :fill-opacity 1}]})
+                      :applied-tokens {:fill "brand.primary"
+                                       :font-size "font.lg"}})
+        props  (cts/extract-props source)
+        result (cts/patch-props (rect {:applied-tokens {:fill "brand.old"}}) props {})]
+
+    (t/testing "the fill of the text content is copied"
+      (t/is (= [{:fill-color "#ff0000" :fill-opacity 1}] (:fills props))))
+
+    (t/testing "so is the fill token that resolves it"
+      (t/is (= "brand.primary" (get-in result [:applied-tokens :fill]))))
+
+    (t/testing "typography tokens are not applied to a shape without text content"
+      (t/is (nil? (get-in result [:applied-tokens :font-size]))))))
+
+(t/deftest paste-props-on-a-text-target-replaces-the-fill-token
+  (let [source (rect {:fills [{:fill-color "#ff0000" :fill-opacity 1}]
+                      :applied-tokens {:fill "brand.primary"}})
+        target (text {:applied-tokens {:fill "brand.old"}})
+        result (paste-props source target)]
+
+    (t/testing "the fill of the text content is overwritten"
+      (t/is (= [{:fill-color "#ff0000" :fill-opacity 1}]
+               (get-in result [:content :children 0 :children 0 :children 0 :fills]))))
+
+    (t/testing "so the stale fill token cannot survive"
+      (t/is (= "brand.primary" (get-in result [:applied-tokens :fill]))))))
+
+(t/deftest paste-props-keeps-typography-tokens-of-a-text-target-when-the-source-is-not-text
+  (let [source (rect {:applied-tokens {:fill "brand.primary"}})
+        target (text {:applied-tokens {:font-size "font.lg" :fill "brand.old"}})
+        result (paste-props source target)]
+
+    (t/testing "the font size of the text content is untouched"
+      (t/is (= "14" (get-in result [:content :children 0 :children 0 :children 0 :font-size]))))
+
+    (t/testing "and so is the typography token that resolves it"
+      (t/is (= "font.lg" (get-in result [:applied-tokens :font-size]))))))
+
+(t/deftest copy-props-of-a-text-shape-does-not-apply-typography-to-a-non-text-target
+  (let [source (text {:applied-tokens {:font-size "font.lg" :opacity "opacity.50"}})
+        target (rect {})
+        result (paste-props source target)]
+
+    (t/testing "typography tokens of a text source are not applied to a non text target"
+      (t/is (nil? (get-in result [:applied-tokens :font-size]))))
+
+    (t/testing "tokens shared by both shapes are applied"
+      (t/is (= "opacity.50" (get-in result [:applied-tokens :opacity]))))))
diff --git a/frontend/test/frontend_tests/ui/colorpicker_token_set_order_test.cljs b/frontend/test/frontend_tests/ui/colorpicker_token_set_order_test.cljs
new file mode 100644
index 0000000000..34347ffa26
--- /dev/null
+++ b/frontend/test/frontend_tests/ui/colorpicker_token_set_order_test.cljs
@@ -0,0 +1,65 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.ui.colorpicker-token-set-order-test
+  (:require
+   [app.main.ui.workspace.colorpicker :refer [group-sets]]
+   [cljs.test :as t :include-macros true]))
+
+;; https://github.com/penpot/penpot/issues/10552
+;; The Color tokens picker shows sets in reverse of their definition order
+;; (highest-precedence / last-defined set first). The fix reverses the raw
+;; set seq once, before it reaches `group-sets`. These tests drive
+;; `group-sets` with already-reversed input -- matching what it receives in
+;; the real pipeline -- to prove the `group-by` call inside `group-sets`
+;; doesn't scramble that reversal, for both an ungrouped list and a
+;; subgrouped one.
+
+(defn- flat-entries
+  "Reduce group-sets' output (a mix of single-set and multi-set grouped
+   entries) to a flat [group name] seq, in output order."
+  [grouped]
+  (mapcat (fn [{:keys [group sets]}]
+            (map (fn [{:keys [name]}] [group name]) sets))
+          grouped))
+
+(t/deftest reversed-flat-set-list
+  (let [;; definition order: global, alias, semantic (ascending precedence)
+        definition-order [{:id 1 :set "global"   :tokens []}
+                          {:id 2 :set "alias"    :tokens []}
+                          {:id 3 :set "semantic" :tokens []}]
+        result (group-sets (reverse definition-order))]
+    (t/is (= [[nil "semantic"] [nil "alias"] [nil "global"]]
+             (flat-entries result)))))
+
+(t/deftest reversed-subgroup-members-are-not-scrambled
+  (let [;; brand/subgroup/one is defined before brand/subgroup/two
+        definition-order [{:id 1 :set "brand/subgroup/one"}
+                          {:id 2 :set "brand/subgroup/two"}]
+        definition-order (map #(assoc % :tokens []) definition-order)
+        result (group-sets (reverse definition-order))]
+    ;; "two" has higher precedence (defined later) so it must lead --
+    ;; group-by must not silently restore definition order within the
+    ;; subgroup's own member list.
+    (t/is (= [["brand/subgroup" "two"] ["brand/subgroup" "one"]]
+             (flat-entries result)))))
+
+(t/deftest reversed-mixed-flat-and-subgroup-set-list
+  (let [;; definition order: an ungrouped set, then a two-member subgroup,
+        ;; then another ungrouped set (highest precedence).
+        definition-order [{:id 1 :set "global"             :tokens []}
+                          {:id 2 :set "brand/subgroup/one" :tokens []}
+                          {:id 3 :set "brand/subgroup/two" :tokens []}
+                          {:id 4 :set "primitives"         :tokens []}]
+        result (group-sets (reverse definition-order))
+        entries (flat-entries result)]
+    ;; Every set is present exactly once, and nothing outside the
+    ;; subgroup reordered its two members relative to each other.
+    (t/is (= #{[nil "global"] [nil "primitives"]
+               ["brand/subgroup" "one"] ["brand/subgroup" "two"]}
+             (set entries)))
+    (t/is (= [["brand/subgroup" "two"] ["brand/subgroup" "one"]]
+             (filter #(= (first %) "brand/subgroup") entries)))))
diff --git a/frontend/test/frontend_tests/ui/ds_controls_numeric_input_test.cljs b/frontend/test/frontend_tests/ui/ds_controls_numeric_input_test.cljs
index 5f9f28d7af..a4e8ce7ef2 100644
--- a/frontend/test/frontend_tests/ui/ds_controls_numeric_input_test.cljs
+++ b/frontend/test/frontend_tests/ui/ds_controls_numeric_input_test.cljs
@@ -6,9 +6,94 @@
 
 (ns frontend-tests.ui.ds-controls-numeric-input-test
   (:require
-   [app.main.ui.ds.controls.numeric-input :refer [next-focus-index]]
+   [app.common.data :as d]
+   [app.main.ui.ds.controls.numeric-input :refer [next-focus-index parse-value]]
+   [app.main.ui.formats :as fmt]
    [cljs.test :as t :include-macros true]))
 
+;; ── format-number / parse-double roundtrip ──
+;; These tests guard against the contamination chain that caused issue #10638:
+;;   format-number returns string → last-value* contaminated → mth/finite? on
+;;   CLJS accepts strings via js/isFinite → backend Malli rejects → 500.
+
+(t/deftest test-format-number-returns-string
+  (t/testing "format-number returns a string, not a number"
+    (let [result (fmt/format-number 16)]
+      (t/is (string? result))
+      (t/is (not (number? result))))))
+
+(t/deftest test-parse-double-roundtrip
+  (t/testing "parse-double of a formatted number returns a number"
+    (let [formatted (fmt/format-number 16)
+          reparsed  (d/parse-double formatted)]
+      (t/is (number? reparsed))
+      (t/is (= 16 reparsed))))
+
+  (t/testing "parse-double of empty string returns nil"
+    (t/is (nil? (d/parse-double ""))))
+
+  (t/testing "parse-double of nil returns nil"
+    (t/is (nil? (d/parse-double nil))))
+
+  (t/testing "parse-double of non-numeric string returns nil"
+    (t/is (nil? (d/parse-double "abc"))))
+
+  (t/testing "parse-double is idempotent for numbers"
+    (let [result (d/parse-double (d/parse-double (fmt/format-number 42)))]
+      (t/is (number? result))
+      (t/is (= 42 result)))))
+
+;; Regression pins for https://github.com/penpot/penpot/issues/10638:
+;; parse-value is the only source of committed values, and it must yield
+;; numbers or nil — never strings. last-value* holds its numeric output.
+
+(t/deftest test-parse-value-returns-numbers-or-nil
+  (t/testing "plain numbers parse"
+    (t/is (= 33 (parse-value "33" nil nil nil false)))
+    (t/is (= 33.5 (parse-value "33.5" nil nil nil false))))
+
+  (t/testing "decimal comma is accepted"
+    (t/is (= 33.5 (parse-value "33,5" nil nil nil false))))
+
+  (t/testing "invalid text yields nil, not a fallback string"
+    (t/is (nil? (parse-value "abc" 33 nil nil false)))
+    (t/is (nil? (parse-value "abc" 33 nil nil true))))
+
+  (t/testing "unit suffixes are rejected"
+    (t/is (nil? (parse-value "33px" 10 nil nil false))))
+
+  (t/testing "empty input yields nil"
+    (t/is (nil? (parse-value "" 33 nil nil false)))
+    (t/is (nil? (parse-value nil nil nil nil true))))
+
+  (t/testing "expressions evaluate at full precision"
+    (t/is (= (/ 10 3) (parse-value "10/3" nil nil nil false))))
+
+  (t/testing "relative expressions use the last committed NUMBER as base"
+    (t/is (= 25 (parse-value "+5" 20 nil nil false)))
+    (t/is (= 40 (parse-value "*2" 20 nil nil false)))
+    (t/is (= 10 (parse-value "50%" 20 nil nil false))))
+
+  (t/testing "relative expressions with no committed value fall back to 0"
+    (t/is (= 5 (parse-value "+5" nil nil nil false))))
+
+  (t/testing "whitespace-only input yields nil"
+    (t/is (nil? (parse-value "   " 33 nil nil false))))
+
+  (t/testing "division by zero yields nil, not Infinity"
+    (t/is (nil? (parse-value "1/0" 5 nil nil false))))
+
+  (t/testing "leading/trailing dot forms parse"
+    (t/is (= 0.5 (parse-value ".5" nil nil nil false)))
+    (t/is (= 33 (parse-value "33." nil nil nil false))))
+
+  (t/testing "huge values clamp to the safe-int range"
+    (t/is (= 1073741823.5 (parse-value "99999999999999999999" nil nil nil false))))
+
+  (t/testing "min/max clamping produces numbers"
+    (t/is (= 0 (parse-value "-5" nil 0 nil false)))
+    (t/is (= 100 (parse-value "500" nil 0 100 false)))))
+
 (def ^:private sample-options
   [{:id "a" :type :item :name "Alpha"}
    {:id "b" :type :group :name "Group"}
diff --git a/frontend/test/frontend_tests/ui/gradient_handlers_test.cljs b/frontend/test/frontend_tests/ui/gradient_handlers_test.cljs
new file mode 100644
index 0000000000..c20deaca39
--- /dev/null
+++ b/frontend/test/frontend_tests/ui/gradient_handlers_test.cljs
@@ -0,0 +1,90 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.ui.gradient-handlers-test
+  (:require
+   [app.common.geom.point :as gpt]
+   [app.common.math :as mth]
+   [app.main.ui.workspace.viewport.gradients :refer [radial-width-point point->gradient-width]]
+   [cljs.test :as t :include-macros true]))
+
+;; A 4:1 ellipse. The bug (#10069) only shows on non-square shapes.
+(def ^:private wide-sr {:x 0 :y 0 :width 400 :height 100})
+(def ^:private square-sr {:x 0 :y 0 :width 100 :height 100})
+
+(defn- radial
+  [start-x start-y end-x end-y width]
+  {:type :radial
+   :start-x start-x
+   :start-y start-y
+   :end-x end-x
+   :end-y end-y
+   :width width})
+
+(defn- close?
+  [a b]
+  (< (mth/abs (- a b)) 0.0001))
+
+(defn- point-close?
+  [p1 p2]
+  (and (close? (:x p1) (:x p2))
+       (close? (:y p1) (:y p2))))
+
+(t/deftest test-radial-width-point
+  (t/testing "default vertical gradient is not affected"
+    ;; No regression allowed here: the handler already sits at the correct
+    ;; place when the gradient vector is axis aligned.
+    (let [gradient (radial 0.5 0.5 0.5 1.0 1.0)]
+      (t/is (point-close? (gpt/point 400 50)
+                          (radial-width-point wide-sr gradient)))))
+
+  (t/testing "rotated gradient keeps the handler inside the shape"
+    ;; The gradient is defined in objectBoundingBox units, so the half-width
+    ;; of a 90 degrees rotated gradient must be half the shape height (50),
+    ;; not half the shape width scaled again by the aspect ratio (800).
+    (let [gradient (radial 0.5 0.5 1.0 0.5 1.0)]
+      (t/is (point-close? (gpt/point 200 0)
+                          (radial-width-point wide-sr gradient)))))
+
+  (t/testing "oblique gradient is anisotropically scaled"
+    (let [gradient (radial 0.5 0.5 1.0 1.0 1.0)]
+      (t/is (point-close? (gpt/point 400 0)
+                          (radial-width-point wide-sr gradient)))))
+
+  (t/testing "gradient width factor scales the handler distance"
+    (let [gradient (radial 0.5 0.5 1.0 0.5 0.5)]
+      (t/is (point-close? (gpt/point 200 25)
+                          (radial-width-point wide-sr gradient)))))
+
+  (t/testing "square shapes are isotropic"
+    (let [gradient (radial 0.5 0.5 1.0 0.5 1.0)]
+      (t/is (point-close? (gpt/point 50 0)
+                          (radial-width-point square-sr gradient)))))
+
+  (t/testing "translated selrect"
+    (let [gradient (radial 0.5 0.5 1.0 0.5 1.0)]
+      (t/is (point-close? (gpt/point 210 15)
+                          (radial-width-point (assoc wide-sr :x 10 :y 15) gradient))))))
+
+(t/deftest test-point->gradient-width
+  (t/testing "is the inverse of radial-width-point"
+    (doseq [gradient [(radial 0.5 0.5 0.5 1.0 1.0)
+                      (radial 0.5 0.5 1.0 0.5 1.0)
+                      (radial 0.5 0.5 1.0 1.0 0.5)
+                      (radial 0.2 0.3 0.9 0.7 2.0)]
+            selrect  [wide-sr square-sr]]
+      (t/is (close? (:width gradient)
+                    (point->gradient-width selrect gradient
+                                           (radial-width-point selrect gradient))))))
+
+  (t/testing "handler on the start point means zero width"
+    (let [gradient (radial 0.5 0.5 1.0 0.5 1.0)]
+      (t/is (close? 0 (point->gradient-width wide-sr gradient (gpt/point 200 50))))))
+
+  (t/testing "degenerate gradient does not produce a usable width"
+    (let [gradient (radial 0.5 0.5 0.5 0.5 1.0)]
+      (t/is (not (js/Number.isFinite
+                  (point->gradient-width wide-sr gradient (gpt/point 200 0))))))))
diff --git a/frontend/test/frontend_tests/ui/settings_password_schema_test.cljs b/frontend/test/frontend_tests/ui/settings_password_schema_test.cljs
new file mode 100644
index 0000000000..ac305b81fb
--- /dev/null
+++ b/frontend/test/frontend_tests/ui/settings_password_schema_test.cljs
@@ -0,0 +1,77 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.ui.settings-password-schema-test
+  (:require
+   [app.common.schema :as sm]
+   [app.main.ui.settings.password :as passwd]
+   [cljs.test :as t :include-macros true]
+   [malli.core :as m]))
+
+(def ^:private new-password "a-long-enough-password")
+
+(defn- params
+  [password-old]
+  {:password-old password-old
+   :password-1 new-password
+   :password-2 new-password})
+
+(defn- valid?
+  [data]
+  (sm/validate passwd/schema:password-form data))
+
+(defn- error-codes
+  "Maps every schema problem to [field error-code], mirroring how
+  app.common.schema.messages resolves the message shown next to an input."
+  [data]
+  (->> (:errors (sm/explain passwd/schema:password-form data))
+       (map (fn [{:keys [in schema]}]
+              (let [props  (m/properties schema)
+                    tprops (m/type-properties schema)]
+                [(or (:error/field props) (first in))
+                 (or (:error/code props) (:error/code tprops))])))
+       (into {})))
+
+(t/deftest short-old-password-is-accepted
+  (t/testing "an existing password shorter than the 8 char policy can still be typed in"
+    (t/is (true? (valid? (params "short"))))
+    (t/is (empty? (error-codes (params "short"))))))
+
+(t/deftest single-char-old-password-is-accepted
+  (t/is (true? (valid? (params "x")))))
+
+(t/deftest unicode-old-password-is-accepted
+  (t/is (true? (valid? (params "🔑é"))))
+  (t/is (true? (valid? (params "  hunter2  ")))))
+
+(t/deftest empty-old-password-is-rejected
+  (t/is (false? (valid? (params ""))))
+  (t/is (contains? (error-codes (params "")) :password-old)))
+
+(t/deftest blank-old-password-is-rejected
+  (t/is (false? (valid? (params "   "))))
+  (t/is (contains? (error-codes (params "   ")) :password-old)))
+
+(t/deftest missing-old-password-is-rejected
+  (t/is (false? (valid? (dissoc (params "short") :password-old)))))
+
+(t/deftest overlong-old-password-is-rejected
+  (t/is (false? (valid? (params (apply str (repeat 501 "a")))))))
+
+(t/deftest short-new-password-is-rejected
+  (t/testing "the 8 char policy still applies to the new password"
+    (let [data {:password-old "short" :password-1 "abc" :password-2 "abc"}]
+      (t/is (false? (valid? data)))
+      (t/is (= "errors.password-too-short"
+               (get (error-codes data) :password-1))))))
+
+(t/deftest confirmation-mismatch-is-rejected
+  (let [data {:password-old "short"
+              :password-1 new-password
+              :password-2 "another-long-password"}]
+    (t/is (false? (valid? data)))
+    (t/is (= "errors.password-invalid-confirmation"
+             (get (error-codes data) :password-2)))))
diff --git a/frontend/test/frontend_tests/ui/settings_shortcuts_test.cljs b/frontend/test/frontend_tests/ui/settings_shortcuts_test.cljs
new file mode 100644
index 0000000000..8bbf5af6b2
--- /dev/null
+++ b/frontend/test/frontend_tests/ui/settings_shortcuts_test.cljs
@@ -0,0 +1,223 @@
+(ns frontend-tests.ui.settings-shortcuts-test
+  (:require
+   [app.main.data.profile :as du]
+   [app.main.ui.settings.import-shortcuts-diff-modal :as diff-modal]
+   [app.main.ui.settings.restore-shortcuts-modal :as restore-modal]
+   [app.main.ui.settings.shortcuts :as sut]
+   [app.main.ui.shortcuts :as ui-shortcuts]
+   [cljs.test :as t :include-macros true]
+   [clojure.string :as str]))
+
+(t/deftest validate-imported-shortcuts-accepts-valid-workspace
+  (t/is (= {:valid? true}
+           (sut/validate-imported-shortcuts
+            {:workspace {:escape "escape"
+                         :increase-zoom "+"
+                         :zoom-lense-decrease "alt+z"}}))))
+
+(t/deftest validate-imported-shortcuts-accepts-optional-contexts
+  (t/is (= {:valid? true}
+           (sut/validate-imported-shortcuts
+            {:workspace {:escape "escape"}
+             :dashboard {:toggle-theme "alt+m"}
+             :viewer {:next-frame "right"}}))))
+
+(t/deftest validate-imported-shortcuts-accepts-empty-string-command
+  (t/is (= {:valid? true}
+           (sut/validate-imported-shortcuts
+            {:workspace {:escape ""}}))))
+
+(t/deftest validate-imported-shortcuts-rejects-nil
+  (let [result (sut/validate-imported-shortcuts nil)]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-non-map
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts "shortcuts"))))
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts 42))))
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts []))))
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts true)))))
+
+(t/deftest validate-imported-shortcuts-accepts-missing-workspace
+  (t/is (= {:valid? true}
+           (sut/validate-imported-shortcuts {:dashboard {:toggle-theme "alt+m"}}))))
+
+(t/deftest validate-imported-shortcuts-rejects-non-map-context
+  (let [result (sut/validate-imported-shortcuts {:workspace "not-a-map"})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(= "workspace" (:path %)) (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-non-string-command
+  (let [result (sut/validate-imported-shortcuts {:workspace {:escape 123}})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(= "workspace/escape" (:path %)) (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-vector-command
+  (let [result (sut/validate-imported-shortcuts {:workspace {:escape ["ctrl+e"]}})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(= "workspace/escape" (:path %)) (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-unknown-top-level-key
+  (let [result (sut/validate-imported-shortcuts {:workspace {:escape "escape"}
+                                                 :unknown-context {}})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(str/includes? (:path %) "unknown-context") (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-unknown-workspace-key
+  (let [result (sut/validate-imported-shortcuts {:workspace {:not-a-real-shortcut "x"}})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(= "workspace/not-a-real-shortcut" (:path %)) (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-rejects-unknown-optional-context-key
+  (let [result (sut/validate-imported-shortcuts {:viewer {:not-a-real-shortcut "x"}})]
+    (t/is (= false (:valid? result)))
+    (t/is (seq (:errors result)))
+    (t/is (some #(= "viewer/not-a-real-shortcut" (:path %)) (:errors result)))))
+
+(t/deftest validate-imported-shortcuts-never-throws
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts (js/Date.)))))
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts #{:workspace}))))
+  (t/is (= false (:valid? (sut/validate-imported-shortcuts (fn []))))))
+
+(t/deftest import-custom-shortcuts-updates-multiple-contexts
+  (let [imported {:workspace {:add-comment "alt+c"}
+                  :viewer {:select-all "ctrl+alt+a"}}
+        all-raw {:add-comment {:command "alt+c"}
+                 :select-all {:command "ctrl+a"}}]
+    (with-redefs [du/update-profile-props identity]
+      (t/is (= {:custom-shortcuts {:workspace {:add-comment "alt+c"}
+                                   :viewer {:select-all "ctrl+alt+a"}}}
+               (ui-shortcuts/import-custom-shortcuts imported all-raw))))))
+
+(t/deftest import-custom-shortcuts-preserves-unimported-contexts
+  (let [current {:workspace {:existing "ctrl+e"}
+                 :dashboard {:toggle-theme "alt+m"}
+                 :viewer {:select-all "ctrl+a"}}
+        imported {:workspace {:add-comment "alt+c"}}
+        all-raw {:add-comment {:command "alt+c"}
+                 :existing {:command "ctrl+e"}
+                 :toggle-theme {:command "alt+m"}
+                 :select-all {:command "ctrl+a"}}]
+    (with-redefs [du/update-profile-props identity]
+      (t/is (= {:custom-shortcuts {:workspace {:add-comment "alt+c"}
+                                   :dashboard {:toggle-theme "alt+m"}
+                                   :viewer {:select-all "ctrl+a"}}}
+               (ui-shortcuts/import-custom-shortcuts
+                {:profile {:props {:custom-shortcuts current}}
+                 :workspace (:workspace imported)}
+                all-raw))))))
+
+(t/deftest import-custom-shortcuts-clears-context-when-empty
+  (let [current {:workspace {:existing "ctrl+e"}}
+        imported {:workspace {}}
+        all-raw {}]
+    (with-redefs [du/update-profile-props identity]
+      (t/is (= {:custom-shortcuts {:workspace {}}}
+               (ui-shortcuts/import-custom-shortcuts
+                {:profile {:props {:custom-shortcuts current}}
+                 :workspace (:workspace imported)}
+                all-raw))))))
+
+(t/deftest import-custom-shortcuts-disables-conflicting-default
+  (let [imported {:workspace {:select-all "ctrl+a"}}
+        all-raw {:select-all {:command "ctrl+a"}
+                 :add-comment {:command "ctrl+a"}}]
+    (with-redefs [du/update-profile-props identity]
+      (t/is (= {:custom-shortcuts {:workspace {:select-all "ctrl+a"
+                                               :add-comment ""}}}
+               (ui-shortcuts/import-custom-shortcuts imported all-raw))))))
+
+(t/deftest validate-imported-shortcuts-accepts-viewer-only-import
+  (t/is (= {:valid? true}
+           (sut/validate-imported-shortcuts
+            {:viewer {:next-frame "right"
+                      :prev-frame "left"}}))))
+
+(t/deftest import-custom-shortcuts-disables-duplicate-imported-bindings
+  (let [imported {:workspace {:move-up "ctrl+up"
+                              :move-to-top "ctrl+up"}}
+        all-raw {:move-up {:command "ctrl+shift+up"}
+                 :move-to-top {:command "ctrl+shift+top"}}]
+    (with-redefs [du/update-profile-props identity]
+      (let [customs (get-in (ui-shortcuts/import-custom-shortcuts imported all-raw)
+                            [:custom-shortcuts :workspace])]
+        (t/is (= "" (get customs :move-up))
+              "First imported entry with duplicate command should be cleared")
+        (t/is (= "ctrl+up" (get customs :move-to-top))
+              "Last imported entry with duplicate command should survive")))))
+
+(t/deftest compute-diff-shows-new-shortcut-changes
+  (let [imported {:workspace {:add-comment "alt+c"}}
+        diff     (diff-modal/compute-diff imported {})]
+    (t/is (= 1 (count diff)))
+    (let [entry (first diff)]
+      (t/is (= :workspace (:context entry)))
+      (t/is (= :add-comment (:key entry)))
+      (t/is (= "alt+c" (:imported entry)))
+      (t/is (not= "alt+c" (:current entry))))))
+
+(t/deftest compute-diff-shows-conflict-as-disabled
+  (let [imported {:workspace {:select-all "ctrl+shift+a"}}
+        diff     (diff-modal/compute-diff imported {})]
+    (t/is (pos? (count diff)))
+    (let [select-all-entry (first (filter #(= :select-all (:key %)) diff))]
+      (t/is (= :workspace (:context select-all-entry)))
+      (t/is (= "ctrl+shift+a" (:imported select-all-entry))))))
+
+(t/deftest compute-diff-shows-empty-string-as-disabled-shortcut
+  (let [imported {:workspace {:escape ""}}
+        current  {}
+        diff     (diff-modal/compute-diff imported current)]
+    (t/is (pos? (count diff)))
+    (let [entry (first (filter #(= :escape (:key %)) diff))]
+      (t/is (= :workspace (:context entry)))
+      (t/is (= "" (:imported entry))))))
+
+(t/deftest compute-diff-excludes-unchanged-shortcuts
+  (let [imported {:workspace {:escape ""}}
+        current  {:workspace {:escape ""}}
+        diff     (diff-modal/compute-diff imported current)]
+    (t/is (empty? diff))))
+
+(t/deftest compute-diff-detects-multiple-contexts
+  (let [imported {:workspace {:add-comment "alt+c"}
+                  :viewer {:next-frame "right"}}
+        diff     (diff-modal/compute-diff imported {})]
+    (t/is (pos? (count diff)))
+    (let [contexts (set (map :context diff))]
+      (t/is (contains? contexts :workspace))
+      (t/is (contains? contexts :viewer)))))
+
+(t/deftest extract-shortcut-keys-uses-correct-context-override
+  (let [customs {:workspace {:undo "shift+z"
+                             :move-nodes "shift+m"}
+                 :dashboard {:toggle-theme "alt+t"}
+                 :viewer    {:next-frame "right"}}]
+    (t/is (= "shift+z" (nth (restore-modal/extract-shortcut-keys :undo customs :workspace) 3))
+          "Workspace override should be used for :undo")
+    (t/is (= "alt+t" (nth (restore-modal/extract-shortcut-keys :toggle-theme customs :dashboard) 3))
+          "Dashboard override should be used for :toggle-theme")
+    (t/is (= "right" (nth (restore-modal/extract-shortcut-keys :next-frame customs :viewer) 3))
+          "Viewer override should be used for :next-frame")
+    (t/is (= "shift+m" (nth (restore-modal/extract-shortcut-keys :move-nodes customs :workspace) 3))
+          "Workspace override should be used for path-specific :move-nodes")))
+
+(t/deftest extract-shortcut-keys-returns-default-for-each-context
+  (let [result (restore-modal/extract-shortcut-keys :move-nodes {} :workspace)]
+    (t/is (string? (nth result 3))
+          "Should return default command string for :move-nodes via :workspace context")
+    (t/is (not= "" (nth result 3))
+          "Default command should not be empty"))
+  (let [result (restore-modal/extract-shortcut-keys :toggle-theme {} :dashboard)]
+    (t/is (string? (nth result 3))
+          "Should return default command string for :toggle-theme in :dashboard context")
+    (t/is (not= "" (nth result 3))
+          "Default command should not be empty"))
+  (let [result (restore-modal/extract-shortcut-keys :next-frame {} :viewer)]
+    (t/is (nth result 3)
+          "Should return a default command for :next-frame in :viewer context")))
diff --git a/frontend/test/frontend_tests/util/dom/dnd_test.cljs b/frontend/test/frontend_tests/util/dom/dnd_test.cljs
new file mode 100644
index 0000000000..60c7ad725d
--- /dev/null
+++ b/frontend/test/frontend_tests/util/dom/dnd_test.cljs
@@ -0,0 +1,23 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.util.dom.dnd-test
+  (:require
+   [app.util.dom.dnd :as dnd]
+   [cljs.test :as t :include-macros true]))
+
+(t/deftest get-data-returns-nil-when-event-has-no-dataTransfer
+  (t/testing "event without dataTransfer"
+    (t/is (nil? (dnd/get-data #js {}))))
+  (t/testing "event with explicit nil dataTransfer"
+    (t/is (nil? (dnd/get-data #js {:dataTransfer nil}))))
+  (t/testing "explicit data-type also returns nil for missing dataTransfer"
+    (t/is (nil? (dnd/get-data #js {} "penpot/data")))))
+
+(t/deftest get-data-reads-from-dataTransfer
+  (t/testing "dataTransfer with matching key returns the value (non-decoded type)"
+    (let [dt #js {:getData (fn [_type] "hello")}]
+      (t/is (= "hello" (dnd/get-data #js {:dataTransfer dt} "text/plain"))))))
diff --git a/frontend/test/frontend_tests/util_clipboard_test.cljs b/frontend/test/frontend_tests/util_clipboard_test.cljs
new file mode 100644
index 0000000000..4c664786a1
--- /dev/null
+++ b/frontend/test/frontend_tests/util_clipboard_test.cljs
@@ -0,0 +1,205 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns frontend-tests.util-clipboard-test
+  "Regression tests for `to-clipboard-multi` (issue #10596).
+
+  Browsers keep an allowlist of MIME types accepted by the async
+  Clipboard API. Firefox only accepts text/plain, text/html and
+  image/png, so writing a ClipboardItem that carries image/svg+xml
+  rejects with `DOMException: Type 'image/svg+xml' not supported for
+  write`. `clipboard.write` is all-or-nothing, so the text/plain
+  representation is lost too and the rejection escapes unhandled."
+  (:require
+   [app.util.clipboard :as clipboard]
+   [cljs.test :as t :include-macros true]))
+
+(def ^:private svg-markup "<svg xmlns=\"http://www.w3.org/2000/svg\"></svg>")
+
+(defonce ^:private original-clipboard-item
+  (unchecked-get js/globalThis "ClipboardItem"))
+
+(defonce ^:private original-clipboard
+  (unchecked-get js/navigator "clipboard"))
+
+(defn- restore-globals!
+  []
+  (unchecked-set js/globalThis "ClipboardItem" original-clipboard-item)
+  (unchecked-set js/navigator "clipboard" original-clipboard))
+
+(t/use-fixtures :each {:after restore-globals!})
+
+(defn- install-clipboard-item!
+  "Install a `ClipboardItem` stub that records the MIME keys it was
+  built with. When `supported` is provided it is exposed as the
+  `ClipboardItem.supports` static, mirroring the browsers that ship it."
+  [supported]
+  (let [ctor (fn [obj]
+               ;; a constructor returning an object hands that object back to `new`
+               #js {:types (js/Object.keys obj)})]
+    (when (some? supported)
+      (unchecked-set ctor "supports" (fn [mime] (contains? supported mime))))
+    (unchecked-set js/globalThis "ClipboardItem" ctor)))
+
+(defn- install-navigator-clipboard!
+  "Install a `navigator.clipboard` stub. `writable` is the set of MIME
+  types the fake browser accepts on `write`; any item carrying a MIME
+  outside of it rejects the whole write, as real browsers do."
+  [state writable]
+  (unchecked-set
+   js/navigator "clipboard"
+   #js {:write
+        (fn [items]
+          (let [types (vec (unchecked-get (aget items 0) "types"))]
+            (swap! state update :written conj types)
+            (if (every? writable types)
+              (js/Promise.resolve)
+              (js/Promise.reject
+               (js/Error. (str "Type '" (first (remove writable types))
+                               "' not supported for write"))))))
+        :writeText
+        (fn [text]
+          (swap! state assoc :text text)
+          (js/Promise.resolve))}))
+
+(defn- copy-svg
+  []
+  (clipboard/to-clipboard-multi
+   {"image/svg+xml" svg-markup
+    "text/plain"    svg-markup}))
+
+(t/deftest firefox-without-supports-falls-back-to-text
+  (t/testing "#10596: a browser that rejects image/svg+xml must not leak a rejection"
+    (t/async done
+      (let [state (atom {:written []})]
+        (install-clipboard-item! nil)
+        (install-navigator-clipboard! state #{"text/plain" "text/html" "image/png"})
+        (-> (copy-svg)
+            (.then (fn [_]
+                     (t/is (= svg-markup (:text @state))
+                           "the SVG markup must still reach the clipboard as text")
+                     (done)))
+            (.catch (fn [err]
+                      (t/is false (str "to-clipboard-multi must not reject: " err))
+                      (done))))))))
+
+(t/deftest firefox-with-supports-writes-only-the-supported-mimes
+  (t/testing "#10596: ClipboardItem.supports filters the unsupported MIME out"
+    (t/async done
+      (let [state (atom {:written []})]
+        (install-clipboard-item! #{"text/plain" "text/html" "image/png"})
+        (install-navigator-clipboard! state #{"text/plain" "text/html" "image/png"})
+        (-> (copy-svg)
+            (.then (fn [_]
+                     (t/is (= [["text/plain"]] (:written @state))
+                           "the unsupported MIME must be filtered before writing")
+                     (done)))
+            (.catch (fn [err]
+                      (t/is false (str "to-clipboard-multi must not reject: " err))
+                      (done))))))))
+
+(t/deftest chrome-keeps-the-svg-representation
+  (t/testing "#10596: browsers that accept image/svg+xml must still get it"
+    (t/async done
+      (let [state (atom {:written []})
+            mimes #{"image/svg+xml" "text/plain"}]
+        (install-clipboard-item! mimes)
+        (install-navigator-clipboard! state mimes)
+        (-> (copy-svg)
+            (.then (fn [_]
+                     (t/is (= 1 (count (:written @state))))
+                     (t/is (= mimes (set (first (:written @state))))
+                           "dropping image/svg+xml would regress copy into Illustrator/Inkscape")
+                     (t/is (nil? (:text @state))
+                           "the writeText fallback must not be used when write succeeds")
+                     (done)))
+            (.catch (fn [err]
+                      (t/is false (str "to-clipboard-multi must not reject: " err))
+                      (done))))))))
+
+(t/deftest unrelated-write-errors-are-not-swallowed
+  (t/testing "a rejection unrelated to the MIME allowlist must not degrade to text"
+    (t/async done
+      (let [state (atom {:written []})]
+        (install-clipboard-item! nil)
+        (unchecked-set
+         js/navigator "clipboard"
+         #js {:write
+              (fn [_]
+                (js/Promise.reject (js/Error. "Document is not focused.")))
+              :writeText
+              (fn [text]
+                (swap! state assoc :text text)
+                (js/Promise.resolve))})
+        (-> (copy-svg)
+            (.then (fn [_]
+                     (t/is false "an unrelated failure must reject, not silently write text")
+                     (done)))
+            (.catch (fn [err]
+                      (t/is (= "Document is not focused." (ex-message err))
+                            "the original cause must reach the caller")
+                      (t/is (nil? (:text @state))
+                            "no text must be written on an unrelated failure")
+                      (done))))))))
+
+(t/deftest missing-clipboard-item-ctor-falls-back-to-text
+  (t/testing "`clipboard.write` without a `ClipboardItem` constructor must not throw"
+    (t/async done
+      (let [state (atom {:written []})]
+        (unchecked-set js/globalThis "ClipboardItem" nil)
+        (install-navigator-clipboard! state #{"text/plain"})
+        (-> (copy-svg)
+            (.then (fn [_]
+                     (t/is (= [] (:written @state)))
+                     (t/is (= svg-markup (:text @state))
+                           "the payload must still reach the clipboard as text")
+                     (done)))
+            (.catch (fn [err]
+                      (t/is false (str "to-clipboard-multi must not reject: " err))
+                      (done))))))))
+
+(t/deftest write-unavailable-uses-write-text
+  (t/async done
+    (let [state (atom {:written []})]
+      (install-clipboard-item! nil)
+      (unchecked-set js/navigator "clipboard"
+                     #js {:writeText (fn [text]
+                                       (swap! state assoc :text text)
+                                       (js/Promise.resolve))})
+      (-> (clipboard/to-clipboard-multi {"image/svg+xml" svg-markup
+                                         "text/plain"    svg-markup})
+          (.then (fn [_]
+                   (t/is (= svg-markup (:text @state)))
+                   (done)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err))
+                    (done)))))))
+
+(t/deftest empty-items-resolve-without-touching-the-clipboard
+  (t/async done
+    (let [state (atom {:written []})]
+      (install-clipboard-item! nil)
+      (install-navigator-clipboard! state #{"text/plain"})
+      (-> (clipboard/to-clipboard-multi {})
+          (.then (fn [_]
+                   (t/is (= [] (:written @state)))
+                   (t/is (nil? (:text @state)))
+                   (done)))
+          (.catch (fn [err]
+                    (t/is false (str "unexpected rejection: " err))
+                    (done)))))))
+
+(t/deftest clipboard-unavailable-rejects
+  (t/async done
+    (install-clipboard-item! nil)
+    (unchecked-set js/navigator "clipboard" nil)
+    (-> (clipboard/to-clipboard-multi {"text/plain" svg-markup})
+        (.then (fn [_]
+                 (t/is false "must reject when the Clipboard API is unavailable")
+                 (done)))
+        (.catch (fn [err]
+                  (t/is (instance? js/Error err))
+                  (done))))))
diff --git a/frontend/test/frontend_tests/util_text_editor_test.cljs b/frontend/test/frontend_tests/util_text_editor_test.cljs
new file mode 100644
index 0000000000..0823a77d10
--- /dev/null
+++ b/frontend/test/frontend_tests/util_text_editor_test.cljs
@@ -0,0 +1,18 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.util-text-editor-test
+  (:require
+   [app.util.text-editor :as te]
+   [cljs.test :as t :include-macros true]))
+
+(t/deftest get-editor-block-data-returns-nil-for-nil-block
+  (t/is (nil? (te/get-editor-block-data nil)))
+  (t/is (nil? (te/get-editor-block-data js/undefined))))
+
+(t/deftest get-editor-block-type-returns-nil-for-nil-block
+  (t/is (nil? (te/get-editor-block-type nil)))
+  (t/is (nil? (te/get-editor-block-type js/undefined))))
diff --git a/frontend/test/frontend_tests/util_zip_test.cljs b/frontend/test/frontend_tests/util_zip_test.cljs
new file mode 100644
index 0000000000..7cf2d6f609
--- /dev/null
+++ b/frontend/test/frontend_tests/util_zip_test.cljs
@@ -0,0 +1,44 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.util-zip-test
+  (:require
+   [app.util.zip :as-alias uz]
+   [app.worker.import :as worker.import]
+   [beicon.v2.core :as rx]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.mock :as mock]
+   [promesa.core :as p]))
+
+(t/deftest read-as-text-nil-entry-raises-typed-error
+  (t/testing "read-as-text guards against nil entry"
+    (t/is (thrown-with-msg? js/Error #"nil"
+                            (app.util.zip/read-as-text nil)))))
+
+(t/deftest read-zip-manifest-missing-throws-validation-error
+  (t/async
+    done
+    (t/testing "read-zip-manifest rejects ZIPs without manifest.json"
+      (mock/with-mocks
+        {app.util.zip/get-entry (mock/stub (fn [_ _] (p/resolved nil)))}
+        (fn [done']
+          (->> (worker.import/read-zip-manifest #js {})
+               (rx/subs!
+                (fn [_]
+                  (t/is false "expected validation error to be thrown")
+                  (done'))
+                (fn [err]
+                  (let [data (ex-data err)]
+                    (t/is (= :invalid-penpot-file (:code data))
+                          "missing manifest.json raises typed :invalid-penpot-file error")
+                    (t/is (string? (:hint data))
+                          "missing manifest.json error carries a :hint")
+                    (t/is (re-find #"manifest\.json" (:hint data))
+                          "missing manifest.json :hint mentions manifest.json")
+                    (t/is (nil? (re-find #"getData" (:hint data)))
+                          "missing manifest.json :hint does not leak the raw TypeError text")
+                    (done'))))))
+        done))))
\ No newline at end of file
diff --git a/frontend/text-editor/package.json b/frontend/text-editor/package.json
index c315c9e6c6..b916b5b12e 100644
--- a/frontend/text-editor/package.json
+++ b/frontend/text-editor/package.json
@@ -15,18 +15,18 @@
     "test:watch:e2e": "vitest --browser"
   },
   "devDependencies": {
-    "@playwright/test": "1.61.1",
-    "@types/node": "^26.1.0",
-    "@vitest/browser": "^4.1.9",
-    "@vitest/coverage-v8": "^4.1.9",
-    "@vitest/ui": "^4.1.9",
+    "@playwright/test": "1.62.1",
+    "@types/node": "^26.1.2",
+    "@vitest/browser": "^4.1.10",
+    "@vitest/coverage-v8": "^4.1.10",
+    "@vitest/ui": "^4.1.10",
     "canvas": "^3.2.3",
     "esbuild": "^0.28.0",
-    "jsdom": "^29.1.1",
-    "playwright": "1.61.1",
-    "prettier": "^3.9.4",
-    "vite": "^8.1.2",
-    "vitest": "^4.1.9"
+    "jsdom": "^30.0.1",
+    "playwright": "1.62.1",
+    "prettier": "^3.9.6",
+    "vite": "^8.2.0",
+    "vitest": "^4.1.10"
   },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b"
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/frontend/translations/ar.po b/frontend/translations/ar.po
index 218976a3f6..9a53eafb6f 100644
--- a/frontend/translations/ar.po
+++ b/frontend/translations/ar.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Youkho <youkho@gmail.com>\n"
-"Language-Team: Arabic "
-"<https://hosted.weblate.org/projects/penpot/frontend/ar/>\n"
+"PO-Revision-Date: 2026-07-18 03:01+0000\n"
+"Last-Translator: jonnysemon <jonnysemon@users.noreply.hosted.weblate.org>\n"
+"Language-Team: Arabic <https://hosted.weblate.org/projects/penpot/frontend/"
+"ar/>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -862,11 +862,11 @@ msgstr ""
 
 #: src/app/main/data/auth.cljs:342, src/app/main/ui/auth/register.cljs:91
 msgid "errors.registration-disabled"
-msgstr "التسجيل معطل حاليا."
+msgstr "التسجيل مُعطّل حاليًا."
 
 #: src/app/main/ui/dashboard/sidebar.cljs:469, src/app/main/ui/dashboard/team.cljs:474
 msgid "errors.team-leave.insufficient-members"
-msgstr "أعضاء غير كافيين لمغادرة الفريق ، ربما تريد حذفه."
+msgstr "أعضاء غير كافيين لمغادرة الفريق، ربما تريد حذفه."
 
 #: src/app/main/ui/dashboard/sidebar.cljs:472, src/app/main/ui/dashboard/team.cljs:477
 msgid "errors.team-leave.member-does-not-exists"
@@ -2006,10 +2006,6 @@ msgstr "مرحبًا بك في Penpot!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "بعد تسمية فريقك، ستتمكن من دعوة الأشخاص للانضمام."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "أدخل اسم الفريق"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "ادعُ أعضاء"
@@ -2113,16 +2109,8 @@ msgstr "مساحة العمل"
 msgid "shortcut-subsection.alignment"
 msgstr "محاذاة"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
-msgid "shortcut-subsection.edit"
-msgstr "عدّل"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "عام"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "عام"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4716,3 +4704,12 @@ msgstr "افتح قائمة الإصدار"
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "انقر لتغلق المسار"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "راجع بريدك الإلكتروني!"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+#, unused
+msgid "auth.check-mail"
+msgstr "راجع بريدك الإلكتروني"
diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po
index fd724a3a67..744ad00b89 100644
--- a/frontend/translations/ca.po
+++ b/frontend/translations/ca.po
@@ -1927,10 +1927,6 @@ msgstr "Us donem la benvinguda a Penpot!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Quan poseu un nom a l'equip, podreu convidar persones a unir-s'hi."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Introduïu el nom de l'equip"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Convida membres"
@@ -2002,16 +1998,8 @@ msgstr "Espai de treball"
 msgid "shortcut-subsection.alignment"
 msgstr "Alineació"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
-msgid "shortcut-subsection.edit"
-msgstr "Edició"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Genèric"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Genèric"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -2426,14 +2414,6 @@ msgstr "Ajusta a la graella de píxels"
 msgid "shortcuts.start-editing"
 msgstr "Comença a editar"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Comença a mesurar"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Deixa de mesurar"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Estableix miniatures"
diff --git a/frontend/translations/cs.po b/frontend/translations/cs.po
index 78f269bf98..ea20448c0b 100644
--- a/frontend/translations/cs.po
+++ b/frontend/translations/cs.po
@@ -2947,10 +2947,6 @@ msgstr "Budete moci pozvat později"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Po pojmenování svého týmu budete moci pozvat lidi, aby se přidali."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Zadejte název týmu"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Vytvořte tým"
@@ -3242,16 +3238,8 @@ msgstr "Pracovní plocha"
 msgid "shortcut-subsection.alignment"
 msgstr "Zarovnání"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
-msgid "shortcut-subsection.edit"
-msgstr "Upravit"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Obecný"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Obecný"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3726,14 +3714,6 @@ msgstr "Přichytit k mřížce pixelů"
 msgid "shortcuts.start-editing"
 msgstr "Začít upravovat"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Začít měření"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Zastavit měření"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Nastavit náhledy"
@@ -6308,7 +6288,6 @@ msgstr "Momentálně nemáte žádné motivy."
 msgid "workspace.tokens.original-value"
 msgstr "Původní hodnota: %s"
 
-
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
 #, fuzzy
 msgid "workspace.tokens.resolved-value"
diff --git a/frontend/translations/de.po b/frontend/translations/de.po
index b3b060cf94..f7c29f377e 100644
--- a/frontend/translations/de.po
+++ b/frontend/translations/de.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Stas Haas <stas@girafic.de>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/penpot/frontend/de/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/penpot/frontend/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -370,7 +370,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(Kopie)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Neue Organisation erstellen"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -3842,10 +3842,6 @@ msgstr "Sie können später einladen"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Nach der Bennenung Ihres Teams, können Sie andere Personen einladen."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Geben Sie den Namen des Teams ein"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Team erstellen"
@@ -4098,6 +4094,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Dieses Token existiert nicht oder wurde gelöscht."
 
@@ -4143,16 +4140,8 @@ msgstr "Arbeitsbereich"
 msgid "shortcut-subsection.alignment"
 msgstr "Ausrichtung"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
-msgid "shortcut-subsection.edit"
-msgstr "Bearbeiten"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Allgemein"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Allgemein"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4646,14 +4635,6 @@ msgstr "Am Pixelraster ausrichten"
 msgid "shortcuts.start-editing"
 msgstr "Mit der Bearbeitung beginnen"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Mit der Vermessung beginnen"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Mit der Vermessung abbrechen"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Miniaturansichten festlegen"
@@ -4848,10 +4829,6 @@ msgstr "Penpot-Mitglied seit %s"
 msgid "subscription.settings.more-information"
 msgstr "Mehr Informationen"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "Redakteur pro Monat"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "Organisation pro Monat"
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index 051d183632..b9621af9e4 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -98,7 +98,7 @@ msgid "auth.new-password"
 msgstr "Type a new password"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "You're now part of %s"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -297,7 +297,7 @@ msgid "common.unpublish"
 msgstr "Unpublish"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "You're no longer part of the %s organization."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -367,25 +367,25 @@ msgid "dashboard.change-email"
 msgstr "Change email"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "MOVE TEAM"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Move to:"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Select an organization"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "Projects and files will remain available to team members. The team will get "
 "the configuration from the new organization."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Change team's organization"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -397,7 +397,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(copy)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Create org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -816,7 +816,7 @@ msgid "dashboard.invite-profile"
 msgstr "Invite people"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Leave org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -869,7 +869,7 @@ msgstr "Move to other team"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
 msgid "dashboard.my-teams"
-msgstr "My teams"
+msgstr "My Teams"
 
 #: src/app/main/ui/dashboard/files.cljs:106, src/app/main/ui/dashboard/projects.cljs:253, src/app/main/ui/dashboard/projects.cljs:254
 msgid "dashboard.new-file"
@@ -892,7 +892,7 @@ msgid "dashboard.no-matches-for"
 msgstr "No matches found for “%s“"
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "You don't have permission to add teams to any of your organizations."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -962,7 +962,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Order by status"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "The %s organization has been deleted."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -1002,7 +1002,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Try plugin: "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Create org"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1086,36 +1086,39 @@ msgstr "Searching for “%s“…"
 msgid "dashboard.section.organizations"
 msgstr "Organizations"
 
+msgid "dashboard.section.teams"
+msgstr "Teams"
+
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "ADD TO ORGANIZATION"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Choose an organization:"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "\"%s\" only allows organization members to join its teams. Any pending "
 "invitations to people outside the organization will be revoked."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Pending invitations to external users will be canceled."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Here you find all your organizations where you are allowed to create or add "
 "teams."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Select an organization"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Add team to an organization"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1239,7 +1242,7 @@ msgid "dashboard.success-move-project"
 msgstr "Your project has been moved successfully"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "This team now belongs to %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1251,7 +1254,7 @@ msgid "dashboard.team-members"
 msgstr "Team members"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "This team no longer belongs to the organization %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1263,7 +1266,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Add to an organization"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr "You don't have permission to add this team to any of your organizations."
 
 #: src/app/main/ui/dashboard/team.cljs:1632
@@ -1271,7 +1274,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Change team organization"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr "Only people within your organization can be invited."
 
 #: src/app/main/ui/dashboard/team.cljs:1639
@@ -1337,7 +1340,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Penpot Free"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "You are no longer a member of the organization %s"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1501,6 +1504,9 @@ msgstr "The fonts %s could not be loaded"
 msgid "errors.cannot-upload"
 msgstr "Cannot upload the media file."
 
+msgid "errors.circular-library-reference"
+msgstr "Cannot add library: this would create a circular dependency"
+
 #: src/app/main/ui/comments.cljs:737, src/app/main/ui/comments.cljs:767, src/app/main/ui/comments.cljs:864
 msgid "errors.character-limit-exceeded"
 msgstr "Character limit exceeded"
@@ -1721,15 +1727,15 @@ msgid "errors.only-creator-can-unlock"
 msgstr "Only the version creator can unlock it"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr "There was a problem leaving the organization. Please try again."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "The organization owner can't leave the organization."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "That organization doesn't exists"
 
 #: src/app/main/ui/settings/password.cljs
@@ -1742,6 +1748,34 @@ msgstr "Confirmation password must match"
 msgid "errors.password-too-short"
 msgstr "Password should at least be 8 characters"
 
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password"
+msgstr "Password does not meet the requirements"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.too-short"
+msgstr "At least 8 characters"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-lowercase"
+msgstr "At least 1 lowercase letter"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-uppercase"
+msgstr "At least 1 uppercase letter"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-digits"
+msgstr "At least 1 digit"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-special"
+msgstr "At least 1 special character"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.in-dictionary"
+msgstr "Password is too common"
+
 #: src/app/main/errors.cljs:267
 msgid "errors.paste-data-validation"
 msgstr "Invalid data in clipboard"
@@ -2870,6 +2904,11 @@ msgstr "Create new team"
 msgid "labels.create-team.placeholder"
 msgstr "Enter new team name"
 
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "labels.current"
+msgstr "Current"
+
 #, unused
 msgid "labels.custom-fonts"
 msgstr "Custom fonts"
@@ -2878,6 +2917,10 @@ msgstr "Custom fonts"
 msgid "labels.dashboard"
 msgstr "Dashboard"
 
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "labels.default"
+msgstr "Default"
+
 #: src/app/main/ui/dashboard/file_menu.cljs:337, src/app/main/ui/dashboard/fonts.cljs:286, src/app/main/ui/dashboard/fonts.cljs:363, src/app/main/ui/dashboard/fonts.cljs:397, src/app/main/ui/dashboard/project_menu.cljs:115, src/app/main/ui/dashboard/team.cljs:1379, src/app/main/ui/settings/integrations.cljs:389, src/app/main/ui/settings/profile.cljs:117, src/app/main/ui/settings/profile.cljs:128, src/app/main/ui/settings/profile.cljs:129, src/app/main/ui/workspace/sidebar/assets/common.cljs:231, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:223, src/app/main/ui/workspace/sidebar/versions.cljs:258, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:353, src/app/main/ui/workspace/tokens/management/node_context_menu.cljs:111, src/app/main/ui/workspace/tokens/sets/context_menu.cljs:66, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:378
 msgid "labels.delete"
 msgstr "Delete"
@@ -3748,17 +3791,17 @@ msgid "modals.add-shared-confirm.message"
 msgstr "Add “%s” as Shared Library"
 
 #: src/app/main/data/nitrate.cljs:199
-msgid "modals.before-leave-org.message"
+msgid "modals.before-leave-organization.message"
 msgstr ""
 "You are the only member of some of the teams. Those teams will be deleted "
 "along with its projects and files."
 
 #: src/app/main/data/nitrate.cljs:198, src/app/main/ui/dashboard/change_owner.cljs:151
-msgid "modals.before-leave-org.title"
+msgid "modals.before-leave-organization.title"
 msgstr "BEFORE YOU LEAVE THE ORGANIZATION"
 
 #: src/app/main/data/nitrate.cljs:202
-msgid "modals.before-leave-org.warning"
+msgid "modals.before-leave-organization.warning"
 msgstr "Any team where you’re the only member will be deleted."
 
 #: src/app/main/ui/workspace/nudge.cljs:59
@@ -3816,22 +3859,22 @@ msgstr "By removing your account you’ll lose all your current projects and arc
 
 #: src/app/main/ui/settings/delete_account.cljs
 #, unused
-msgid "modals.delete-account.info.with-orgs"
+msgid "modals.delete-account.info.with-organizations"
 msgstr ""
 "This action is irreversible. Your account, subscription, and organizations "
 "will be deleted immediately. You will also lose access to your current "
 "projects and files."
 
 #: src/app/main/ui/settings/delete_account.cljs:83
-msgid "modals.delete-account.owned-orgs.list-title"
+msgid "modals.delete-account.owned-organizations.list-title"
 msgstr "Organizations that will be deleted"
 
 #: src/app/main/ui/settings/delete_account.cljs:98
-msgid "modals.delete-account.owned-orgs.members-count"
+msgid "modals.delete-account.owned-organizations.members-count"
 msgstr "%s members"
 
 #: src/app/main/ui/settings/delete_account.cljs:96
-msgid "modals.delete-account.owned-orgs.teams-count"
+msgid "modals.delete-account.owned-organizations.teams-count"
 msgstr "%s teams"
 
 #: src/app/main/ui/settings/delete_account.cljs:64
@@ -3915,7 +3958,7 @@ msgid "modals.delete-font.title"
 msgstr "Deleting font"
 
 #: src/app/main/data/team.cljs:129
-msgid "modals.delete-org-team-confirm.message"
+msgid "modals.delete-organization-team-confirm.message"
 msgstr "Are you sure you want to delete this team that is part of %s org?"
 
 #: src/app/main/ui/workspace/context_menu.cljs:707, src/app/main/ui/workspace/sidebar/sitemap.cljs:109
@@ -4067,7 +4110,7 @@ msgid "modals.invite-restricted-members.all-blocked-title"
 msgstr "No invitations were sent"
 
 #: src/app/main/data/team.cljs:162
-msgid "modals.invite-restricted-members.all-org-members-in-team"
+msgid "modals.invite-restricted-members.all-organization-members-in-team"
 msgstr ""
 "Only \"%s\" organization's members can be invited to this team, and they "
 "are all already team members. If you need more information, contact the "
@@ -4154,35 +4197,35 @@ msgid "modals.leave-confirm.title"
 msgstr "Leaving team"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:158
-msgid "modals.leave-org-and-reassign.hint"
+msgid "modals.leave-organization-and-reassign.hint"
 msgstr ""
 "You are the owner of some organization's teams. Please promote another "
 "member to become an owner."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:161
-msgid "modals.leave-org-and-reassign.hint-delete"
+msgid "modals.leave-organization-and-reassign.hint-delete"
 msgstr ""
 "You are the only member of some of the teams. Those teams will be deleted "
 "along with its projects and files."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:163
-msgid "modals.leave-org-and-reassign.hint-promote"
+msgid "modals.leave-organization-and-reassign.hint-promote"
 msgstr ""
 "Also, you are the owner of some organization's teams. Please promote "
 "another member to become an owner."
 
 #: src/app/main/data/nitrate.cljs:200, src/app/main/data/nitrate.cljs:209
-msgid "modals.leave-org-confirm.accept"
+msgid "modals.leave-organization-confirm.accept"
 msgstr "Leave organization"
 
 #: src/app/main/data/nitrate.cljs:208
-msgid "modals.leave-org-confirm.message"
+msgid "modals.leave-organization-confirm.message"
 msgstr ""
 "You will permanently lose access to all teams, projects, and files within "
 "it."
 
 #: src/app/main/data/nitrate.cljs:207
-msgid "modals.leave-org-confirm.title"
+msgid "modals.leave-organization-confirm.title"
 msgstr "Leaving %s organization?"
 
 #: src/app/main/ui/delete_shared.cljs:54
@@ -4257,21 +4300,21 @@ msgid "modals.remove-shared-confirm.message"
 msgstr "Remove “%s” as Shared Library"
 
 #: src/app/main/data/nitrate.cljs:256
-msgid "modals.remove-team-org.accept"
+msgid "modals.remove-team-organization.accept"
 msgstr "Remove from organization"
 
 #: src/app/main/data/nitrate.cljs:254
-msgid "modals.remove-team-org.info"
+msgid "modals.remove-team-organization.info"
 msgstr ""
 "Projects and files will remain available to team members, but the "
 "organization's settings will no longer apply."
 
 #: src/app/main/data/nitrate.cljs:253
-msgid "modals.remove-team-org.text"
+msgid "modals.remove-team-organization.text"
 msgstr "Are you sure you want to remove the '%s' team from the '%s' organization?"
 
 #: src/app/main/data/nitrate.cljs:252
-msgid "modals.remove-team-org.title"
+msgid "modals.remove-team-organization.title"
 msgstr "REMOVE TEAM FROM THE ORGANIZATION"
 
 #: src/app/main/ui/workspace/nudge.cljs:52
@@ -4339,7 +4382,7 @@ msgid "nitrate.activation-success.active-until"
 msgstr "Your plan is active until %s."
 
 #: src/app/main/ui/dashboard/subscription.cljs:195, src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:68
-msgid "nitrate.activation-success.create-org"
+msgid "nitrate.activation-success.create-organization"
 msgstr "Create organization"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
@@ -4349,16 +4392,22 @@ msgstr "Enjoy your plan!"
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
 msgid "nitrate.activation-success.manage-info"
 msgstr ""
-"You can manage your subscription anytime from the Subscription page in your "
-"account settings."
+"You can edit your subscription at any time from the 'Subscription' page in your "
+"account details."
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:53
-msgid "nitrate.activation-success.title"
-msgstr "You are Business Nitrate!"
+msgid "nitrate.modal-success.title"
+msgstr "Welcome to Enterprise!"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:104
-msgid "nitrate.code-activation.footer"
-msgstr "Need a code? Contact us:"
+msgid "nitrate.code-activation.footer-before"
+msgstr "Need a code? Download your "
+
+msgid "nitrate.code-activation.footer-link"
+msgstr "activation code request"
+
+msgid "nitrate.code-activation.footer-after"
+msgstr " and contact us:"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
 msgid "nitrate.code-activation.input-label"
@@ -4370,7 +4419,7 @@ msgstr "Paste your activation code here"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:79
 msgid "nitrate.code-activation.renew-title"
-msgstr "RENEW NITRATE"
+msgstr "RENEW ENTERPRISE"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:101
 msgid "nitrate.code-activation.submit"
@@ -4378,39 +4427,32 @@ msgstr "Activate"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:80
 msgid "nitrate.code-activation.title"
-msgstr "Activate Nitrate"
+msgstr "Activate Enterprise"
 
-#, unused
 msgid "nitrate.contact-sales.button"
 msgstr "Contact sales"
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-contact-info"
 msgstr ""
 "To switch to this plan, please contact our sales team. We'll help you "
 "update your subscription and ensure everything is set up correctly."
 
-#, unused
-msgid "nitrate.contact-sales.downgrade-org-deleted"
+msgid "nitrate.contact-sales.downgrade-organization-deleted"
 msgstr "Your organization will be deleted."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-storage-limited"
 msgstr ""
 "Your total storage, auto-version history, and file recovery period will be "
 "limited."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-teams-available"
 msgstr ""
 "The teams, projects and files will no longer be part of any organization "
 "but they will remain available."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-title"
 msgstr "When you downgrade:"
 
-#, unused
 msgid "nitrate.contact-sales.title"
 msgstr "Switch to %s plan?"
 
@@ -4446,21 +4488,32 @@ msgstr "Full open-source freedom, with the governance your org needs"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:54
 msgid "nitrate.form.enterprise-intro"
-msgstr "Everything your teams need to work securely at scale:"
+msgstr "Everything your teams need to work securely at scale%s"
+
+msgid "nitrate.form.enterprise-description"
+msgstr "You won’t be charged right now. Payment will be processed at the end of the trial. Cancel anytime."
+
+msgid "nitrate.form.contact-us-free-trial"
+msgstr "Contact us to try the Enterprise plan for 14 days:"
+
+msgid "nitrate.form.contact-us-upgrade"
+msgstr "Contact us to upgrade to the Enterprise plan:"
+
+msgid "nitrate.form.free-trial-button"
+msgstr "Try 14 days for free"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
 msgid "nitrate.form.enterprise.price"
 msgstr "per member per month"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:80, src/app/main/ui/nitrate/nitrate_form.cljs:98
-msgid "nitrate.form.have-code"
-msgstr "Have an activation code?"
+msgid "nitrate.form.subscribe-with-code"
+msgstr "Subscribe with an activation code"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:86
 msgid "nitrate.form.see-plan"
 msgstr "See my current plan"
 
-#, unused
 msgid "nitrate.form.start-enterprise"
 msgstr "Get started with Enterprise"
 
@@ -4472,23 +4525,21 @@ msgstr "Unlock Enterprise features"
 msgid "nitrate.form.try-free"
 msgstr "Try it free for 14 days"
 
-#: src/app/main/ui/nitrate/nitrate_form.cljs:74
-#, fuzzy
-msgid "nitrate.form.upgrade"
-msgstr ""
-
 #: src/app/main/ui/settings/subscription.cljs:575
 msgid "nitrate.subscription.active-until"
 msgstr "Active until %s"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:50
 msgid "nitrate.subscription.renew-success"
-msgstr "Your Nitrate subscription has been renewed."
+msgstr "Your Enterprise subscription has been renewed."
 
 #: src/app/main/ui/settings/subscription.cljs:584
 msgid "nitrate.subscription.settings.manual-cancel"
 msgstr "Cancel subscription"
 
+msgid "nitrate.subscription.settings.manual-contact-us"
+msgstr "To cancel your Enterprise subscription, please contact us at:"
+
 #: src/app/main/ui/settings/subscription.cljs:103
 msgid "nitrate.subscription.settings.renew-with-code"
 msgstr "Renew with activation code"
@@ -5096,16 +5147,12 @@ msgstr "Workspace"
 msgid "shortcut-subsection.alignment"
 msgstr "Alignment"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
 msgid "shortcut-subsection.edit"
 msgstr "Edit"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generic"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generic"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5612,22 +5659,90 @@ msgid "shortcuts.start-editing"
 msgstr "Start editing"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Start measurement"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Stop measurement"
+msgid "shortcuts.show-measure"
+msgstr "Show measurements"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Set thumbnails"
 
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.page"
+msgstr "Shortcuts page"
+
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:491, src/app/main/ui/workspace/sidebar/shortcuts.cljs:498
 msgid "shortcuts.title"
 msgstr "Keyboard shortcuts"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:185
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.reset"
+msgstr "Reset to default"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disable"
+msgstr "Disable shortcut"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disabled-shortcut"
+msgstr "Disabled shortcut"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.overwritten-by"
+msgstr "This shortcut has been reassigned to %s"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-personalized"
+msgstr "Head to All to start customizing your shortcuts."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-disabled"
+msgstr "There are not disabled shortcuts"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.reload-hint"
+msgstr "After editing shortcuts, reload any other open Penpot tabs to apply the changes."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-shortcuts"
+msgstr "There are no shortcuts that match your search"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.personalized"
+msgstr "Personalized"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disabled"
+msgstr "Disabled"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.draw-arrow"
+msgstr "Arrow"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.draw-line"
+msgstr "Line"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.import-export"
+msgstr "Import/Export"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.key-combo"
+msgstr "Press the key combination"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.conflict"
+msgstr "Combination assigned to \"%s\". Saving will remove it there."
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.reset-pending"
+msgstr "If you save, this shortcut will return to the original value:"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.success"
+msgstr "This key combination is available and can be assigned without conflicts."
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
 msgid "shortcuts.toggle-alignment"
 msgstr "Toggle dynamic alignment"
 
@@ -5639,6 +5754,10 @@ msgstr "Toggle assets"
 msgid "shortcuts.toggle-colorpalette"
 msgstr "Toggle color palette"
 
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs
+msgid "shortcuts.toggle-comments-visibility"
+msgstr "Toggle comments visibility"
+
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:188
 msgid "shortcuts.toggle-focus-mode"
 msgstr "Toggle focus mode"
@@ -5735,8 +5854,44 @@ msgstr "Zoom lense increase"
 msgid "shortcuts.zoom-selected"
 msgstr "Zoom to selected"
 
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs
+msgid "shortcuts.edit-on-settings"
+msgstr "Customize on settings"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.modal-title"
+msgstr "Restore to default configuration"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.modal-text"
+msgstr "The following shortcuts will be restored to their default values."
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.acction"
+msgstr "Acction"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.restore"
+msgstr "Restore"
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.diff-modal-title"
+msgstr "Import shortcuts"
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.diff-modal-text"
+msgstr "The following shortcuts will be changed by the imported configuration."
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.no-changes"
+msgstr "No differences found between the current and imported shortcuts."
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.apply"
+msgstr "Apply"
+
 #: src/app/main/ui/dashboard/subscription.cljs:191
-msgid "subscription.banner.create-org-info"
+msgid "subscription.banner.create-organization-info"
 msgstr ""
 "Create an organization and see exactly how Enterprise works. Set rules, "
 "manage your teams and discover a new level of control over your design "
@@ -5915,8 +6070,8 @@ msgstr "Payment was not completed. Try again whenever you're ready."
 #: src/app/main/ui/settings/subscription.cljs:427
 msgid "subscription.error.nitrate.checkout-failed"
 msgstr ""
-"We couldn't start the checkout. Please try again. If the problem persists, "
-"contact us: support@penpot.app."
+"The payment was not completed. Please try again. "
+"If the problem persists, contact us: support@penpot.app."
 
 #: src/app/main/ui/settings/subscription.cljs:407
 msgid "subscription.error.nitrate.checkout-finish-failed"
@@ -5944,6 +6099,9 @@ msgstr "All Professional plan benefits and:"
 msgid "subscription.settings.benefits.all-unlimited-benefits"
 msgstr "All Unlimited plan benefits and:"
 
+msgid "subscription.settings.benefits.nitrate-unlimited-benefits"
+msgstr "All Unlimited plan benefits, plus:"
+
 #: src/app/main/ui/settings/subscription.cljs:62
 msgid "subscription.settings.editors"
 msgstr "(x %s editors)"
@@ -5968,6 +6126,27 @@ msgstr "Flat monthly bill"
 msgid "subscription.settings.enterprise.unlimited-storage-benefit"
 msgstr "Unlimited storage"
 
+msgid "subscription.settings.enterprise.nitrate.multi-organization-management"
+msgstr "Multi-Org Management:"
+
+msgid "subscription.settings.enterprise.nitrate.support-team"
+msgstr "Support for complex team hierarchies and separate sub-organizations."
+
+msgid "subscription.settings.enterprise.nitrate.enterprise-security"
+msgstr "Enterprise Security:"
+
+msgid "subscription.settings.enterprise.nitrate.native-sso"
+msgstr "Native SAML/​​SSO and full Audit Trail logging for compliance reporting."
+
+msgid "subscription.settings.enterprise.nitrate.advanced-control"
+msgstr "Advanced Control:"
+
+msgid "subscription.settings.enterprise.nitrate.plugin-whitelisting"
+msgstr "Granular plugin whitelisting, including our secure, isolated MCP Server for AI connectivity."
+
+msgid "subscription.settings.admin-console"
+msgstr "Admin Console"
+
 #: src/app/main/ui/dashboard/subscription.cljs:287, src/app/main/ui/settings/subscription.cljs:583, src/app/main/ui/settings/subscription.cljs:610, src/app/main/ui/settings/subscription.cljs:622, src/app/main/ui/settings/subscription.cljs:634, src/app/main/ui/settings/subscription.cljs:644
 msgid "subscription.settings.manage-your-subscription"
 msgstr "Manage your subscription"
@@ -6047,15 +6226,15 @@ msgstr "More information"
 
 #: src/app/main/ui/settings/subscription.cljs:724
 msgid "subscription.settings.organization-member-month"
-msgstr "org member per month"
+msgstr "org member / month"
 
 #: src/app/main/ui/settings/subscription.cljs:665
 msgid "subscription.settings.other-plans"
 msgstr "Other penpot plans"
 
 #: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "editor per month"
+msgid "subscription.settings.price-user-month"
+msgstr "user / month"
 
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
@@ -6123,10 +6302,9 @@ msgstr "Thank your for chosing the Penpot %s plan!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "You are %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "You've been supporting us with this plan since: %s"
+#: src/app/main/ui/settings/subscription.cljs:679
+msgid "subscription.settings.subscribed-since"
+msgstr "You've been on the %s plan since %s."
 
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
@@ -8407,6 +8585,30 @@ msgstr "Gap"
 msgid "workspace.options.stroke-width"
 msgstr "Stroke width"
 
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-top"
+msgstr "Top (block start)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-right"
+msgstr "Right (inline end)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-bottom"
+msgstr "Bottom (block end)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-left"
+msgstr "Left (inline start)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke.per-side"
+msgstr "Stroke per side"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke.per-side-disabled"
+msgstr "Strokes per side feature is only available in the new render. Switch render to use it."
+
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:209
 msgid "workspace.options.stroke.add-stroke"
 msgstr "Add stroke color"
@@ -10136,4 +10338,4 @@ msgid "workspace.viewport.click-to-close-path"
 msgstr "Click to close the path"
 
 msgid "notifications.invitation-canceled"
-msgstr "This invitation is no longer available."
\ No newline at end of file
+msgstr "This invitation is no longer available."
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 581aeb3551..51165035e2 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:29+0000\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
-"Language-Team: Spanish "
-"<https://hosted.weblate.org/projects/penpot/frontend/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/penpot/frontend/"
+"es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -102,7 +102,7 @@ msgid "auth.new-password"
 msgstr "Introduce la nueva contraseña"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "Te uniste a la organización %s"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -304,7 +304,7 @@ msgid "common.unpublish"
 msgstr "Despublicar"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "Ya no eres miembro de la organización %s."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -374,25 +374,25 @@ msgid "dashboard.change-email"
 msgstr "Cambiar correo"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "MOVER EL EQUIPO"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Mover a:"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Elige una organización"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "Los miembros del equipo seguirán teniendo acceso a los proyectos y "
 "ficheros. El equipo tendrá la configuración de la nueva organización."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Cambiar el equipo de organización"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -404,7 +404,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(copia)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Crear org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -824,7 +824,7 @@ msgid "dashboard.invite-profile"
 msgstr "Invitar a la gente"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Abandonar organización"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -877,7 +877,7 @@ msgstr "Mover a otro equipo"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
 msgid "dashboard.my-teams"
-msgstr "Mis equipos"
+msgstr "Mis Equipos"
 
 #: src/app/main/ui/dashboard/files.cljs:106, src/app/main/ui/dashboard/projects.cljs:253, src/app/main/ui/dashboard/projects.cljs:254
 msgid "dashboard.new-file"
@@ -900,7 +900,7 @@ msgid "dashboard.no-matches-for"
 msgstr "No se encuentra “%s“"
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "No tienes permiso para añadir equipos a ninguna de tus organizaciones."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -972,7 +972,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Ordenar por estado"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "La organización %s se ha borrado."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -1012,7 +1012,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Prueba la extensión: "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Crear org"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1096,37 +1096,40 @@ msgstr "Buscando “%s“…"
 msgid "dashboard.section.organizations"
 msgstr "Organizaciones"
 
+msgid "dashboard.section.teams"
+msgstr "Equipos"
+
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "AÑADIR A UNA ORGANIZACIÓN"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Elige una organización:"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "\"%s\" solo permite que los miembros de la organización se unan a sus "
 "equipos. Cualquier invitación pendiente a personas fuera de la organización "
 "será revocada."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Las invitaciones pendientes a usuarios externos serán canceladas."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Aquí encontrarás todas las organizaciones en las que tienes permiso para "
 "crear o añadir equipos."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Elige una organización"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Añadir el equipo a una organización"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1250,7 +1253,7 @@ msgid "dashboard.success-move-project"
 msgstr "Tu proyecto ha sido movido con éxito"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "Este equipo ahora pertenece a la organización %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1262,7 +1265,7 @@ msgid "dashboard.team-members"
 msgstr "Integrantes del equipo"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "Este equipo ya no pertenece a la organización %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1274,7 +1277,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Añadir a una organización"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr "No tienes permiso para añadir este equipo a ninguna de tus organizaciones."
 
 #: src/app/main/ui/dashboard/team.cljs:1632
@@ -1282,7 +1285,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Cambiar el equipo de organización"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr "Solo se puede invitar a personas que estén dentro de tu organización."
 
 #: src/app/main/ui/dashboard/team.cljs:1639
@@ -1348,7 +1351,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Penpot Gratis"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "Ya no perteneces a la organización %s"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1485,6 +1488,7 @@ msgid "ds.inputs.numeric-input.open-token-list-dropdown"
 msgstr "Abrir lista de tokens"
 
 #: src/app/main/ui/ds/controls/utilities/token_field.cljs:48
+#, fuzzy
 msgid "ds.inputs.token-field.no-active-token-option"
 msgstr "{%s} no está disponible en ningún set o tiene un valor inválido."
 
@@ -1512,6 +1516,9 @@ msgstr "No se han podido cargar las fuentes %s"
 msgid "errors.cannot-upload"
 msgstr "No se puede cargar el archivo multimedia."
 
+msgid "errors.circular-library-reference"
+msgstr "No se puede añadir la biblioteca: crearía una dependencia circular"
+
 #: src/app/main/ui/comments.cljs:737, src/app/main/ui/comments.cljs:767, src/app/main/ui/comments.cljs:864
 msgid "errors.character-limit-exceeded"
 msgstr "Se ha superado el límite de caracteres"
@@ -1687,17 +1694,17 @@ msgid "errors.migration-in-progress"
 msgstr "Migración en proceso"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr ""
 "Ha habido un problema abandonando la organización. Intentalo de nuevo, por "
 "favor."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "El dueño de la organización no puede abandonarla."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "Esa organización no existe"
 
 #: src/app/main/ui/settings/password.cljs
@@ -1710,6 +1717,34 @@ msgstr "La contraseña de confirmación debe coincidir"
 msgid "errors.password-too-short"
 msgstr "La contraseña debe tener 8 caracteres como mínimo"
 
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password"
+msgstr "La contraseña no cumple los requisitos"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.too-short"
+msgstr "Al menos 8 caracteres"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-lowercase"
+msgstr "Al menos 1 letra minúscula"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-uppercase"
+msgstr "Al menos 1 letra mayúscula"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-digits"
+msgstr "Al menos 1 dígito"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.insufficient-special"
+msgstr "Al menos 1 carácter especial"
+
+#: src/app/main/ui/settings/password.cljs, src/app/main/ui/auth/register.cljs
+msgid "errors.weak-password.in-dictionary"
+msgstr "La contraseña es demasiado común"
+
 #: src/app/main/errors.cljs:267
 msgid "errors.paste-data-validation"
 msgstr "Datos inválidos en el portapapeles"
@@ -2805,6 +2840,10 @@ msgstr "Crea un nuevo equipo"
 msgid "labels.create-team.placeholder"
 msgstr "Introduce un nuevo nombre de equipo"
 
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "labels.current"
+msgstr "Valor Actual"
+
 #, unused
 msgid "labels.custom-fonts"
 msgstr "Fuentes personalizadas"
@@ -2813,6 +2852,10 @@ msgstr "Fuentes personalizadas"
 msgid "labels.dashboard"
 msgstr "Panel"
 
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "labels.default"
+msgstr "Valor por defecto"
+
 #: src/app/main/ui/dashboard/file_menu.cljs:337, src/app/main/ui/dashboard/fonts.cljs:286, src/app/main/ui/dashboard/fonts.cljs:363, src/app/main/ui/dashboard/fonts.cljs:397, src/app/main/ui/dashboard/project_menu.cljs:115, src/app/main/ui/dashboard/team.cljs:1379, src/app/main/ui/settings/integrations.cljs:389, src/app/main/ui/settings/profile.cljs:117, src/app/main/ui/settings/profile.cljs:128, src/app/main/ui/settings/profile.cljs:129, src/app/main/ui/workspace/sidebar/assets/common.cljs:231, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:223, src/app/main/ui/workspace/sidebar/versions.cljs:258, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:353, src/app/main/ui/workspace/tokens/management/node_context_menu.cljs:111, src/app/main/ui/workspace/tokens/sets/context_menu.cljs:66, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:378
 msgid "labels.delete"
 msgstr "Borrar"
@@ -3640,17 +3683,17 @@ msgid "modals.add-shared-confirm.message"
 msgstr "Añadir “%s” como Biblioteca Compartida"
 
 #: src/app/main/data/nitrate.cljs:199
-msgid "modals.before-leave-org.message"
+msgid "modals.before-leave-organization.message"
 msgstr ""
 "Eres el único miembro de algunos equipos. Esos equipos se van a borrar, "
 "junto con sus proyectos y ficheros."
 
 #: src/app/main/data/nitrate.cljs:198, src/app/main/ui/dashboard/change_owner.cljs:151
-msgid "modals.before-leave-org.title"
+msgid "modals.before-leave-organization.title"
 msgstr "ANTES DE ABANDONAR LA ORGANIZACIÓN"
 
 #: src/app/main/data/nitrate.cljs:202
-msgid "modals.before-leave-org.warning"
+msgid "modals.before-leave-organization.warning"
 msgstr "Se van a borrar todos los equipos en los que eres el único miembro."
 
 #: src/app/main/ui/workspace/nudge.cljs:59
@@ -3708,22 +3751,22 @@ msgstr "Si borras tu cuenta perderás todos tus proyectos y archivos."
 
 #: src/app/main/ui/settings/delete_account.cljs
 #, unused
-msgid "modals.delete-account.info.with-orgs"
+msgid "modals.delete-account.info.with-organizations"
 msgstr ""
 "Esta acción es irreversible. Tu cuenta, suscripción y organizaciones se "
 "eliminarán inmediatamente. También perderás el acceso a tus proyectos y "
 "archivos actuales."
 
 #: src/app/main/ui/settings/delete_account.cljs:83
-msgid "modals.delete-account.owned-orgs.list-title"
+msgid "modals.delete-account.owned-organizations.list-title"
 msgstr "Organizaciones que se eliminarán"
 
 #: src/app/main/ui/settings/delete_account.cljs:98
-msgid "modals.delete-account.owned-orgs.members-count"
+msgid "modals.delete-account.owned-organizations.members-count"
 msgstr "%s miembros"
 
 #: src/app/main/ui/settings/delete_account.cljs:96
-msgid "modals.delete-account.owned-orgs.teams-count"
+msgid "modals.delete-account.owned-organizations.teams-count"
 msgstr "%s equipos"
 
 #: src/app/main/ui/settings/delete_account.cljs:64
@@ -3797,7 +3840,7 @@ msgid "modals.delete-font.title"
 msgstr "Eliminando fuente"
 
 #: src/app/main/data/team.cljs:129
-msgid "modals.delete-org-team-confirm.message"
+msgid "modals.delete-organization-team-confirm.message"
 msgstr ""
 "¿Estás seguro de que deseas eliminar este equipo que forma parte de la "
 "organización %s?"
@@ -3942,7 +3985,7 @@ msgid "modals.invite-restricted-members.all-blocked-title"
 msgstr "No se envió ninguna invitación"
 
 #: src/app/main/data/team.cljs:162
-msgid "modals.invite-restricted-members.all-org-members-in-team"
+msgid "modals.invite-restricted-members.all-organization-members-in-team"
 msgstr ""
 "Solo se puede invitar a este equipo a miembros de la organización \"%s\", y "
 "todas esas personas ya son miembros del equipo. Si necesitas más "
@@ -4029,35 +4072,35 @@ msgid "modals.leave-confirm.title"
 msgstr "Abandonando el equipo"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:158
-msgid "modals.leave-org-and-reassign.hint"
+msgid "modals.leave-organization-and-reassign.hint"
 msgstr ""
 "Tienes la propiedad de algunos equipos de esta organización. Por favor "
 "selecciona otra persona integrante para promover al rol Propiedad."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:161
-msgid "modals.leave-org-and-reassign.hint-delete"
+msgid "modals.leave-organization-and-reassign.hint-delete"
 msgstr ""
 "Eres el único miembro de algunos equipos. Esos equipos se van a borrar, "
 "junto con sus proyectos y ficheros."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:163
-msgid "modals.leave-org-and-reassign.hint-promote"
+msgid "modals.leave-organization-and-reassign.hint-promote"
 msgstr ""
 "Además, tienes la propiedad de algunos equipos de esta organización. Por "
 "favor selecciona otra persona integrante para promover al rol Propiedad."
 
 #: src/app/main/data/nitrate.cljs:200, src/app/main/data/nitrate.cljs:209
-msgid "modals.leave-org-confirm.accept"
+msgid "modals.leave-organization-confirm.accept"
 msgstr "Abandonar organización"
 
 #: src/app/main/data/nitrate.cljs:208
-msgid "modals.leave-org-confirm.message"
+msgid "modals.leave-organization-confirm.message"
 msgstr ""
 "Perderás permanentemente el acceso a todos los equipos, proyectos y "
 "archivos en ella."
 
 #: src/app/main/data/nitrate.cljs:207
-msgid "modals.leave-org-confirm.title"
+msgid "modals.leave-organization-confirm.title"
 msgstr "¿Abandonando la organización %s?"
 
 #: src/app/main/ui/delete_shared.cljs:54
@@ -4132,21 +4175,21 @@ msgid "modals.remove-shared-confirm.message"
 msgstr "Añadir “%s” como Biblioteca Compartida"
 
 #: src/app/main/data/nitrate.cljs:256
-msgid "modals.remove-team-org.accept"
+msgid "modals.remove-team-organization.accept"
 msgstr "Eliminar de la organización"
 
 #: src/app/main/data/nitrate.cljs:254
-msgid "modals.remove-team-org.info"
+msgid "modals.remove-team-organization.info"
 msgstr ""
 "Los proyectos y archivos seguirán estando disponibles para los miembros del "
 "equipo, pero la configuración de la organización dejará de aplicarse."
 
 #: src/app/main/data/nitrate.cljs:253
-msgid "modals.remove-team-org.text"
+msgid "modals.remove-team-organization.text"
 msgstr "¿Estás seguro de que quieres eliminar el equipo %s de la organización %s?"
 
 #: src/app/main/data/nitrate.cljs:252
-msgid "modals.remove-team-org.title"
+msgid "modals.remove-team-organization.title"
 msgstr "ELIMINAR EQUIPO DE LA ORGANIZACIÓN"
 
 #: src/app/main/ui/workspace/nudge.cljs:52
@@ -4214,7 +4257,7 @@ msgid "nitrate.activation-success.active-until"
 msgstr "Tu plan está activo hasta el %s."
 
 #: src/app/main/ui/dashboard/subscription.cljs:195, src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:68
-msgid "nitrate.activation-success.create-org"
+msgid "nitrate.activation-success.create-organization"
 msgstr "Crear organización"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
@@ -4224,16 +4267,22 @@ msgstr "¡Disfruta de tu plan!"
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
 msgid "nitrate.activation-success.manage-info"
 msgstr ""
-"Puedes gestionar tu suscripción en cualquier momento desde la página de "
-"Suscripción en la configuración de tu cuenta."
+"Puedes editar tu suscripción en cualquier momento desde la página de "
+"'Suscripción' en los detalles de tu cuenta."
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:53
-msgid "nitrate.activation-success.title"
-msgstr "¡Ya eres Business Nitrate!"
+msgid "nitrate.modal-success.title"
+msgstr "¡Bienvenido a Enterprise!"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:104
-msgid "nitrate.code-activation.footer"
-msgstr "¿Necesitas un código? Contáctanos:"
+msgid "nitrate.code-activation.footer-before"
+msgstr "¿Necesitas un código? Descarga tu "
+
+msgid "nitrate.code-activation.footer-link"
+msgstr "solicitud de código de activación"
+
+msgid "nitrate.code-activation.footer-after"
+msgstr " y contáctanos:"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
 msgid "nitrate.code-activation.input-label"
@@ -4245,7 +4294,7 @@ msgstr "Pega aquí tu código de activación"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:79
 msgid "nitrate.code-activation.renew-title"
-msgstr "RENOVAR NITRATE"
+msgstr "RENOVAR ENTERPRISE"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:101
 msgid "nitrate.code-activation.submit"
@@ -4253,40 +4302,33 @@ msgstr "Activar"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:80
 msgid "nitrate.code-activation.title"
-msgstr "Activar Nitrate"
+msgstr "Activar Enterprise"
 
-#, unused
 msgid "nitrate.contact-sales.button"
 msgstr "Contactar con ventas"
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-contact-info"
 msgstr ""
 "Para cambiar a este plan, contacta con nuestro equipo de ventas. Te "
 "ayudaremos a actualizar tu suscripción y a asegurarnos de que todo esté "
 "configurado correctamente."
 
-#, unused
-msgid "nitrate.contact-sales.downgrade-org-deleted"
+msgid "nitrate.contact-sales.downgrade-organization-deleted"
 msgstr "Tu organización será eliminada."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-storage-limited"
 msgstr ""
 "Tu almacenamiento total, el historial de versiones automático y el período "
 "de recuperación de archivos serán limitados."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-teams-available"
 msgstr ""
 "Los equipos, proyectos y archivos dejarán de pertenecer a la organización "
 "pero seguirán disponibles."
 
-#, unused
 msgid "nitrate.contact-sales.downgrade-title"
 msgstr "Al bajar de plan:"
 
-#, unused
 msgid "nitrate.contact-sales.title"
 msgstr "¿Cambiar al plan %s?"
 
@@ -4304,6 +4346,9 @@ msgstr "Contáctanos para probar Enterprise durante 14 días:"
 msgid "nitrate.form.contact-upgrade"
 msgstr "Contáctanos para actualizar a Enterprise:"
 
+msgid "nitrate.form.free-trial-button"
+msgstr "Pruébalo gratis durante 14 días"
+
 #: src/app/main/ui/nitrate/nitrate_form.cljs:82, src/app/main/ui/nitrate/nitrate_form.cljs:102
 msgid "nitrate.form.enter-code"
 msgstr "Introducir código de activación"
@@ -4324,21 +4369,29 @@ msgstr "Total libertad open-source, con la gobernanza que tu organización neces
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:54
 msgid "nitrate.form.enterprise-intro"
-msgstr "Todo lo que tus equipos necesitan para trabajar de forma segura a escala:"
+msgstr "Todo lo que tus equipos necesitan para trabajar de forma segura a escala%s"
+
+msgid "nitrate.form.enterprise-description"
+msgstr "No se te cobrará nada ahora. El pago se procesará al finalizar el período de prueba. Puedes cancelar en cualquier momento."
+
+msgid "nitrate.form.contact-us-free-trial"
+msgstr "Ponte en contacto con nosotros para probar el plan Enterprise durante 14 días:"
+
+msgid "nitrate.form.contact-us-upgrade"
+msgstr "Ponte en contacto con nosotros para actualizar al plan Enterprise:"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
 msgid "nitrate.form.enterprise.price"
 msgstr "por miembro al mes"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:80, src/app/main/ui/nitrate/nitrate_form.cljs:98
-msgid "nitrate.form.have-code"
-msgstr "¿Tienes un código de activación?"
+msgid "nitrate.form.subscribe-with-code"
+msgstr "Suscribete con un código de activación"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:86
 msgid "nitrate.form.see-plan"
 msgstr "Ver mi plan actual"
 
-#, unused
 msgid "nitrate.form.start-enterprise"
 msgstr "Empieza a utilizar Enterprise"
 
@@ -4356,12 +4409,15 @@ msgstr "Activo hasta el %s"
 
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:50
 msgid "nitrate.subscription.renew-success"
-msgstr "Tu suscripción de Nitrate se ha renovado."
+msgstr "Tu suscripción de Enterprise se ha renovado."
 
 #: src/app/main/ui/settings/subscription.cljs:584
 msgid "nitrate.subscription.settings.manual-cancel"
 msgstr "Cancelar subscripción"
 
+msgid "nitrate.subscription.settings.manual-contact-us"
+msgstr "Para cancelar tu suscripción a Enterprise, ponte en contacto con nosotros en:"
+
 #: src/app/main/ui/settings/subscription.cljs:103
 msgid "nitrate.subscription.settings.renew-with-code"
 msgstr "Renovar con código de activación"
@@ -4908,6 +4964,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Este token no existe o ha sido borrado."
 
@@ -4962,11 +5019,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editar"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Genérico"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Genérico"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5461,21 +5514,89 @@ msgid "shortcuts.start-editing"
 msgstr "Comenzar edición"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Comenzar medida"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Terminar medida"
+msgid "shortcuts.show-measure"
+msgstr "Mostrar medidas"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Activar miniaturas"
 
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.page"
+msgstr "Página de atajos"
+
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:491, src/app/main/ui/workspace/sidebar/shortcuts.cljs:498
 msgid "shortcuts.title"
 msgstr "Atajos de teclado"
 
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.reset"
+msgstr "Restablecer valor por defecto"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disable"
+msgstr "Deshabilitar atajo"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disabled-shortcut"
+msgstr "Atajo deshabilitado"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.overwritten-by"
+msgstr "Este atajo ha sido reasignado a %s"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-personalized"
+msgstr "Dirígete a TODO para personalizar tus atajos."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-disabled"
+msgstr "No hay atajos deshabilitados."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.reload-hint"
+msgstr "Después de editar un atajo, recarga cualquier pestaña de Penpot para aplicar los cambios."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.no-shortcuts"
+msgstr "No hay atajos que coincidan con tu búsqueda."
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.personalized"
+msgstr "Personalizados"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.disabled"
+msgstr "Deshabilitado"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.draw-arrow"
+msgstr "Flecha"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.draw-line"
+msgstr "Linea"
+
+#: src/app/main/ui/settings/shortcuts.cljs
+msgid "shortcuts.import-export"
+msgstr "Importar/Exportar"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.key-combo"
+msgstr "Pulsa la combinación de teclas deseada"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.conflict"
+msgstr "Combinación usada en \"%s\". Guardar este atajo hará que se elimine allí."
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.reset-pending"
+msgstr "Si guardas, este atajo volvera a su valor original:"
+
+#: src/app/main/ui/shortcuts.cljs
+msgid "shortcuts.edit-modal.success"
+msgstr "Esta combinación de teclas está disponible y puede asignarse sin conflictos."
+
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:185
 msgid "shortcuts.toggle-alignment"
 msgstr "Alternar alineación"
@@ -5488,6 +5609,10 @@ msgstr "Mostrar/ocultar recursos"
 msgid "shortcuts.toggle-colorpalette"
 msgstr "Mostrar/ocultar paleta de colores"
 
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs
+msgid "shortcuts.toggle-comments-visibility"
+msgstr "Activar/desactivar visibilidad de comentarios"
+
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:188
 msgid "shortcuts.toggle-focus-mode"
 msgstr "Mostrar/ocultar focus mode"
@@ -5584,8 +5709,44 @@ msgstr "Incrementar zoom a objetivo"
 msgid "shortcuts.zoom-selected"
 msgstr "Zoom a selección"
 
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs
+msgid "shortcuts.edit-on-settings"
+msgstr "Personalízalos en ajustes"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.modal-title"
+msgstr "Restaurar la configuración predeterminada"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.modal-text"
+msgstr "Los siguientes atajos de teclado se restaurarán a sus valores predeterminados."
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.acction"
+msgstr "Acción"
+
+#: src/app/main/ui/settings/restore_shortcuts_modal.cljs
+msgid "restore-shortcuts.restore"
+msgstr "Restaurar"
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.diff-modal-title"
+msgstr "Importar atajos"
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.diff-modal-text"
+msgstr "Los siguientes atajos se modificarán con la configuración importada."
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.no-changes"
+msgstr "No se encontraron diferencias entre los atajos actuales y los importados."
+
+#: src/app/main/ui/settings/import_shortcuts_diff_modal.cljs
+msgid "import-shortcuts.apply"
+msgstr "Aplicar"
+
 #: src/app/main/ui/dashboard/subscription.cljs:191
-msgid "subscription.banner.create-org-info"
+msgid "subscription.banner.create-organization-info"
 msgstr ""
 "Crea una organización y descubre exactamente cómo funciona Enterprise. "
 "Establece normas, gestiona tus equipos y disfruta de un nuevo nivel de "
@@ -5770,6 +5931,7 @@ msgid "subscription.error.nitrate.checkout-cancelled"
 msgstr "El pago no se completó. Inténtalo de nuevo cuando quieras."
 
 #: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
 msgid "subscription.error.nitrate.checkout-failed"
 msgstr ""
 "No hemos podido iniciar el proceso de pago. Inténtalo de nuevo. Si el "
@@ -5802,6 +5964,9 @@ msgstr "Todas las prestaciones del plan Professional y:"
 msgid "subscription.settings.benefits.all-unlimited-benefits"
 msgstr "Todas las prestaciones del plan Unlimited y:"
 
+msgid "subscription.settings.benefits.nitrate-unlimited-benefits"
+msgstr "Todas las ventajas del plan Unlimited, además de:"
+
 #: src/app/main/ui/settings/subscription.cljs:62
 msgid "subscription.settings.editors"
 msgstr "(x %s editores)"
@@ -5826,6 +5991,27 @@ msgstr "Factura mensual fija"
 msgid "subscription.settings.enterprise.unlimited-storage-benefit"
 msgstr "Almacenamiento ilimitado"
 
+msgid "subscription.settings.enterprise.nitrate.multi-organization-management"
+msgstr "Gestión multiorganización:"
+
+msgid "subscription.settings.enterprise.nitrate.support-team"
+msgstr "Compatibilidad con jerarquías de equipos complejas y suborganizaciones independientes."
+
+msgid "subscription.settings.enterprise.nitrate.enterprise-security"
+msgstr "Seguridad Enterprise:"
+
+msgid "subscription.settings.enterprise.nitrate.native-sso"
+msgstr "Compatibilidad nativa con SAML/SSO y registro completo de auditoría (Audit Trail) para informes de cumplimiento normativo."
+
+msgid "subscription.settings.enterprise.nitrate.advanced-control"
+msgstr "Control avanzado:"
+
+msgid "subscription.settings.enterprise.nitrate.plugin-whitelisting"
+msgstr "Lista blanca granular de complementos (plugins), incluido nuestro servidor MCP seguro y aislado para la conectividad con IA."
+
+msgid "subscription.settings.admin-console"
+msgstr "Admin Console"
+
 #: src/app/main/ui/dashboard/subscription.cljs:287, src/app/main/ui/settings/subscription.cljs:583, src/app/main/ui/settings/subscription.cljs:610, src/app/main/ui/settings/subscription.cljs:622, src/app/main/ui/settings/subscription.cljs:634, src/app/main/ui/settings/subscription.cljs:644
 msgid "subscription.settings.manage-your-subscription"
 msgstr "Gestionar tu suscripción"
@@ -5910,15 +6096,15 @@ msgstr "Más información"
 
 #: src/app/main/ui/settings/subscription.cljs:724
 msgid "subscription.settings.organization-member-month"
-msgstr "miembro organización por mes"
+msgstr "miembro organización / mes"
 
 #: src/app/main/ui/settings/subscription.cljs:665
 msgid "subscription.settings.other-plans"
 msgstr "Otros planes de penpot"
 
 #: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "editor por mes"
+msgid "subscription.settings.price-user-month"
+msgstr "usuario / mes"
 
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
@@ -5988,10 +6174,9 @@ msgstr "¡Gracias por elegir el plan %s de Penpot!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Eres %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Nos has estado apoyando con este plan desde: %s"
+#: src/app/main/ui/settings/subscription.cljs:679
+msgid "subscription.settings.subscribed-since"
+msgstr "Llevas en el plan %s desde %s."
 
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
@@ -8180,6 +8365,30 @@ msgstr "Color del trazo"
 msgid "workspace.options.stroke-width"
 msgstr "Ancho del trazo"
 
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-top"
+msgstr "Superior (block start)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-right"
+msgstr "Derecha (inline end)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-bottom"
+msgstr "Inferior (block end)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke-width-left"
+msgstr "Izquierda (inline start)"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke.per-side"
+msgstr "Trazo Por Lado"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs
+msgid "workspace.options.stroke.per-side-disabled"
+msgstr "Strokes per side feature is only available in the new render. Switch render to use it."
+
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:209
 msgid "workspace.options.stroke.add-stroke"
 msgstr "Añadir color de borde"
@@ -9779,4 +9988,4 @@ msgid "workspace.viewport.click-to-close-path"
 msgstr "Pulsar para cerrar la ruta"
 
 msgid "notifications.invitation-canceled"
-msgstr "Esta invitación ya no está disponible."
\ No newline at end of file
+msgstr "Esta invitación ya no está disponible."
diff --git a/frontend/translations/eu.po b/frontend/translations/eu.po
index 4b4b47d0fe..158f3828c2 100644
--- a/frontend/translations/eu.po
+++ b/frontend/translations/eu.po
@@ -2178,10 +2178,6 @@ msgstr "Ongi etorri Penpotera!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Taldeari izena eman ostean, pertsona gehiago gonbidatu ditzakezu."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Idatzi taldearen izena"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Gonbidatu kideak"
@@ -2294,11 +2290,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editatu"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Orokorra"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Orokorra"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -2757,14 +2749,6 @@ msgstr "Aktibatu sarea pixelera lerrokatzea"
 msgid "shortcuts.start-editing"
 msgstr "Hasi edizioa"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Hasi neurketa"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Amaitu neurketa"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Aktibatu iruditxoak"
diff --git a/frontend/translations/fa.po b/frontend/translations/fa.po
index 2ec56c1941..c66740052b 100644
--- a/frontend/translations/fa.po
+++ b/frontend/translations/fa.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-05-27 16:03+0000\n"
-"Last-Translator: Ahmad HosseinBor <123hozeifeh@gmail.com>\n"
-"Language-Team: Persian "
-"<https://hosted.weblate.org/projects/penpot/frontend/fa/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Persian <https://hosted.weblate.org/projects/penpot/frontend/"
+"fa/>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2026.6.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -1867,6 +1867,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "این توکن وجود ندارد یا حذف شده است."
 
diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po
index 78b9696558..b4a0420b71 100644
--- a/frontend/translations/fr.po
+++ b/frontend/translations/fr.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Unreal Vision <unrealvisionyt@gmail.com>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/penpot/frontend/fr/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/penpot/frontend/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -366,7 +366,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(copie)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Créer une organisation"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -3874,10 +3874,6 @@ msgstr ""
 "Après avoir nommé votre équipe, vous pourrez inviter des personnes à la "
 "rejoindre."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Entrez le nom de l'équipe"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Créer l'équipe"
@@ -4128,6 +4124,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Ce token n'existe pas ou a été supprimé."
 
@@ -4178,11 +4175,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Modifier"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Générique"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Générique"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4676,14 +4669,6 @@ msgstr "Aligner sur la grille de pixels"
 msgid "shortcuts.start-editing"
 msgstr "Commencer l'édition"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Commencer la mesure"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Arrêter la mesure"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Définir les vignettes"
@@ -5039,10 +5024,6 @@ msgstr "Plus d'informations"
 msgid "subscription.settings.other-plans"
 msgstr "Autres abonnements Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "éditeur par mois"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organisation par mois"
@@ -5101,11 +5082,6 @@ msgstr "Merci d'avoir choisi l'abonnement Penpot %s !"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Vous êtes %s !"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Vous nous soutenez avec cet abonnement depuis %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Essayez gratuitement pendant 14 jours"
@@ -8678,3 +8654,12 @@ msgstr "Les versions auto-enregistrées seront conservées %s jours."
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Cliquez pour fermer le chemin"
+
+#: src/app/main/ui/dashboard/import.cljs:509
+msgid "dashboard.import.import-error.corrupt-file"
+msgstr "Ce fichier semble endommagé."
+
+#: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
+msgid "dashboard.my-teams"
+msgstr "Mes équipes"
diff --git a/frontend/translations/fr_CA.po b/frontend/translations/fr_CA.po
index 720ad09a06..ea3a83ced8 100644
--- a/frontend/translations/fr_CA.po
+++ b/frontend/translations/fr_CA.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Alexis Morin <the.alexis.morin@gmail.com>\n"
-"Language-Team: French (Canada) "
-"<https://hosted.weblate.org/projects/penpot/frontend/fr_CA/>\n"
+"PO-Revision-Date: 2026-07-31 17:03+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: French (Canada) <https://hosted.weblate.org/projects/penpot/"
+"frontend/fr_CA/>\n"
 "Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -98,7 +98,7 @@ msgid "auth.new-password"
 msgstr "Nouveau mot de passe"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "Tu fais maintenant partie de %s"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -300,7 +300,7 @@ msgid "common.unpublish"
 msgstr "Dépublier"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "Tu ne fais plus partie de l'organisation %s."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -368,25 +368,25 @@ msgid "dashboard.change-email"
 msgstr "Changer l'adresse courriel"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "DÉPLACER L'ÉQUIPE"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Déplacer vers :"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Sélectionner une organisation"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "Les membres de l'équipe maintiendront l'accès aux projets et fichiers. "
 "L'équipe recevra les configurations de la nouvelle organisation."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Changer l'organisation de l'équipe"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -398,7 +398,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(copier)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Crée une nouvelle organisation"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -822,7 +822,7 @@ msgid "dashboard.invite-profile"
 msgstr "Inviter des gens"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Quitter l'organisation"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -876,6 +876,7 @@ msgid "dashboard.move-to-other-team"
 msgstr "Déplacer vers une autre équipe"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
 msgid "dashboard.my-teams"
 msgstr "Mes équipes"
 
@@ -900,7 +901,7 @@ msgid "dashboard.no-matches-for"
 msgstr "Aucun résultat de recherche pour « %s »"
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "Tu n'as pas la permission d'ajouter des équipes à tes organisations."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -970,7 +971,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Ordre par statut"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "L'organisation %s a été supprimée."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -1010,7 +1011,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Essayer le plugiciel : "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Créer une org"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1095,36 +1096,36 @@ msgid "dashboard.section.organizations"
 msgstr "Organisations"
 
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "AJOUTER À L'ORGANISATION"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Choisir une organisation :"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "« %s » ne permet qu'aux membres d'organisations de joindre ses équipes. Les "
 "invitations en attente à des gens externes à l'organisation seront "
 "révoquées."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Les invitations en attente à des usagers externes seront annulées."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Ici tu trouveras toutes les organisations auxquelles tu as le droit de "
 "créer ou ajouter des équipes."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Choisir une organisation :"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Ajouter une équipe à l'organisation"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1248,7 +1249,7 @@ msgid "dashboard.success-move-project"
 msgstr "Le projet a été déplacé avec succès"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "Cette équipe appartient maintenant à l'organisation %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1260,7 +1261,7 @@ msgid "dashboard.team-members"
 msgstr "Membres de l'équipe"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "Cette équipe n'appartient plus à l'organisation %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1272,7 +1273,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Ajouter à l'organisation"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr "Tu n'as pas le droit d'ajouter cette équipe à tes organisations."
 
 #: src/app/main/ui/dashboard/team.cljs:1632
@@ -1280,7 +1281,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Changer l'organisation de l'équipe"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr "Seules les personnes de ton organisation peuvent être invitées."
 
 #: src/app/main/ui/dashboard/team.cljs:1639
@@ -1346,7 +1347,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Penpot gratuit"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "Tu n'es plus membre de l'organisation %s"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1726,15 +1727,15 @@ msgid "errors.only-creator-can-unlock"
 msgstr "Seul le créateur de la version peut la déverrouiller"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr "Un problème est survenu en quittant l'organisation. Merci de réessayer."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "Le propriétaire de l'organisation ne peut pas la quitter."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "Cette organisation n'existe pas"
 
 #: src/app/main/ui/settings/password.cljs
@@ -3760,17 +3761,17 @@ msgid "modals.add-shared-confirm.message"
 msgstr "Ajouter « %s » comme bibliothèque partagée"
 
 #: src/app/main/data/nitrate.cljs:199
-msgid "modals.before-leave-org.message"
+msgid "modals.before-leave-organization.message"
 msgstr ""
 "Tu es le seul membre de certaines équipes. Ces équipes, ainsi que leurs "
 "projets et fichiers, seront supprimées."
 
 #: src/app/main/data/nitrate.cljs:198, src/app/main/ui/dashboard/change_owner.cljs:151
-msgid "modals.before-leave-org.title"
+msgid "modals.before-leave-organization.title"
 msgstr "AVANT DE QUITTER L'ORGANISATION"
 
 #: src/app/main/data/nitrate.cljs:202
-msgid "modals.before-leave-org.warning"
+msgid "modals.before-leave-organization.warning"
 msgstr "Toute équipe dont tu es le seul membre sera supprimée."
 
 #: src/app/main/ui/workspace/nudge.cljs:59
@@ -3830,22 +3831,22 @@ msgstr "Si tu supprimes ton compte, tu vas perdre tous tes projets et fichiers."
 
 #: src/app/main/ui/settings/delete_account.cljs
 #, unused
-msgid "modals.delete-account.info.with-orgs"
+msgid "modals.delete-account.info.with-organizations"
 msgstr ""
 "Cette action est irréversible. Ton compte, abonnement et organisations "
 "seront supprimés immédiatement. L'accès aux projets et fichiers courants "
 "sera perdu."
 
 #: src/app/main/ui/settings/delete_account.cljs:83
-msgid "modals.delete-account.owned-orgs.list-title"
+msgid "modals.delete-account.owned-organizations.list-title"
 msgstr "Organisations qui seront supprimées"
 
 #: src/app/main/ui/settings/delete_account.cljs:98
-msgid "modals.delete-account.owned-orgs.members-count"
+msgid "modals.delete-account.owned-organizations.members-count"
 msgstr "%s membres"
 
 #: src/app/main/ui/settings/delete_account.cljs:96
-msgid "modals.delete-account.owned-orgs.teams-count"
+msgid "modals.delete-account.owned-organizations.teams-count"
 msgstr "%s équipes"
 
 #: src/app/main/ui/settings/delete_account.cljs:64
@@ -3929,7 +3930,7 @@ msgid "modals.delete-font.title"
 msgstr "Suppression de la police"
 
 #: src/app/main/data/team.cljs:129
-msgid "modals.delete-org-team-confirm.message"
+msgid "modals.delete-organization-team-confirm.message"
 msgstr "Vraiment supprimer cette équipe qui fait partie de l'organisation %s?"
 
 #: src/app/main/ui/workspace/context_menu.cljs:707, src/app/main/ui/workspace/sidebar/sitemap.cljs:109
@@ -4077,7 +4078,7 @@ msgid "modals.invite-restricted-members.all-blocked-title"
 msgstr "Aucune invitation envoyée"
 
 #: src/app/main/data/team.cljs:162
-msgid "modals.invite-restricted-members.all-org-members-in-team"
+msgid "modals.invite-restricted-members.all-organization-members-in-team"
 msgstr ""
 "Seuls les membres de l'organisation « %s » peuvent être invités à cette "
 "équipe et ils sont tous déjà membres. Pour plus d'informations, contacter "
@@ -4164,35 +4165,35 @@ msgid "modals.leave-confirm.title"
 msgstr "Quitter l'équipe"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:158
-msgid "modals.leave-org-and-reassign.hint"
+msgid "modals.leave-organization-and-reassign.hint"
 msgstr ""
 "Tu es propriétaire de certaines équipes de cette organisation. Sélectionner "
 "un autre membre afin de les promouvoir au rôle de propriétaire."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:161
-msgid "modals.leave-org-and-reassign.hint-delete"
+msgid "modals.leave-organization-and-reassign.hint-delete"
 msgstr ""
 "Tu es membre unique de certaines équipes. Ces équipes ainsi que leurs "
 "projets et fichiers seront supprimés."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:163
-msgid "modals.leave-org-and-reassign.hint-promote"
+msgid "modals.leave-organization-and-reassign.hint-promote"
 msgstr ""
 "De plus, tu es propriétaire de certaines équipes de cette organisation. "
 "Sélectionner un autre membre afin de les promouvoir au rôle de propriétaire."
 
 #: src/app/main/data/nitrate.cljs:200, src/app/main/data/nitrate.cljs:209
-msgid "modals.leave-org-confirm.accept"
+msgid "modals.leave-organization-confirm.accept"
 msgstr "Quitter l'organisation"
 
 #: src/app/main/data/nitrate.cljs:208
-msgid "modals.leave-org-confirm.message"
+msgid "modals.leave-organization-confirm.message"
 msgstr ""
 "Tu perdras accès en permanence à toutes les équipes, leurs projets et "
 "fichiers."
 
 #: src/app/main/data/nitrate.cljs:207
-msgid "modals.leave-org-confirm.title"
+msgid "modals.leave-organization-confirm.title"
 msgstr "Quitter l'organisation %s?"
 
 #: src/app/main/ui/delete_shared.cljs:54
@@ -4267,21 +4268,21 @@ msgid "modals.remove-shared-confirm.message"
 msgstr "Retirer « %s » comme bibliothèque partagée"
 
 #: src/app/main/data/nitrate.cljs:256
-msgid "modals.remove-team-org.accept"
+msgid "modals.remove-team-organization.accept"
 msgstr "Retirer de l'organisation"
 
 #: src/app/main/data/nitrate.cljs:254
-msgid "modals.remove-team-org.info"
+msgid "modals.remove-team-organization.info"
 msgstr ""
 "Les projets et fichiers demeureront disponibles aux membres de l'équipe, "
 "mais les paramètres de l'organisation ne s'appliqueront plus."
 
 #: src/app/main/data/nitrate.cljs:253
-msgid "modals.remove-team-org.text"
+msgid "modals.remove-team-organization.text"
 msgstr "Vraiment retirer l'équipe « %s » de l'organisation « %s »?"
 
 #: src/app/main/data/nitrate.cljs:252
-msgid "modals.remove-team-org.title"
+msgid "modals.remove-team-organization.title"
 msgstr "RETIRER L'ÉQUIPE DE L'ORGANISATION"
 
 #: src/app/main/ui/workspace/nudge.cljs:52
@@ -4349,7 +4350,7 @@ msgid "nitrate.activation-success.active-until"
 msgstr "L'abonnement est actif jusqu'au %s."
 
 #: src/app/main/ui/dashboard/subscription.cljs:195, src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:68
-msgid "nitrate.activation-success.create-org"
+msgid "nitrate.activation-success.create-organization"
 msgstr "Créer une organisation"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
@@ -4357,19 +4358,12 @@ msgid "nitrate.activation-success.enjoy"
 msgstr "Profite de ton abonnement!"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
+#, fuzzy
 msgid "nitrate.activation-success.manage-info"
 msgstr ""
 "Gère ton abonnement en tout temps à partir de la page Abonnement dans les "
 "paramètres du compte."
 
-#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:53
-msgid "nitrate.activation-success.title"
-msgstr "Tu es Nitrate d'affaires!"
-
-#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:104
-msgid "nitrate.code-activation.footer"
-msgstr "Besoin d'un code? Contacte-nous :"
-
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
 msgid "nitrate.code-activation.input-label"
 msgstr "Saisis ton code d'activation"
@@ -4402,7 +4396,7 @@ msgstr ""
 "soit bien configuré."
 
 #, unused
-msgid "nitrate.contact-sales.downgrade-org-deleted"
+msgid "nitrate.contact-sales.downgrade-organization-deleted"
 msgstr "Ton organisation sera supprimée."
 
 #, unused
@@ -4460,19 +4454,16 @@ msgstr ""
 "organisation a besoin"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:54
+#, fuzzy
 msgid "nitrate.form.enterprise-intro"
 msgstr ""
-"Tout ce dont les équipes ont besoin pour travailler de manière sécuritaire "
-"à grande échelle :"
+"Tout ce dont les équipes ont besoin pour travailler de manière sécuritaire à "
+"grande échelle :"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
 msgid "nitrate.form.enterprise.price"
 msgstr "par membre par mois"
 
-#: src/app/main/ui/nitrate/nitrate_form.cljs:80, src/app/main/ui/nitrate/nitrate_form.cljs:98
-msgid "nitrate.form.have-code"
-msgstr "Tu as un code d'activation?"
-
 #: src/app/main/ui/nitrate/nitrate_form.cljs:86
 msgid "nitrate.form.see-plan"
 msgstr "Voir mon forfait actuel"
@@ -4766,10 +4757,6 @@ msgstr "Tu pourras envoyer des invitations plus tard"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Après avoir nommé ton équipe, tu pourras inviter des gens à la rejoindre."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Nom de l'équipe"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Créer l'équipe"
@@ -5022,6 +5009,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Ce token n'existe pas ou a été supprimé."
 
@@ -5076,11 +5064,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Édition"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Général"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Général"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5586,14 +5570,6 @@ msgstr "Accrochage à la grille pixel"
 msgid "shortcuts.start-editing"
 msgstr "Commencer l'édition"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Commencer à mesurer"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Arrêter de mesurer"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Définir l'imagette"
@@ -5711,7 +5687,7 @@ msgid "shortcuts.zoom-selected"
 msgstr "Zoomer à la sélection"
 
 #: src/app/main/ui/dashboard/subscription.cljs:191
-msgid "subscription.banner.create-org-info"
+msgid "subscription.banner.create-organization-info"
 msgstr ""
 "Crée une organisation et vois exactement comment fonctionne Enterprise. "
 "Établis les règles, gère les équipes et profite d'un nouveau niveau de "
@@ -5753,13 +5729,6 @@ msgstr "Illimité (Essai)"
 msgid "subscription.dashboard.banner.unlock-features"
 msgstr "Débloquer les fonctionnalités Enterprise"
 
-#: src/app/main/ui/dashboard/subscription.cljs:203
-msgid "subscription.dashboard.banner.unlock-features-description"
-msgstr ""
-"Établis des permissions détaillées et garantis la sécurité des opérations "
-"de design, sans compromettre la liberté du code source ouvert que ton "
-"équipe aime tant."
-
 #: src/app/main/ui/dashboard/subscription.cljs:208
 msgid "subscription.dashboard.banner.upgrade-nitrate"
 msgstr "Démarrer avec Enterprise"
@@ -5881,10 +5850,11 @@ msgid "subscription.error.nitrate.checkout-cancelled"
 msgstr "Le paiement ne s'est pas complété. Essayer de nouveau."
 
 #: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
 msgid "subscription.error.nitrate.checkout-failed"
 msgstr ""
-"Nous n'avons pas pu initier le processus de paiement. Essayer de nouveau. "
-"Si le problème persiste, contacte-nous : support@penpot.app."
+"Nous n'avons pas pu initier le processus de paiement. Essayer de nouveau. Si "
+"le problème persiste, contacte-nous : support@penpot.app."
 
 #: src/app/main/ui/settings/subscription.cljs:407
 msgid "subscription.error.nitrate.checkout-finish-failed"
@@ -6018,6 +5988,7 @@ msgid "subscription.settings.more-information"
 msgstr "En savoir plus"
 
 #: src/app/main/ui/settings/subscription.cljs:724
+#, fuzzy
 msgid "subscription.settings.organization-member-month"
 msgstr "membre d'organisation par mois"
 
@@ -6025,10 +5996,6 @@ msgstr "membre d'organisation par mois"
 msgid "subscription.settings.other-plans"
 msgstr "Autres forfaits Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "éditeur par mois"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organisation par mois"
@@ -6097,11 +6064,6 @@ msgstr "Merci d'avoir choisi le forfait Penpot %s!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Tu es %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Tu nous encourages avec ce forfait depuis : %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Essaye gratuitement pour 14 jours"
@@ -10042,3 +10004,79 @@ msgstr "Les versions auto-sauvegardées seront conservées pendant %s jours."
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Cliquer pour fermer le chemin"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "Vérifie ta boîte courriel!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "Nous avons envoyé un courriel de vérification à :"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:30, src/app/main/ui/inspect/styles/style_box.cljs:32, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:262, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:274
+msgid "labels.blur-effects"
+msgstr "Effets de flou"
+
+#: src/app/main/ui/onboarding/questions.cljs:226
+msgid "onboarding.questions.team-size.1001-5000"
+msgstr "1 001 à 5 000"
+
+#: src/app/main/ui/onboarding/questions.cljs:222
+msgid "onboarding.questions.team-size.101-500"
+msgstr "101 à 500"
+
+#: src/app/main/ui/onboarding/questions.cljs:220
+msgid "onboarding.questions.team-size.2-100"
+msgstr "2 à 100"
+
+#: src/app/main/ui/onboarding/questions.cljs:224
+msgid "onboarding.questions.team-size.501-1000"
+msgstr "501 à 1 000"
+
+#: src/app/main/ui/onboarding/questions.cljs:218
+msgid "onboarding.questions.team-size.just-me"
+msgstr "Seulement moi"
+
+#: src/app/main/ui/onboarding/questions.cljs:228
+msgid "onboarding.questions.team-size.more-than-5001"
+msgstr "5 001+"
+
+#: src/app/main/ui/dashboard/subscription.cljs:229
+msgid "subscription.dashboard.banner.renew"
+msgstr "Renouveler"
+
+#: src/app/main/ui/dashboard/subscription.cljs:216
+msgid "subscription.dashboard.banner.renew-subscription"
+msgstr "Renouveler l'abonnement"
+
+#: src/app/main/ui/dashboard/subscription.cljs:222
+msgid "subscription.dashboard.banner.subscription-expire-days"
+msgstr "Ton abonnement Enterprise expire dans %s jours (%s)"
+
+#: src/app/main/ui/dashboard/subscription.cljs:220
+msgid "subscription.dashboard.banner.subscription-expired"
+msgstr "Ton abonnement Enterprise a expiré. (%s)"
+
+#: src/app/main/ui/workspace/main_menu.cljs:421
+msgid "workspace.header.menu.hide-comments"
+msgstr "Masquer les commentaires"
+
+#, unused
+msgid "workspace.toast.comments-visible"
+msgstr "Commentaires visibles"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:65, src/app/main/ui/workspace/top_toolbar.cljs:66, src/app/main/ui/workspace/top_toolbar.cljs:77
+msgid "workspace.toolbar.mcp"
+msgstr "MCP"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:87
+msgid "workspace.toolbar.mcp-connect-here"
+msgstr "Se connecter ici"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:84
+msgid "workspace.toolbar.mcp-connected"
+msgstr "MCP connecté"
+
+#: src/app/main/ui/workspace/palette.cljs:166
+msgid "workspace.toolbar.palette-bar"
+msgstr "Barre de palettes"
diff --git a/frontend/translations/gl.po b/frontend/translations/gl.po
index fcca7a664a..bcba973c12 100644
--- a/frontend/translations/gl.po
+++ b/frontend/translations/gl.po
@@ -1145,11 +1145,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editar"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Xenérico"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Xenérico"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:64
diff --git a/frontend/translations/ha.po b/frontend/translations/ha.po
index ca57b49e82..c7c73e0c26 100644
--- a/frontend/translations/ha.po
+++ b/frontend/translations/ha.po
@@ -2277,10 +2277,6 @@ msgstr "barka da zuwa fenfot!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "bayan ka yi wa tawagarka suna, za ka iya gaiyato mutane ku hadu."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "sanya sunan tawaga"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "gayyato mambobi"
@@ -2436,11 +2432,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Tace"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "gamayya"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "gamayya"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -2903,14 +2895,6 @@ msgstr "yanke zuwa ga akwatin  pixel"
 msgid "shortcuts.start-editing"
 msgstr "fara gyarawa"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "fara aunawa"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "dena aunawa"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "saita babban yatsa"
diff --git a/frontend/translations/he.po b/frontend/translations/he.po
index 5e84585b67..e2d187e931 100644
--- a/frontend/translations/he.po
+++ b/frontend/translations/he.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew "
-"<https://hosted.weblate.org/projects/penpot/frontend/he/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/penpot/frontend/"
+"he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
 "n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -352,7 +352,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(עותק)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "יצירת ארגון חדש"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -564,7 +564,7 @@ msgstr "הורדת %s קבצים תקניים (‎.svg + .json)"
 #: src/app/main/ui/exports/files.cljs:132
 msgid "files-download-modal.description-1"
 msgstr ""
-"אחד או יותר מהקבצים שברצונך לייצא משתמשים בספריות משותפות. מה לעשות עם "
+"אחד או יותר מהקבצים שמיועדים להורדה משתמשים בספריות משותפות. מה לעשות עם "
 "המשאבים שלהן*?"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:267
@@ -2097,7 +2097,6 @@ msgid "inspect.tabs.styles.active-themes"
 msgstr "ערכות עיצוב פעילות"
 
 #: src/app/main/ui/inspect/styles/style_box.cljs:75
-#, fuzzy
 msgid "inspect.tabs.styles.copy-shorthand"
 msgstr "העתקת קיצור CSS ללוח הגזירים"
 
@@ -3777,10 +3776,6 @@ msgstr "אפשר להזמין בהמשך"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "לאחר מתן שם לצוות שלך, יתאפשר לך להזמין אנשים להצטרף."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "נא למלא את שם הצוות"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "ליצור צוות"
@@ -3929,7 +3924,7 @@ msgstr "מה גודל הצוות שלך?"
 
 #: src/app/main/ui/onboarding/questions.cljs:242
 msgid "onboarding.questions.step3.title"
-msgstr "נשמח לשמוע על העבודה שלך"
+msgstr "מה גודל החברה שלך?"
 
 #: src/app/main/ui/onboarding/questions.cljs:300
 msgid "onboarding.questions.step4.title"
@@ -4029,6 +4024,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "האסימון הזה לא קיים או שנמחק."
 
@@ -4079,11 +4075,7 @@ msgid "shortcut-subsection.edit"
 msgstr "עריכה"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "כללי"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "כללי"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4577,14 +4569,6 @@ msgstr "הצמדה לרשת פיקסלים"
 msgid "shortcuts.start-editing"
 msgstr "התחלת עריכה"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "התחלת מדידה"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "עצירת מדידה"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "הגדרת תמונות ממוזערות"
@@ -4926,10 +4910,6 @@ msgstr "פרטים נוספים"
 msgid "subscription.settings.other-plans"
 msgstr "תוכניות אחרות ב־Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "עורך לחודש"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "ארגון לחודש"
@@ -4982,11 +4962,6 @@ msgstr "תודה על הבחירה בתוכנית %s של Penpot!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "התוכנית שלך היא %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "תמכת בנו עם התוכנית הזאת מאז: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "להתנסות בחינם למשך 14 ימים"
@@ -7652,7 +7627,7 @@ msgstr "מסכות"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:566
 msgid "workspace.sidebar.layers.search"
-msgstr "חיפוש בשכבות"
+msgstr "איתור…"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:639, src/app/main/ui/workspace/sidebar/layers.cljs:733
 msgid "workspace.sidebar.layers.shapes"
@@ -7981,7 +7956,6 @@ msgid "workspace.tokens.num-active-sets"
 msgstr "%s סדרות פעילות"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "ערך מקורי: %s"
 
@@ -8024,7 +7998,6 @@ msgid "workspace.tokens.remapping-in-progress"
 msgstr "הפניות האסימון (token) ממופות מחדש…"
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
 msgstr "ערך פתור: %s"
 
@@ -8143,7 +8116,6 @@ msgid "workspace.tokens.themes-list"
 msgstr "רשימת ערכות עיצוב"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
 msgstr "תיאור"
 
@@ -8552,3 +8524,36 @@ msgstr "גרסאות שנשמרו אוטומטית תישמרנה למשך %s י
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "לחיצה תסגור את הנתיב"
+
+#: src/app/main/ui/ds/controls/utilities/token_field.cljs:48
+#, fuzzy
+msgid "ds.inputs.token-field.no-active-token-option"
+msgstr "{%s} לא נמצא באף סדרה פעילה או שהערך שלו שגוי."
+
+#: src/app/main/data/common.cljs:82
+msgid "notifications.by-code.upgrade-version"
+msgstr "יש גרסה חדשה."
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:273
+msgid "workspace.tokens.token-name-duplication-validation-error"
+msgstr "כבר קיים אסימון בנתיב: %s או בקידומת תואמת."
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "נא לבדוק את תיבת הדוא״ל שלך!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "שלחנו לך הודעת אימות אל:"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:376
+msgid "dashboard.go-to-admin-console"
+msgstr "מעבר למסוף הניהול"
+
+#: src/app/main/ui/dashboard/import.cljs:505
+msgid "dashboard.import.import-error.check-error"
+msgstr "לא הצלחנו לאמת את הקובץ הזה."
+
+#: src/app/main/ui/dashboard/import.cljs:509
+msgid "dashboard.import.import-error.corrupt-file"
+msgstr "נראה שהקובץ הזה פגום."
diff --git a/frontend/translations/hi.po b/frontend/translations/hi.po
index 29f6f44f30..ef5d449958 100644
--- a/frontend/translations/hi.po
+++ b/frontend/translations/hi.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: VKing9 <vaibhavrathod2282@gmail.com>\n"
-"Language-Team: Hindi "
-"<https://hosted.weblate.org/projects/penpot/frontend/hi/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Hindi <https://hosted.weblate.org/projects/penpot/frontend/"
+"hi/>\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -1915,9 +1915,8 @@ msgid "inspect.attributes.typography.text-decoration.none"
 msgstr "कोई नहीं"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:112
-#, fuzzy
 msgid "inspect.attributes.typography.text-decoration.strikethrough"
-msgstr " "
+msgstr ""
 
 #: src/app/main/ui/inspect/attributes/text.cljs:113
 msgid "inspect.attributes.typography.text-decoration.underline"
@@ -2048,7 +2047,6 @@ msgid "inspect.tabs.styles.active-themes"
 msgstr "सक्रिय थीम"
 
 #: src/app/main/ui/inspect/styles/style_box.cljs:75
-#, fuzzy
 msgid "inspect.tabs.styles.copy-shorthand"
 msgstr "CSS शॉर्टहैंड को क्लिपबोर्ड पर कॉपी करें"
 
@@ -3728,10 +3726,6 @@ msgstr ""
 "अपनी टीम का नाम रखने के बाद, आप लोगों को आमंत्रित कर सकेंगे शामिल होने के "
 "लिए।"
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "टीम का नाम दर्ज करें"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "टीम बनाएं"
@@ -3882,7 +3876,7 @@ msgstr "आपकी कंपनी कितनी बड़ी है?"
 
 #: src/app/main/ui/onboarding/questions.cljs:242
 msgid "onboarding.questions.step3.title"
-msgstr "हमें अपनी नौकरी के बारे में बताइये"
+msgstr "आपकी कंपनी का आकार क्या है?"
 
 #: src/app/main/ui/onboarding/questions.cljs:300
 msgid "onboarding.questions.step4.title"
@@ -3982,6 +3976,7 @@ msgid "onboarding.welcome.alt"
 msgstr "पेनपॉट"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "यह token मौजूद नहीं है या हटा दिया गया है।"
 
@@ -4032,11 +4027,7 @@ msgid "shortcut-subsection.edit"
 msgstr "संपादन"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "सार्वभौमिक"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "सार्वभौमिक"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4530,14 +4521,6 @@ msgstr "पिक्सेल ग्रिड से चिपकाएँ"
 msgid "shortcuts.start-editing"
 msgstr "संपादन शुरू करें"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "मापन शुरू करें"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "मापन बंद करें"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "थंबनेल सेट करें"
@@ -4884,10 +4867,6 @@ msgstr "अधिक जानकारी"
 msgid "subscription.settings.other-plans"
 msgstr "अन्य पेनपॉट योजनाएँ"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "प्रति माह संपादक"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "प्रति माह संगठन"
@@ -4942,11 +4921,6 @@ msgstr "पेनपोट %s योजना चुनने के लिए 
 msgid "subscription.settings.success.dialog.title"
 msgstr "आप %s हैं!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "आप इस योजना में हमारा समर्थन तब से कर रहे हैं: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "14 दिनों का मुफ्त परीक्षण करें"
@@ -7603,7 +7577,7 @@ msgstr "मास्क्स"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:566
 msgid "workspace.sidebar.layers.search"
-msgstr "परतें खोजें"
+msgstr "खोजो…"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:639, src/app/main/ui/workspace/sidebar/layers.cljs:733
 msgid "workspace.sidebar.layers.shapes"
@@ -7916,7 +7890,6 @@ msgid "workspace.tokens.num-active-sets"
 msgstr "%s सक्रिय सेट"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "मूल मान: %s"
 
@@ -7942,9 +7915,8 @@ msgid "workspace.tokens.reference-error"
 msgstr "संदर्भ त्रुटियाँ: "
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
-msgstr "हल किया गया मान: %s"
+msgstr "समाधानित मान: %s"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:248
 msgid "workspace.tokens.save-theme"
@@ -8054,9 +8026,8 @@ msgid "workspace.tokens.themes-list"
 msgstr "थीम्स सूची"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
-msgstr "वर्णन"
+msgstr "विवरण"
 
 #: src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:133, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:258
 msgid "workspace.tokens.token-font-family-select"
@@ -8455,3 +8426,38 @@ msgstr "स्वतः सहेजे गए संस्करण %s दि
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "पथ बंद करने के लिए क्लिक करें"
+
+#: src/app/main/ui/ds/controls/utilities/token_field.cljs:48
+#, fuzzy
+msgid "ds.inputs.token-field.no-active-token-option"
+msgstr "{%s} यह token किसी भी सक्रिय सेट में नहीं है या इसका मान अमान्य है।"
+
+#: src/app/main/data/common.cljs:82
+msgid "notifications.by-code.upgrade-version"
+msgstr "एक नया संस्करण उपलब्ध है ।"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:273
+msgid "workspace.tokens.token-name-duplication-validation-error"
+msgstr "पथ पर एक token पहले से मौजूद है: %s"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+#, fuzzy
+msgid "auth.check-email"
+msgstr "अपने ईमेल की जाँच करें!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "हमने इस पते पर एक वेरिफिकेशन ईमेल भेजा है:"
+
+#: src/app/main/ui/dashboard/deleted.cljs:330
+#, fuzzy
+msgid "dashboard.deleted.empty-state-description"
+msgstr "आपका ट्रैश खाली है। डिलीट की गई फ़ाइलें और प्रोजेक्ट यहाँ दिखाई देंगे।"
+
+#: src/app/main/data/dashboard.cljs:992, src/app/main/ui/dashboard/file_menu.cljs:202
+msgid "dashboard.errors.error-on-restore-file"
+msgstr "फ़ाइल %s को रिस्टोर करते समय एक त्रुटि हुई।"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:376
+msgid "dashboard.go-to-admin-console"
+msgstr "एडमिन कंसोल पर जाएं"
diff --git a/frontend/translations/hr.po b/frontend/translations/hr.po
index 8b46f9df1b..e18d2f3dc9 100644
--- a/frontend/translations/hr.po
+++ b/frontend/translations/hr.po
@@ -2946,10 +2946,6 @@ msgstr "Moći ćete pozvati kasnije"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Nakon što imenuješ svoj tim, moći ćeš pozvati ljude da se pridruže."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Unesi naziv tima"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Stvorite tim"
@@ -3246,11 +3242,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Uredi"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generičko"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generičko"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3725,14 +3717,6 @@ msgstr "Priključi na \"pixel grid\""
 msgid "shortcuts.start-editing"
 msgstr "Počni uređivanje"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Počni mjerenje"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Zaustavi mjerenje"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Postavi sličice"
diff --git a/frontend/translations/id.po b/frontend/translations/id.po
index de7f6baf49..4301c42c50 100644
--- a/frontend/translations/id.po
+++ b/frontend/translations/id.po
@@ -3165,10 +3165,6 @@ msgstr ""
 "Setelah memberi nama tim, Anda akan dapat mengundang orang-orang untuk "
 "bergabung."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Masukkan nama tim"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Buat tim"
@@ -3467,11 +3463,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Sunting"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generik"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generik"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3961,14 +3953,6 @@ msgstr "Tancap ke kisi piksel"
 msgid "shortcuts.start-editing"
 msgstr "Mulai menyunting"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Mulai mengukur"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Berhenti mengukur"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Tetapkan gambar kecil"
diff --git a/frontend/translations/ig.po b/frontend/translations/ig.po
index 55ec6126e7..d600e2b69d 100644
--- a/frontend/translations/ig.po
+++ b/frontend/translations/ig.po
@@ -1952,10 +1952,6 @@ msgstr "Nabata ite mkpịsị !"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "I nye ha otu gị aha , I nwere ike ị kpọta ndị mmadụ ka ha sonye."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Denye aha otu"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Kpọta ndị otu"
diff --git a/frontend/translations/it.po b/frontend/translations/it.po
index 227eb4e24f..c08cd05a21 100644
--- a/frontend/translations/it.po
+++ b/frontend/translations/it.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Jacopo Lodovico Trabia <jacopo.trabia@gmail.com>\n"
-"Language-Team: Italian "
-"<https://hosted.weblate.org/projects/penpot/frontend/it/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/penpot/frontend/"
+"it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -98,7 +98,7 @@ msgid "auth.new-password"
 msgstr "Inserisci una nuova password"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "Ora fai parte di %s"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -297,7 +297,7 @@ msgid "common.unpublish"
 msgstr "Rimuovi pubblicazione"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "Non fai più parte dell'organizzazione %s."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -365,25 +365,25 @@ msgid "dashboard.change-email"
 msgstr "Cambia indirizzo e-mail"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "SPOSTA TEAM"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Sposta in:"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Seleziona un'organizzazione"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "I progetti e i file rimarranno disponibili per i membri del team. Il team "
 "riceverà la configurazione dalla nuova organizzazione."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Cambia organizzazione del team"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -395,7 +395,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(copia)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Crea org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -820,7 +820,7 @@ msgid "dashboard.invite-profile"
 msgstr "Invita nel team"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Lascia org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -875,7 +875,7 @@ msgstr "Sposta in un altro team"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
 msgid "dashboard.my-teams"
-msgstr "I miei team"
+msgstr "I miei Team"
 
 #: src/app/main/ui/dashboard/files.cljs:106, src/app/main/ui/dashboard/projects.cljs:253, src/app/main/ui/dashboard/projects.cljs:254
 msgid "dashboard.new-file"
@@ -898,7 +898,7 @@ msgid "dashboard.no-matches-for"
 msgstr "Nessuna corrispondenza trovata per \"%s\""
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "Non hai i permessi per aggiungere team a nessuna delle tue organizzazioni."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -968,7 +968,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Ordina per stato"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "L'organizzazione %s è stata eliminata."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -1008,7 +1008,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Prova il plugin: "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Crea org"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1095,36 +1095,36 @@ msgid "dashboard.section.organizations"
 msgstr "Organizzazioni"
 
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "AGGIUNGI ALL'ORGANIZZAZIONE"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Scegli un'organizzazione:"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "\"%s\" autorizza solo i membri dell'organizzazione ad unirsi al suo team. "
 "Qualsiasi invito in sospeso a persone al di fuori dell'organizzazione verrà "
 "revocato."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Gli inviti in sospeso ad utenti esterni verranno annullati."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Qui trovi tutte le organizzazioni dove sei autorizzato a creare o "
 "aggiungere team."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Seleziona un'organizzazione"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Aggiungi team ad una organizzazione"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1248,7 +1248,7 @@ msgid "dashboard.success-move-project"
 msgstr "Il tuo progetto è stato spostato con successo"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "Questo team ora appartiene a %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1260,7 +1260,7 @@ msgid "dashboard.team-members"
 msgstr "Membri del team"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "Questo team non appartiene più all'organizzazione %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1272,7 +1272,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Aggiungi ad una organizzazione"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr ""
 "Non hai i permessi per aggiungere questo team a nessuna delle tue "
 "organizzazioni."
@@ -1282,7 +1282,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Cambia organizzazione del team"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr ""
 "Solo le persone all'interno della tua organizzazione possono essere "
 "invitate."
@@ -1350,7 +1350,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Penpot Gratis"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "Non sei più un membro dell'organizzazione %s"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1731,17 +1731,17 @@ msgid "errors.only-creator-can-unlock"
 msgstr "Solo il creatore della versione può sbloccarla"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr ""
 "Si è verificato un problema durante l'abbandono dell'organizzazione. "
 "Riprova."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "Il proprietario dell'organizzazione non può lasciare l'organizzazione."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "L'organizzazione non esiste"
 
 #: src/app/main/ui/settings/password.cljs
@@ -4282,10 +4282,6 @@ msgstr "Puoi inviare gli inviti più tardi"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Dopo aver nominato il tuo team, potrai invitare persone ad unirsi ad esso."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Inserisci il nome del team"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Crea team"
@@ -4538,6 +4534,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Questo token non esiste o è stato eliminato."
 
@@ -4588,11 +4585,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Modifica"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generico"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generico"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5086,14 +5079,6 @@ msgstr "Aggancia alla griglia pixel"
 msgid "shortcuts.start-editing"
 msgstr "Inizia a modificare"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Avvia misurazione"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Interrompi misurazione"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Imposta miniature"
@@ -5442,10 +5427,6 @@ msgstr "Ulteriori informazioni"
 msgid "subscription.settings.other-plans"
 msgstr "Altri piani Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "editor per mese"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organizzazione per mese"
@@ -5500,11 +5481,6 @@ msgstr "Grazie per aver scelto il piano Penpot %s!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Sei %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Ci stai supportando con questo piano dal %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Provalo gratuitamente per 14 giorni"
diff --git a/frontend/translations/ko.po b/frontend/translations/ko.po
index c2af51bf67..2b2a66523b 100644
--- a/frontend/translations/ko.po
+++ b/frontend/translations/ko.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: deveronica <deveronica42@gmail.com>\n"
-"Language-Team: Korean "
-"<https://hosted.weblate.org/projects/penpot/frontend/ko/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Korean <https://hosted.weblate.org/projects/penpot/frontend/"
+"ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -344,7 +344,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(복사)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "새 조직 생성"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -3560,10 +3560,6 @@ msgstr "나중에 초대할 수도 있습니다"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "팀 이름을 정한 후, 구성원들을 초대할 수 있습니다."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "팀 이름 입력"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "팀 생성"
@@ -3809,6 +3805,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "이 토큰은 존재하지 않거나 삭제되었습니다."
 
@@ -3859,11 +3856,7 @@ msgid "shortcut-subsection.edit"
 msgstr "편집"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "일반"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "일반"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4357,14 +4350,6 @@ msgstr "픽셀 그리드에 스냅"
 msgid "shortcuts.start-editing"
 msgstr "편집 시작"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "측정 시작"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "측정 중지"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "썸네일 설정"
@@ -4692,10 +4677,6 @@ msgstr "자세한 정보"
 msgid "subscription.settings.other-plans"
 msgstr "다른 Penpot 플랜"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "편집자당 월 비용"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "조직/월"
@@ -4740,11 +4721,6 @@ msgstr "계정 상세 정보의 '구독' 페이지에서 언제든지 구독 내
 msgid "subscription.settings.success.dialog.thanks"
 msgstr "Penpot %s 플랜을 선택해주셔서 감사합니다!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "이 플랜으로 저희를 지원해주신 날짜: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "14일 무료 체험"
diff --git a/frontend/translations/lv.po b/frontend/translations/lv.po
index 2e5e4baab6..73c22f7cfa 100644
--- a/frontend/translations/lv.po
+++ b/frontend/translations/lv.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv>\n"
-"Language-Team: Latvian "
-"<https://hosted.weblate.org/projects/penpot/frontend/lv/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Latvian <https://hosted.weblate.org/projects/penpot/frontend/"
+"lv/>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 "
-"<= 19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
+"19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -3480,10 +3480,6 @@ msgstr ""
 "Pēc komandas nosaukuma piešķiršanas varēs uzaicināt cilvēkus tai "
 "pievienoties."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Jāievada komandas nosaukums"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Izveidot komandu"
@@ -3736,6 +3732,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Šī tekstvienība nepastāv vai ir izdzēsta."
 
@@ -3786,11 +3783,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Labot"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Vispārējs"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Vispārējs"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4280,14 +4273,6 @@ msgstr "Pieķerties pikseļu režģim"
 msgid "shortcuts.start-editing"
 msgstr "Sākt labošanu"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Sākt mērīšanu"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Beigt mērīšanu"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Iestatīt sīktēlus"
@@ -4566,10 +4551,6 @@ msgstr "Vairāk informācijas"
 msgid "subscription.settings.other-plans"
 msgstr "Citi Penpot plāni"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "redaktors mēnesī"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "apvienība mēnesī"
@@ -4604,11 +4585,6 @@ msgstr "Izbaudi savu plānu!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Tu esi %s."
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Tu atbalsti mūs ar šo plānu kopš: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Izmēģini 14 dienas bez maksas"
diff --git a/frontend/translations/ml.po b/frontend/translations/ml.po
index be1766016e..34a6386c12 100644
--- a/frontend/translations/ml.po
+++ b/frontend/translations/ml.po
@@ -98,7 +98,7 @@ msgid "auth.new-password"
 msgstr "പുതിയൊരു പാസ്‌വേഡ് ചേർക്കുക"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "നിങ്ങളിപ്പോൾ %s-ന്റെ ഭാഗമാണ്"
 
 #: src/app/main/ui/auth/recovery.cljs:36
diff --git a/frontend/translations/ms.po b/frontend/translations/ms.po
index d15d2f2adc..59fa01549c 100644
--- a/frontend/translations/ms.po
+++ b/frontend/translations/ms.po
@@ -2373,10 +2373,6 @@ msgstr ""
 "Selepas menamakan pasukan anda, anda akan dapat menjemput orang untuk "
 "menyertai."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Masukkan nama pasukan"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Cipta pasukan"
@@ -2550,11 +2546,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Sunting"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generik"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generik"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
diff --git a/frontend/translations/nl.po b/frontend/translations/nl.po
index 087c65a440..2a8e94b56c 100644
--- a/frontend/translations/nl.po
+++ b/frontend/translations/nl.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Sebastiaan Pasma <sebastiaan@enkodo.nl>\n"
-"Language-Team: Dutch "
-"<https://hosted.weblate.org/projects/penpot/frontend/nl/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/penpot/frontend/"
+"nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -363,7 +363,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(kopie)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Nieuwe org aanmaken"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -589,7 +589,7 @@ msgstr "%s standaardbestanden downloaden (.svg + .json)"
 msgid "files-download-modal.description-1"
 msgstr ""
 "Een of meer bestanden die je wilt downloaden maken gebruik van gedeelde "
-"bibliotheken. Wat wil je doen met hun assets*?"
+"bibliotheken. Wat wil je doen met hun activa*?"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:267
 msgid "dashboard.file-menu.delete-files-permanently-option"
@@ -1323,8 +1323,8 @@ msgstr "Er is een fout opgetreden bij de opmerking"
 #: src/app/main/errors.cljs:414
 msgid "errors.deprecated"
 msgstr ""
-"Sorry! Dit is een oud bestand dat gebruikmaakt van een verouderd type "
-"Penpot-component en je niet kunt openen."
+"Sorry! Dit is een oud bestand dat gebruikmaakt van een verouderd type Penpot-"
+"activa en je niet kunt openen."
 
 #: src/app/main/errors.cljs:417
 msgid "errors.deprecated.contact.after"
@@ -1332,7 +1332,7 @@ msgstr "zodat wij je kunnen helpen."
 
 #: src/app/main/errors.cljs:415
 msgid "errors.deprecated.contact.before"
-msgstr "Hoewel Penpot dit soort componenten niet meer ondersteunt, kun je wel"
+msgstr "Hoewel Penpot dit soort activa niet meer ondersteunt, kun je wel"
 
 #: src/app/main/errors.cljs:416
 msgid "errors.deprecated.contact.text"
@@ -1848,21 +1848,21 @@ msgstr "Gedeelde bibliotheken exporteren"
 msgid "files-download-modal.options.detach.message"
 msgstr ""
 "Gedeelde bibliotheken worden niet opgenomen in de export en er worden geen "
-"assets aan de bibliotheek toegevoegd. "
+"activa aan de bibliotheek toegevoegd. "
 
 #: src/app/main/ui/exports/files.cljs:143
 msgid "files-download-modal.options.detach.title"
-msgstr "Gedeelde bibliotheek-assets als basisobjecten behandelen"
+msgstr "Gedeelde bibliotheek-activa als basisobjecten behandelen"
 
 #: src/app/main/ui/exports/files.cljs:144
 msgid "files-download-modal.options.merge.message"
 msgstr ""
-"Je bestand wordt geëxporteerd met alle externe assets samengevoegd in de "
+"Je bestand wordt geëxporteerd met alle externe activa samengevoegd in de "
 "bestandsbibliotheek."
 
 #: src/app/main/ui/exports/files.cljs:145
 msgid "files-download-modal.options.merge.title"
-msgstr "Inclusief gedeelde bibliotheek-assets in bestandsbibliotheken"
+msgstr "Inclusief gedeelde bibliotheek-activa in bestandsbibliotheken"
 
 #: src/app/main/ui/exports/files.cljs:123
 msgid "files-download-modal.title"
@@ -2173,7 +2173,6 @@ msgid "inspect.tabs.styles.active-themes"
 msgstr "Actieve thema's"
 
 #: src/app/main/ui/inspect/styles/style_box.cljs:75
-#, fuzzy
 msgid "inspect.tabs.styles.copy-shorthand"
 msgstr "CSS-code kopiëren naar klembord"
 
@@ -3021,7 +3020,7 @@ msgstr "Versie %s opmerkingen"
 
 #: src/app/main/ui/workspace/sidebar/sitemap.cljs:298
 msgid "labels.view-only"
-msgstr "ALLEEN BEKIJKEN"
+msgstr "Alleen weergeven"
 
 #: src/app/main/ui/dashboard/team.cljs:146, src/app/main/ui/dashboard/team.cljs:396, src/app/main/ui/dashboard/team.cljs:647, src/app/main/ui/dashboard/team.cljs:683, src/app/main/ui/onboarding/team_choice.cljs:69
 msgid "labels.viewer"
@@ -3088,7 +3087,7 @@ msgstr "Exporteren naar code"
 
 #: src/app/main/ui/ds/product/loader.cljs:29
 msgid "loader.tips.05.message"
-msgstr "Deel assets en stijlen om consistentie te behouden."
+msgstr "Activa en stijlen delen om consistentie te behouden."
 
 #: src/app/main/ui/ds/product/loader.cljs:28
 msgid "loader.tips.05.title"
@@ -3179,9 +3178,9 @@ msgstr "Solide"
 #: src/app/main/data/common.cljs:118
 msgid "modals.add-shared-confirm-empty.hint"
 msgstr ""
-"Je bibliotheek is leeg. Eenmaal toegevoegd als Gedeelde Bibliotheek, zijn "
-"de assets die je aanmaakt beschikbaar voor gebruik in de rest van je "
-"bestanden. Weet je zeker dat je dit wilt publiceren??"
+"Je bibliotheek is leeg. Eenmaal toegevoegd als Gedeelde Bibliotheek, zijn de "
+"activa die je aanmaakt beschikbaar voor gebruik in de rest van je bestanden. "
+"Weet je zeker dat je dit wilt publiceren??"
 
 #: src/app/main/data/common.cljs:120
 msgid "modals.add-shared-confirm.accept"
@@ -3190,9 +3189,8 @@ msgstr "Toevoegen als gedeelde bibliotheek"
 #: src/app/main/data/common.cljs:118
 msgid "modals.add-shared-confirm.hint"
 msgstr ""
-"Eenmaal toegevoegd als gedeelde bibliotheek, zijn de assets van deze "
-"bestandsbibliotheek beschikbaar voor gebruik tussen de rest van je "
-"bestanden."
+"Eenmaal toegevoegd als gedeelde bibliotheek, zijn de activa van deze "
+"bestandsbibliotheek beschikbaar voor gebruik tussen de rest van je bestanden."
 
 #: src/app/main/data/common.cljs:117
 msgid "modals.add-shared-confirm.message"
@@ -3405,10 +3403,10 @@ msgstr "Teamlid verwijderen"
 msgid "modals.delete-unpublish-shared-confirm.activated.hint"
 msgid_plural "modals.delete-unpublish-shared-confirm.activated.hint"
 msgstr[0] ""
-"Assets die al in dit bestand zijn gebruikt, blijven daar staan (er wordt "
+"Activa die al in dit bestand zijn gebruikt, blijven daar staan (er wordt "
 "geen ontwerp verbroken)."
 msgstr[1] ""
-"Assets die al in die bestanden zijn gebruikt, blijven daar staan (er wordt "
+"Activa die al in die bestanden zijn gebruikt, blijven daar staan (er wordt "
 "geen ontwerp verbroken)."
 
 #: src/app/main/ui/dashboard/team.cljs:1417
@@ -3880,10 +3878,6 @@ msgstr ""
 "Nadat je je team een naam hebt gegeven, kun je mensen uitnodigen om lid te "
 "worden."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Voer de naam van het team in"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Team aanmaken"
@@ -4036,7 +4030,7 @@ msgstr "Hoe groot is je bedrijf?"
 
 #: src/app/main/ui/onboarding/questions.cljs:242
 msgid "onboarding.questions.step3.title"
-msgstr "Vertel ons over je baan"
+msgstr "Wat is je bedrijfsgrootte?"
 
 #: src/app/main/ui/onboarding/questions.cljs:300
 msgid "onboarding.questions.step4.title"
@@ -4136,6 +4130,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Dit token bestaat niet of is verwijderd."
 
@@ -4186,11 +4181,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Bewerken"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Algemeen"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Algemeen"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4295,7 +4286,7 @@ msgstr "Aftrekken (Booleaans verschil)"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:87
 msgid "shortcuts.bool-exclude"
-msgstr "Uitsluiten"
+msgstr "Uitsluiting"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:88
 msgid "shortcuts.bool-intersection"
@@ -4684,14 +4675,6 @@ msgstr "Uitlijnen op pixelraster"
 msgid "shortcuts.start-editing"
 msgstr "Start met bewerken"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Meting starten"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Meting beëindigen"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Miniaturen instellen"
@@ -4706,7 +4689,7 @@ msgstr "Dynamisch uitlijnen in/uitschakelen"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:186
 msgid "shortcuts.toggle-assets"
-msgstr "Assets in/uitschakelen"
+msgstr "Activa wisselen"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:187
 msgid "shortcuts.toggle-colorpalette"
@@ -4818,7 +4801,7 @@ msgstr "Enterprise-abonnement (proef)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:88
 msgid "subscription.dashboard.power-up.professional.bottom-button"
-msgstr "Gas geven!"
+msgstr "Tandje erbij!"
 
 #: src/app/main/ui/dashboard/subscription.cljs:87
 msgid "subscription.dashboard.power-up.professional.bottom-description"
@@ -4842,7 +4825,7 @@ msgstr ""
 
 #: src/app/main/ui/dashboard/subscription.cljs:97
 msgid "subscription.dashboard.power-up.trial.top-title"
-msgstr "Unlimited-abonnement (proefversie)"
+msgstr "Unlimited-abonnement (proef)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:104, src/app/main/ui/dashboard/subscription.cljs:298
 msgid "subscription.dashboard.power-up.unlimited-plan"
@@ -4875,7 +4858,7 @@ msgstr "Jouw abonnement:"
 #: src/app/main/ui/dashboard/subscription.cljs:333
 msgid "subscription.dashboard.professional-dashboard-cta-title"
 msgstr ""
-"Je hebt %s-editors voor de teams in jouw beheer, terwijl jouw professionele "
+"Je hebt %s-editors voor de teams in jouw beheer, terwijl jouw Professional-"
 "abonnement maximaal 8 toestaat."
 
 #: src/app/main/ui/dashboard/subscription.cljs:341
@@ -5038,17 +5021,13 @@ msgstr "Meer informatie"
 msgid "subscription.settings.other-plans"
 msgstr "Overige Penpot-abonnementen"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "editor per maand"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organisatie per maand"
 
 #: src/app/main/ui/dashboard/subscription.cljs:277, src/app/main/ui/settings/subscription.cljs:114, src/app/main/ui/settings/subscription.cljs:591, src/app/main/ui/settings/subscription.cljs:667
 msgid "subscription.settings.professional"
-msgstr "Professioneel"
+msgstr "Professional"
 
 #: src/app/main/ui/settings/subscription.cljs:596, src/app/main/ui/settings/subscription.cljs:674
 msgid "subscription.settings.professional.autosave-benefit"
@@ -5068,7 +5047,7 @@ msgstr "Aanbevolen"
 
 #: src/app/main/ui/settings/subscription.cljs:569
 msgid "subscription.settings.section-plan"
-msgstr "Uw abonnement"
+msgstr "Jouw abonnement"
 
 #: src/app/main/ui/settings/subscription.cljs:343
 msgid "subscription.settings.start-trial"
@@ -5096,11 +5075,6 @@ msgstr "Bedankt voor het kiezen van het Penpot %s-abonnement!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Je bent %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Je hebt ons gesteund met dit abonnement sinds: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Probeer het 14 dagen gratis"
@@ -5338,11 +5312,11 @@ msgstr "Bibliotheek toevoegen"
 #: src/app/main/ui/workspace/sidebar/assets.cljs
 #, unused
 msgid "workspace.assets.assets"
-msgstr "Assets"
+msgstr "Activa"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs:158
 msgid "workspace.assets.box-filter-all"
-msgstr "Alle assets"
+msgstr "Alle activa"
 
 #: src/app/main/ui/dashboard/grid.cljs:160, src/app/main/ui/dashboard/grid.cljs:192, src/app/main/ui/workspace/colorpicker/libraries.cljs:362, src/app/main/ui/workspace/colorpicker/libraries.cljs:379, src/app/main/ui/workspace/colorpicker/libraries.cljs:393, src/app/main/ui/workspace/sidebar/assets/colors.cljs:512, src/app/main/ui/workspace/sidebar/assets.cljs:164
 msgid "workspace.assets.colors"
@@ -5427,7 +5401,7 @@ msgstr "Bibliotheek beheren"
 
 #: src/app/main/ui/workspace/color_palette.cljs:204, src/app/main/ui/workspace/sidebar/assets/file_library.cljs:305
 msgid "workspace.assets.not-found"
-msgstr "Geen assets gevonden"
+msgstr "Geen activa gevonden"
 
 #: src/app/main/ui/workspace/sidebar/assets/file_library.cljs:111
 msgid "workspace.assets.open-library"
@@ -5443,7 +5417,7 @@ msgstr "Groep hernoemen"
 
 #: src/app/main/ui/workspace/color_palette.cljs:182, src/app/main/ui/workspace/color_palette.cljs:187, src/app/main/ui/workspace/sidebar/assets.cljs:192
 msgid "workspace.assets.search"
-msgstr "Assets zoeken"
+msgstr "Activa zoeken"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs
 #, unused
@@ -5699,7 +5673,7 @@ msgstr "Hulp & informatie"
 #: src/app/main/ui/workspace/main_menu.cljs:916
 #, unused
 msgid "workspace.header.menu.option.power-up"
-msgstr "Geef je abonnement een tandje erbij"
+msgstr "Tandje erbij voor je abonnement"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1061
 msgid "workspace.header.menu.option.preferences"
@@ -6088,7 +6062,7 @@ msgstr "Component uitwisselen"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:818
 msgid "workspace.options.component.swap.empty"
-msgstr "Er zijn nog geen assets in deze bibliotheek"
+msgstr "Er zijn nog geen activa in deze bibliotheek"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1062
 msgid "workspace.options.component.unlinked"
@@ -7399,11 +7373,11 @@ msgstr ""
 
 #: src/app/main/ui/workspace/plugins.cljs:277
 msgid "workspace.plugins.permissions.library-read"
-msgstr "Jouw bibliotheken en middelen bekijken."
+msgstr "Jouw bibliotheken en activa bekijken."
 
 #: src/app/main/ui/workspace/plugins.cljs:271
 msgid "workspace.plugins.permissions.library-write"
-msgstr "Jouw bibliotheken en middelen lezen en aanpassen."
+msgstr "Jouw bibliotheken en activa lezen en aanpassen."
 
 #: src/app/main/ui/workspace/plugins.cljs:359
 msgid "workspace.plugins.permissions.title"
@@ -7615,7 +7589,7 @@ msgstr "Gebruikersinterface tonen/verbergen"
 
 #: src/app/main/ui/workspace/context_menu.cljs:466, src/app/main/ui/workspace/sidebar/options/menus/bool.cljs:95
 msgid "workspace.shape.menu.intersection"
-msgstr "Kruispunt"
+msgstr "Doorsnede"
 
 #: src/app/main/ui/workspace/context_menu.cljs:500, src/app/main/ui/workspace/sidebar/layer_item.cljs:198, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:271, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:324
 msgid "workspace.shape.menu.lock"
@@ -7683,7 +7657,7 @@ msgstr "Tonen"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:559, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1213
 msgid "workspace.shape.menu.show-in-assets"
-msgstr "In paneel Assets tonen"
+msgstr "In paneel Activa tonen"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:580, src/app/main/ui/workspace/sidebar/assets/components.cljs:659
 msgid "workspace.shape.menu.show-main"
@@ -7769,7 +7743,7 @@ msgstr "Maskers"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:566
 msgid "workspace.sidebar.layers.search"
-msgstr "Lagen doorzoeken"
+msgstr "Zoeken…"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:639, src/app/main/ui/workspace/sidebar/layers.cljs:733
 msgid "workspace.sidebar.layers.shapes"
@@ -8108,7 +8082,6 @@ msgid "workspace.tokens.num-active-sets"
 msgstr "%s actieve verzamelingen"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "Oorspronkelijke waarde: %s"
 
@@ -8151,7 +8124,6 @@ msgid "workspace.tokens.remapping-in-progress"
 msgstr "Token-referenties opnieuw toewijzen…"
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
 msgstr "Opgeloste waarde: %s"
 
@@ -8282,7 +8254,6 @@ msgid "workspace.tokens.themes-list"
 msgstr "Lijst met thema's"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
 msgstr "Beschrijving"
 
@@ -8364,7 +8335,7 @@ msgstr ""
 
 #: src/app/main/ui/workspace/sidebar.cljs:159, src/app/main/ui/workspace/sidebar.cljs:166
 msgid "workspace.toolbar.assets"
-msgstr "Assets"
+msgstr "Activa"
 
 #: src/app/main/ui/workspace/palette.cljs:182, src/app/main/ui/workspace/palette.cljs:183
 msgid "workspace.toolbar.color-palette"
@@ -8463,7 +8434,7 @@ msgstr "cirkels"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:113
 msgid "workspace.undo.entry.multiple.color"
-msgstr "kleur assets"
+msgstr "kleurenactiva"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:114
 msgid "workspace.undo.entry.multiple.component"
@@ -8483,7 +8454,7 @@ msgstr "groepen"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:118
 msgid "workspace.undo.entry.multiple.media"
-msgstr "grafische assets"
+msgstr "grafische activa"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:119
 msgid "workspace.undo.entry.multiple.multiple"
@@ -8511,7 +8482,7 @@ msgstr "teksten"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:125
 msgid "workspace.undo.entry.multiple.typography"
-msgstr "typografie-assets"
+msgstr "typografische activa"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:146
 msgid "workspace.undo.entry.new"
@@ -8696,3 +8667,1251 @@ msgstr "Automatisch opgeslagen versies worden %s dagen bewaard."
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Klik om het pad te sluiten"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "Controleer je e-mail!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "We hebben een verificatie-e-mail gestuurd naar:"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:376
+msgid "dashboard.go-to-admin-console"
+msgstr "Ga naar het Beheerderspaneel"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:59
+msgid "nitrate.form.enterprise-feature-2"
+msgstr ""
+"Gecentraliseerde controle over wie wat doet en waar, vanuit een speciaal "
+"beheerderspaneel"
+
+#: src/app/main/ui/dashboard/import.cljs:505
+msgid "dashboard.import.import-error.check-error"
+msgstr "We konden dit bestand niet verifiëren."
+
+#: src/app/main/ui/dashboard/import.cljs:509
+msgid "dashboard.import.import-error.corrupt-file"
+msgstr "Dit bestand lijkt beschadigd te zijn."
+
+#: src/app/main/ui/dashboard/import.cljs:512
+msgid "dashboard.import.import-error.unknown-error"
+msgstr "Er ging iets mis bij de verwerking van dit bestand."
+
+#: src/app/main/ui/dashboard/team.cljs:831, src/app/main/ui/dashboard/team.cljs:1136
+msgid "dashboard.invitations.no-permission"
+msgstr ""
+"Je hebt geen toestemming om mensen uit te nodigen om zich bij dit team aan "
+"te sluiten of om uitnodigingen te bewerken of te verwijderen."
+
+#: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
+msgid "dashboard.my-teams"
+msgstr "Mijn teams"
+
+#: src/app/main/ui/dashboard/team_form.cljs:152
+msgid "dashboard.no-permission-create-team.message"
+msgstr ""
+"Je mag geen teams aanmaken binnen organisatie %s. Neem voor meer informatie "
+"contact op met de eigenaar van de organisatie."
+
+#: src/app/main/ui/dashboard/team_form.cljs:154
+msgid "dashboard.no-permission-delete-team.message"
+msgstr ""
+"Je mag geen teams verwijderen die deel uitmaken van organisatie %s. Neem "
+"voor meer informatie contact op met de eigenaar van de organisatie."
+
+#: src/app/main/ui/dashboard/team_form.cljs:158
+msgid "dashboard.no-permission-move-team.message"
+msgstr ""
+"Je mag geen teams verplaatsen die deel uitmaken van organisatie %s. Neem "
+"voor meer informatie contact op met de eigenaar van de organisatie."
+
+#: src/app/main/ui/dashboard/sidebar.cljs:354
+msgid "dashboard.section.organizations"
+msgstr "Organizaties"
+
+#: src/app/main/ui/dashboard/team.cljs:1609
+msgid "dashboard.team-organization"
+msgstr "Teamorganisatie"
+
+#: src/app/main/ui/dashboard/team.cljs:1643
+msgid "dashboard.team-organization.add"
+msgstr "Toevoegen aan een organisatie"
+
+#: src/app/main/ui/dashboard/team.cljs:1632
+msgid "dashboard.team-organization.change"
+msgstr "Teamorganisatie wijzigen"
+
+#: src/app/main/ui/dashboard/team.cljs:1639
+msgid "dashboard.team-organization.none"
+msgstr "Dit team maakt geen deel uit van een organisatie"
+
+#: src/app/main/ui/dashboard/team.cljs:1635
+msgid "dashboard.team-organization.remove"
+msgstr "Team uit organisatie verwijderen"
+
+#: src/app/main/ui/settings/options.cljs:109
+msgid "dashboard.webgl-switch.beta"
+msgstr "Beta"
+
+#: src/app/main/ui/settings/options.cljs:110
+msgid "dashboard.webgl-switch.description"
+msgstr ""
+"WebGL-weergave kan de prestaties verbeteren, maar bevindt zich in bèta en is "
+"mogelijk minder stabiel. Er kunnen enkele visuele verschillen optreden "
+"tussen het doek, de export (SVG/PDF) en de weergavemodus."
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.disabled"
+msgstr "Uitgeschakeld"
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.enabled"
+msgstr "Ingeschakeld"
+
+#: src/app/main/ui/settings/options.cljs:116
+msgid "dashboard.webgl-switch.feedback"
+msgstr "Geef feedback"
+
+#: src/app/main/ui/settings/options.cljs:112
+msgid "dashboard.webgl-switch.status"
+msgstr "Status"
+
+#: src/app/main/ui/settings/options.cljs:108
+msgid "dashboard.webgl-switch.title"
+msgstr "WebGL-weergave"
+
+#: src/app/main/data/workspace/clipboard.cljs:327, src/app/main/data/workspace/clipboard.cljs:535
+msgid "errors.clipboard-api-unavailable"
+msgstr ""
+"Klembord-API is niet beschikbaar. Serveer Penpot via HTTPS om toegang tot "
+"het klembord mogelijk te maken"
+
+#: src/app/main/data/workspace/clipboard.cljs:321, src/app/main/data/workspace/clipboard.cljs:529
+msgid "errors.clipboard-permission-denied"
+msgstr ""
+"Toegang klembord geweigerd. Verleen klembordrechten aan uw browser om inhoud "
+"te plakken"
+
+#: src/app/main/ui/dashboard/fonts.cljs:341
+msgid "errors.font-family-invalid-chars"
+msgstr ""
+"De familienaam van het lettertype kan alleen letters, cijfers, spaties, "
+"koppeltekens, onderstrepingstekens en punten bevatten."
+
+#: src/app/main/data/workspace/tokens/errors.cljs:49
+msgid "errors.tokens.circular-reference"
+msgstr "Token heeft een cirkelreferentie"
+
+#: src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:350, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:436
+msgid "errors.tokens.empty-field"
+msgstr "Dit veld mag niet leeg zijn"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:67, src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs:126
+msgid "errors.tokens.name-collision"
+msgstr ""
+"Groepsnaam van %s is in conflict met een token met dezelfde naam in een "
+"andere actieve set."
+
+#: src/app/main/ui/settings/integrations.cljs:629
+msgid "integrations.access-tokens.create"
+msgstr "Nieuw toegangstoken aanmaken"
+
+#: src/app/main/ui/settings/integrations.cljs:645
+msgid "integrations.access-tokens.empty.add-one"
+msgstr ""
+"Druk op de knop \"Nieuw toegangstoken aanmaken\" om er een te genereren."
+
+#: src/app/main/ui/settings/integrations.cljs:644
+msgid "integrations.access-tokens.empty.no-access-tokens"
+msgstr "Je hebt tot nu toe geen tokens."
+
+#: src/app/main/ui/static.cljs:89
+msgid "errors.invite-email-mismatch"
+msgstr ""
+"Deze uitnodiging is voor een ander e-mailadres. Meld je opnieuw aan met het "
+"uitgenodigde account, of vraag de teameigenaar om een nieuwe uitnodiging."
+
+#: src/app/main/ui/static.cljs:93
+msgid "errors.invite-expired"
+msgstr ""
+"Deze uitnodiging is verlopen. Vraag de teameigenaar om een nieuwe te sturen."
+
+#: common/src/app/common/types/team.cljc:26
+#, unused
+msgid "errors.team-name-invalid-chars"
+msgstr "De teamnaam kan geen van de volgende tekens bevatten: '.', ':' of '/'"
+
+#: src/app/main/data/media.cljs:74
+#, unused
+msgid "errors.token-theme-not-existing-sets"
+msgstr "Het thema verwijst naar enkele niet bestaande sets: %s"
+
+#: src/app/main/ui/settings/integrations.cljs:619
+msgid "integrations.access-tokens.personal"
+msgstr "Persoonlijke toegangstokens"
+
+#: src/app/main/ui/settings/integrations.cljs:624
+msgid "integrations.access-tokens.personal.description"
+msgstr ""
+"Persoonlijke toegangstokens functioneren als een alternatief voor ons inlog-/"
+"wachtwoordauthenticatiesysteem en kunnen worden gebruikt om een applicatie "
+"toegang te geven tot de interne Penpot API"
+
+#: src/app/main/ui/settings/integrations.cljs:68
+msgid "integrations.copy-to-clipboard"
+msgstr "Kopiëren naar klembord"
+
+#: src/app/main/ui/settings/integrations.cljs:266
+msgid "integrations.create-access-token.title"
+msgstr "Toegangstoken aanmaken"
+
+#: src/app/main/ui/settings/integrations.cljs:265
+msgid "integrations.create-access-token.title.created"
+msgstr "Toegangstoken aangemaakt"
+
+#: src/app/main/ui/settings/integrations.cljs:384
+msgid "integrations.delete-token.accept"
+msgstr "Token verwijderen"
+
+#: src/app/main/ui/settings/integrations.cljs:383
+msgid "integrations.delete-token.message"
+msgstr "Weet je zeker dat je dit token wilt verwijderen?"
+
+#: src/app/main/ui/settings/integrations.cljs:382
+msgid "integrations.delete-token.title"
+msgstr "Token verwijderen"
+
+#: src/app/main/ui/settings/integrations.cljs:226
+msgid "integrations.expiration-180-days"
+msgstr "180 dagen"
+
+#: src/app/main/ui/settings/integrations.cljs:223
+msgid "integrations.expiration-30-days"
+msgstr "30 dagen"
+
+#: src/app/main/ui/settings/integrations.cljs:224
+msgid "integrations.expiration-60-days"
+msgstr "60 dagen"
+
+#: src/app/main/ui/settings/integrations.cljs:225
+msgid "integrations.expiration-90-days"
+msgstr "90 dagen"
+
+#: src/app/main/ui/settings/integrations.cljs:221
+msgid "integrations.expiration-date.label"
+msgstr "Vervaldatum"
+
+#: src/app/main/ui/settings/integrations.cljs:222
+msgid "integrations.expiration-never"
+msgstr "Nooit"
+
+#: src/app/main/ui/settings/integrations.cljs:406
+msgid "integrations.expired-on"
+msgstr "Vervallen op %s"
+
+#: src/app/main/ui/settings/integrations.cljs:407
+msgid "integrations.expires-on"
+msgstr "Vervalt op %s"
+
+#: src/app/main/ui/settings/integrations.cljs:307
+msgid "integrations.generate-mcp-key.title"
+msgstr "MCP-sleutel genereren"
+
+#: src/app/main/ui/settings/integrations.cljs:305
+msgid "integrations.generate-mcp-key.title.created"
+msgstr "MCP-sleutel gegenereerd"
+
+#: src/app/main/ui/settings/integrations.cljs:124
+msgid "integrations.info.mcp-client-config"
+msgstr "Voeg deze configuratie toe aan je MCP-client (bijv. ~/ .mcp.json)."
+
+#: src/app/main/ui/settings/integrations.cljs:206
+msgid "integrations.info.mcp-server"
+msgstr ""
+"Met de Penpot MCP-server kunnen MCP-clients rechtstreeks communiceren met "
+"Penpot-ontwerpbestanden."
+
+#: src/app/main/ui/settings/integrations.cljs:113
+msgid "integrations.mcp-key.will-expire"
+msgstr "De MCP-sleutel vervalt op %s"
+
+#: src/app/main/ui/settings/integrations.cljs:116
+msgid "integrations.mcp-key.will-not-expire"
+msgstr "De MCP-sleutel heeft geen vervaldatum"
+
+#: src/app/main/ui/settings/integrations.cljs:511
+msgid "integrations.mcp-server.description"
+msgstr ""
+"Met de Penpot MCP-server kunnen MCP-clients rechtstreeks communiceren met "
+"Penpot-ontwerpbestanden."
+
+#: src/app/main/ui/settings/integrations.cljs:415
+#, unused
+msgid "integrations.mcp-server.mcp-keys.copy"
+msgstr "Link kopiëren"
+
+#: src/app/main/ui/settings/integrations.cljs:594
+msgid "integrations.mcp-server.mcp-keys.help"
+msgstr "De configuratie van MCP-clients"
+
+#: src/app/main/ui/settings/integrations.cljs:581
+msgid "integrations.mcp-server.mcp-keys.info"
+msgstr ""
+"Dit is de server-URL die je nodig hebt om je MCP-client te configureren voor "
+"de verbinding met de Penpot MCP-server."
+
+#: src/app/main/ui/settings/integrations.cljs:561
+msgid "integrations.mcp-server.mcp-keys.regenerate"
+msgstr "MCP-sleutel opnieuw genereren"
+
+#: src/app/main/ui/settings/integrations.cljs:554
+msgid "integrations.mcp-server.mcp-keys.title"
+msgstr "MCP-sleutel"
+
+#: src/app/main/ui/settings/integrations.cljs:562
+msgid "integrations.mcp-server.mcp-keys.tootip"
+msgstr "De MCP-sleutel is nodig voor het instellen van de MCP-client"
+
+#: src/app/main/ui/settings/integrations.cljs:517
+msgid "integrations.mcp-server.status"
+msgstr "Status"
+
+#: src/app/main/ui/settings/integrations.cljs:537
+msgid "integrations.mcp-server.status.disabled"
+msgstr "Uitgeschakeld"
+
+#: src/app/main/ui/settings/integrations.cljs:536
+msgid "integrations.mcp-server.status.enabled"
+msgstr "Ingeschakeld"
+
+#: src/app/main/ui/settings/integrations.cljs:527
+msgid "integrations.mcp-server.status.expired.0"
+msgstr ""
+"De MCP-sleutel voor de verbinding met de MCP-server is verlopen. Hierdoor "
+"kan de verbinding niet tot stand worden gebracht."
+
+#: src/app/main/ui/settings/integrations.cljs:532
+msgid "integrations.mcp-server.status.expired.1"
+msgstr ""
+"Genereer de MCP-sleutel opnieuw en pas je clientconfiguratie aan met de "
+"nieuwe sleutel."
+
+#: src/app/main/ui/settings/integrations.cljs:502
+msgid "integrations.mcp-server.title"
+msgstr "MCP-server"
+
+#: src/app/main/ui/settings/integrations.cljs:506
+msgid "integrations.mcp-server.title.beta"
+msgstr "Bèta"
+
+#: src/app/main/ui/settings/integrations.cljs:213
+msgid "integrations.name.label"
+msgstr "Naam"
+
+#: src/app/main/ui/settings/integrations.cljs:214
+msgid "integrations.name.placeholder"
+msgstr "De naam kan helpen om te weten waar het token voor is"
+
+#: src/app/main/ui/settings/integrations.cljs:405
+msgid "integrations.no-expiration"
+msgstr "Geen vervaldatum"
+
+#: src/app/main/ui/settings/integrations.cljs:491
+msgid "integrations.notification.success.copied-link"
+msgstr "Link gekopieerd naar klembord"
+
+#: src/app/main/ui/settings/integrations.cljs:254, src/app/main/ui/settings/integrations.cljs:287, src/app/main/ui/settings/integrations.cljs:332
+msgid "integrations.notification.success.created"
+msgstr "Token met succes aangemaakt"
+
+#: src/app/main/ui/settings/integrations.cljs:86
+msgid "integrations.notification.success.mcp-key-copied"
+msgstr "MCP-sleutel gekopieerd"
+
+#: src/app/main/ui/settings/integrations.cljs:457
+msgid "integrations.notification.success.mcp-server-disabled"
+msgstr "MCP-server uitgeschakeld"
+
+#: src/app/main/ui/settings/integrations.cljs:456
+msgid "integrations.notification.success.mcp-server-enabled"
+msgstr "MCP-server ingeschakeld"
+
+#: src/app/main/ui/settings/integrations.cljs:87
+msgid "integrations.notification.success.token-copied"
+msgstr "Token gekopieerd"
+
+#: src/app/main/ui/settings/integrations.cljs:350
+msgid "integrations.regenerate-mcp-key.info"
+msgstr ""
+"Het opnieuw genereren van de MCP-sleutel zal de huidige onmiddellijk "
+"intrekken. Elke toepassing die het gebruikt, zal stoppen met werken."
+
+#: src/app/main/ui/settings/integrations.cljs:349
+msgid "integrations.regenerate-mcp-key.title"
+msgstr "MCP-sleutel opnieuw genereren"
+
+#: src/app/main/ui/settings/integrations.cljs:347
+msgid "integrations.regenerate-mcp-key.title.created"
+msgstr "MCP-sleutel opnieuw gegenereerd"
+
+#: src/app/main/ui/settings/integrations.cljs:666
+msgid "integrations.title"
+msgstr "Integraties"
+
+#: src/app/main/ui/settings/integrations.cljs:102
+msgid "integrations.token.info.non-recuperable"
+msgstr ""
+"Dit unieke token is niet recupereerbaar. Als je het verliest, moet je een "
+"nieuwe maken."
+
+#: src/app/main/ui/settings/integrations.cljs:114
+msgid "integrations.token.will-expire"
+msgstr "Het token vervalt op %s"
+
+#: src/app/main/ui/settings/integrations.cljs:117
+msgid "integrations.token.will-not-expire"
+msgstr "Het token heeft geen vervaldatum"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:30, src/app/main/ui/inspect/styles/style_box.cljs:32, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:262, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:274
+msgid "labels.blur-effects"
+msgstr "Vervagingseffecten"
+
+#: src/app/main/ui/settings/profile.cljs:116
+msgid "labels.delete-profile-photo.message"
+msgstr "Weet je zeker dat je je profielfoto wilt verwijderen?"
+
+#: src/app/main/ui/settings/profile.cljs:115
+msgid "labels.delete-profile-photo.title"
+msgstr "Profielfoto verwijderen"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:80
+msgid "nitrate.code-activation.title"
+msgstr "Nitrate inschakelen"
+
+#, unused
+msgid "nitrate.contact-sales.button"
+msgstr "Neem contact op met Verkoop"
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-contact-info"
+msgstr ""
+"Neem contact op met ons verkoopteam om over te schakelen naar dit "
+"abonnement. Wij helpen je jouw abonnement bij te werken en ervoor te zorgen "
+"dat alles correct wordt ingesteld."
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-storage-limited"
+msgstr ""
+"Je totale opslag, automatische versiegeschiedenis en bestandsherstelperiode "
+"zijn beperkt."
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-teams-available"
+msgstr ""
+"De teams, projecten en bestanden zullen geen deel meer uitmaken van een "
+"organisatie maar blijven wel beschikbaar."
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-title"
+msgstr "Wanneer je overgaat naar een mindere abonnementsvorm:"
+
+#, unused
+msgid "nitrate.contact-sales.title"
+msgstr "Overschakelen naar abonnement %s?"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:77
+msgid "nitrate.form.cancel-anytime"
+msgstr ""
+"De betaling wordt aan het einde van de proeftijd verwerkt. Je kunt op elk "
+"gewenst moment annuleren."
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:92
+msgid "nitrate.form.contact-trial"
+msgstr "Neem contact met ons op om Enterprise 14 dagen uit te proberen:"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:91
+msgid "nitrate.form.contact-upgrade"
+msgstr "Neem contact met ons op om te upgraden naar Enterprise:"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:82, src/app/main/ui/nitrate/nitrate_form.cljs:102
+msgid "nitrate.form.enter-code"
+msgstr "Activatiecode invoeren"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:57
+msgid "nitrate.form.enterprise-feature-1"
+msgstr "Algemene tot fijnmazige machtigingen voor teams en projecten"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:61
+msgid "nitrate.form.enterprise-feature-3"
+msgstr ""
+"Volledige open-sourcevrijheid, met het bestuur dat past bij jouw organisatie"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:54
+#, fuzzy
+msgid "nitrate.form.enterprise-intro"
+msgstr "Alles wat jouw teams nodig hebben om veilig op schaal te werken:"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
+msgid "nitrate.form.enterprise.price"
+msgstr "per deelnemer per maand"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:86
+msgid "nitrate.form.see-plan"
+msgstr "Mijn huidige abonnement weergeven"
+
+#, unused
+msgid "nitrate.form.start-enterprise"
+msgstr "Aan de slag met Enterprise"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:51
+msgid "nitrate.form.title"
+msgstr "Enterprise-functies vrijgeven"
+
+#: src/app/main/ui/dashboard/subscription.cljs:209, src/app/main/ui/nitrate/nitrate_form.cljs:75
+msgid "nitrate.form.try-free"
+msgstr "Probeer het 14 dagen gratis"
+
+#: src/app/main/ui/dashboard/subscription.cljs:251
+msgid "subscription.current-plan.nitrate-trial"
+msgstr "Enterprise Proefperiode"
+
+#: src/app/main/ui/dashboard/subscription.cljs:246
+msgid "subscription.current-plan.professional"
+msgstr "Professional"
+
+#: src/app/main/ui/settings/subscription.cljs:600, src/app/main/ui/settings/subscription.cljs:678
+msgid "subscription.settings.professional.selfhost.community-support"
+msgstr ""
+"Alle ontwerp- en prototypingfuncties met ondersteuning door de gemeenschap."
+
+#: src/app/main/ui/settings/subscription.cljs:594, src/app/main/ui/settings/subscription.cljs:672
+msgid "subscription.settings.professional.selfhost.control-over-data"
+msgstr "Volledige controle over data en infrastructuur."
+
+#: src/app/main/ui/settings/subscription.cljs:597, src/app/main/ui/settings/subscription.cljs:675
+msgid "subscription.settings.professional.selfhost.unlimited-users"
+msgstr "Onbeperkte gebruikers, teams en bestanden."
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:57
+msgid "nitrate.activation-success.active-until"
+msgstr "Jouw abonnement is actief tot %s."
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
+msgid "nitrate.activation-success.enjoy"
+msgstr "Veel plezier met je abonnement!"
+
+#: src/app/main/ui/dashboard/subscription.cljs:253
+msgid "subscription.current-plan.enterprise"
+msgstr "Enterprise"
+
+#: src/app/main/ui/dashboard/subscription.cljs:252
+msgid "subscription.current-plan.nitrate"
+msgstr "Enterprise"
+
+#: src/app/main/ui/dashboard/subscription.cljs:241
+msgid "subscription.current-plan.title"
+msgstr "Jouw abonnement"
+
+#: src/app/main/ui/dashboard/subscription.cljs:249
+msgid "subscription.current-plan.unlimited"
+msgstr "Unlimited"
+
+#: src/app/main/ui/dashboard/subscription.cljs:248
+msgid "subscription.current-plan.unlimited-trial"
+msgstr "Unlimited Proefperiode"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:466
+msgid "errors.team-leave.only-owner-can-delete"
+msgstr "Alleen de eigenaar kan een team verwijderen."
+
+#: src/app/main/ui/dashboard/fonts.cljs:283
+msgid "labels.download-simple"
+msgstr "Downloaden"
+
+#: src/app/main/ui/exports/files.cljs:186
+msgid "labels.downloading-file"
+msgstr "Bestand downloaden…"
+
+#: src/app/main/data/workspace/versions.cljs:305
+msgid "labels.exit"
+msgstr "Sluiten"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:1277
+msgid "labels.flex-layout"
+msgstr "Flex layout"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:1281
+msgid "labels.grid-layout"
+msgstr "Rasterlayout"
+
+#: src/app/main/ui/settings/sidebar.cljs:122
+msgid "labels.integrations"
+msgstr "Integraties"
+
+#: src/app/main/ui/static.cljs:337
+msgid "labels.nitrate-unavailable.main-message"
+msgstr ""
+"Penpot is tijdelijk niet beschikbaar vanwege een systeemprobleem. Probeer "
+"het even later nog eens."
+
+#: src/app/main/ui/components/select.cljs:256
+msgid "labels.no-matches"
+msgstr "Geen overeenkomst"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:705
+msgid "labels.open"
+msgstr "Openen"
+
+#: src/app/main/ui/dashboard/import.cljs:534
+msgid "labels.uploading-file"
+msgstr "Bestand uploaden…"
+
+#: src/app/main/ui/dashboard/import.cljs:297
+#, unused
+msgid "labels.warning-count"
+msgid_plural "labels.warning-count"
+msgstr[0] "%s waarschuwing"
+msgstr[1] "%s waarschuwingen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:322
+msgid "inspect.attributes.typography.mixed-font-family"
+msgstr "Gemengde lettertypen Families"
+
+#: src/app/main/ui/workspace/sidebar/assets/common.cljs:229
+msgid "modals.delete-asset-group.message"
+msgid_plural "modals.delete-asset-group.message"
+msgstr[0] "Weet je zeker dat je deze %s activa wilt verwijderen?"
+msgstr[1] "Weet je zeker dat je deze %s activa wilt verwijderen?"
+
+#: src/app/main/ui/workspace/sidebar/assets/common.cljs:228
+msgid "modals.delete-asset-group.title"
+msgstr "Groep verwijderen"
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:75
+msgid "modals.import-library-tokens.description"
+msgstr ""
+"De bibliotheek heeft tokens en thema's die waarschijnlijk door de "
+"componenten worden gebruikt."
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:92
+msgid "modals.import-library-tokens.import"
+msgstr "Tokens importeren"
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:72
+msgid "modals.import-library-tokens.title"
+msgstr "Tokens importeren uit bibliotheek?"
+
+#: src/app/main/data/team.cljs:583
+msgid "modals.invite-restricted-members.all-blocked"
+msgstr ""
+"Alleen bestaande leden van de organisatie kunnen worden uitgenodigd. Omdat "
+"geen van de mensen op de lijst lid is, zijn er geen uitnodigingen verzonden."
+
+#: src/app/main/data/team.cljs:582
+msgid "modals.invite-restricted-members.all-blocked-title"
+msgstr "Er zijn geen uitnodigingen verzonden"
+
+#: src/app/main/ui/dashboard/team.cljs:308
+msgid "modals.invite-restricted-members.blocked-addresses"
+msgstr "Adressen die geen uitnodiging ontvangen"
+
+#: src/app/main/ui/dashboard/team.cljs:325
+msgid "modals.invite-restricted-members.cancel"
+msgstr "Annuleren"
+
+#: src/app/main/ui/dashboard/team.cljs:298
+msgid "modals.invite-restricted-members.description"
+msgstr "Alleen bestaande leden van de organisatie kunnen worden uitgenodigd."
+
+#: src/app/main/ui/dashboard/team.cljs:333
+msgid "modals.invite-restricted-members.send"
+msgstr "Uitnodigingen versturen"
+
+#: src/app/main/ui/dashboard/team.cljs:293
+msgid "modals.invite-restricted-members.title"
+msgstr "Enkele uitnodigingen kunnen niet worden verzonden"
+
+#: src/app/main/ui/dashboard/team.cljs:299
+msgid "modals.invite-restricted-members.warning"
+msgstr "Sommige mensen op de lijst ontvangen de uitnodiging niet."
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:58
+msgid "nitrate.activation-code.expired-error"
+msgstr "Deze code is verlopen."
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:59
+msgid "nitrate.activation-code.invalid-error"
+msgstr "Ongeldige code."
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
+#, fuzzy
+msgid "nitrate.activation-success.manage-info"
+msgstr ""
+"Je kunt je abonnement op elk gewenst moment beheren vanaf de "
+"Abonnementspagina in je accountinstellingen."
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
+msgid "nitrate.code-activation.input-label"
+msgstr "Vul je activeringscode in"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:90
+msgid "nitrate.code-activation.placeholder"
+msgstr "Plak hier je activeringscode"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:79
+msgid "nitrate.code-activation.renew-title"
+msgstr "NITRATE VERLENGEN"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:101
+msgid "nitrate.code-activation.submit"
+msgstr "Activeren"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:65
+msgid "webgl.modals.webgl-unavailable.troubleshooting.before"
+msgstr "Volg onze "
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:70
+msgid "webgl.modals.webgl-unavailable.troubleshooting.link"
+msgstr "WebGL-gids voor probleemoplossing"
+
+#, unused
+msgid "webgl.toast.webgl-render-disabled"
+msgstr "WebGL-weergave uitgeschakeld"
+
+#, unused
+msgid "webgl.toast.webgl-render-enabled"
+msgstr "WebGL-weergave ingeschakeld"
+
+#: src/app/render_wasm/api.cljs:2052
+msgid "webgl.webgl-context-lost.toast"
+msgstr "WebGL-context ging verloren"
+
+#: src/app/render_wasm/api.cljs:2068
+msgid "webgl.webgl-context-recovered.toast"
+msgstr "WebGL-context is hersteld"
+
+#: src/app/main/ui/workspace/sidebar/assets/groups.cljs:74
+msgid "workspace.assets.delete-group"
+msgstr "Groep verwijderen"
+
+#: src/app/main/data/workspace/clipboard.cljs:1172
+msgid "workspace.clipboard.copying"
+msgstr "Afbeelding kopiëren…"
+
+#: src/app/main/data/workspace/clipboard.cljs:1195
+msgid "workspace.clipboard.image-copied"
+msgstr "Afbeelding gekopieerd naar het klembord"
+
+#: src/app/main/data/workspace/clipboard.cljs:1201
+msgid "workspace.clipboard.image-copy-failed"
+msgstr "Fout bij kopiëren van afbeelding"
+
+#: src/app/main/ui/workspace/context_menu.cljs:873
+msgid "workspace.context-menu.grid-cells.copy-columns"
+msgstr "Kolommen kopiëren"
+
+#: src/app/main/ui/workspace/context_menu.cljs:869
+msgid "workspace.context-menu.grid-cells.copy-rows"
+msgstr "Rijen kopiëren"
+
+#: src/app/main/ui/workspace/context_menu.cljs:877
+msgid "workspace.context-menu.grid-cells.paste-tracks"
+msgstr "Plakken"
+
+#: src/app/main/ui/workspace/context_menu.cljs:911
+msgid "workspace.context-menu.guides.change-color"
+msgstr "Hulplijnkleur"
+
+#: src/app/main/ui/workspace/context_menu.cljs:923
+msgid "workspace.context-menu.guides.remove"
+msgstr "Hulplijn verwijderen"
+
+#: src/app/main/ui/workspace/main_menu.cljs:336
+msgid "workspace.header.menu.disable-webgl"
+msgstr "WebGL-weergave (bèta) uitschakelen"
+
+#: src/app/main/ui/workspace/main_menu.cljs:337
+msgid "workspace.header.menu.enable-webgl"
+msgstr "WebGL-weergave (bèta) inschakelen"
+
+#: src/app/main/ui/workspace/main_menu.cljs:530
+msgid "workspace.header.menu.find"
+msgstr "Zoeken"
+
+#: src/app/main/ui/workspace/main_menu.cljs:537
+msgid "workspace.header.menu.find-and-replace"
+msgstr "Zoeken en Vervangen"
+
+#: src/app/main/ui/workspace/main_menu.cljs:421
+msgid "workspace.header.menu.hide-comments"
+msgstr "Commentaar verbergen"
+
+#: src/app/main/ui/workspace/main_menu.cljs:410
+msgid "workspace.header.menu.lock-guides"
+msgstr "Hulplijnen vergrendelen"
+
+#: src/app/main/ui/settings/subscription.cljs:584
+msgid "nitrate.subscription.settings.manual-cancel"
+msgstr "Abonnement annuleren"
+
+#: src/app/main/ui/settings/subscription.cljs:103
+msgid "nitrate.subscription.settings.renew-with-code"
+msgstr "Verlengen met activeringscode"
+
+#: src/app/main/data/workspace/mcp.cljs:185
+#, unused
+msgid "notifications.mcp.active-in-another-tab"
+msgstr "MCP is actief op een ander tabblad. Hier wisselen?"
+
+#, unused
+msgid "notifications.mcp.active-in-this-tab"
+msgstr "MCP is nu actief op dit tabblad."
+
+#: src/app/main/ui/onboarding/questions.cljs:226
+msgid "onboarding.questions.team-size.1001-5000"
+msgstr "1.001 - 5.000"
+
+#: src/app/main/ui/onboarding/questions.cljs:222
+msgid "onboarding.questions.team-size.101-500"
+msgstr "101 - 500"
+
+#: src/app/main/ui/onboarding/questions.cljs:220
+msgid "onboarding.questions.team-size.2-100"
+msgstr "2 - 100"
+
+#: src/app/main/ui/onboarding/questions.cljs:224
+msgid "onboarding.questions.team-size.501-1000"
+msgstr "501 - 1.000"
+
+#: src/app/main/ui/onboarding/questions.cljs:218
+msgid "onboarding.questions.team-size.just-me"
+msgstr "Alleen ik"
+
+#: src/app/main/ui/onboarding/questions.cljs:228
+msgid "onboarding.questions.team-size.more-than-5001"
+msgstr "5.001+"
+
+#: src/app/plugins/utils.cljs:318
+msgid "plugins.validation.message"
+msgstr "Veld %s is ongeldig: %s"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:114
+msgid "shortcuts.find"
+msgstr "Zoeken"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:115
+msgid "shortcuts.find-and-replace"
+msgstr "Zoeken en Vervangen"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:165
+msgid "shortcuts.paste-replace"
+msgstr "Plakken en vervangen"
+
+#: src/app/main/ui/dashboard/subscription.cljs:189
+msgid "subscription.banner.see-enterprise"
+msgstr "Enterprise in actie bekijken"
+
+#: src/app/main/ui/dashboard/subscription.cljs:229
+msgid "subscription.dashboard.banner.renew"
+msgstr "Verlengen"
+
+#: src/app/main/ui/dashboard/subscription.cljs:216
+msgid "subscription.dashboard.banner.renew-subscription"
+msgstr "Verleng je abonnement"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:50
+msgid "nitrate.subscription.renew-success"
+msgstr "Je Nitrate abonnement is verlengd."
+
+#: src/app/main/ui/settings/subscription.cljs:575
+msgid "nitrate.subscription.active-until"
+msgstr "Actief tot %s"
+
+#: src/app/main/ui/dashboard/subscription.cljs:222
+msgid "subscription.dashboard.banner.subscription-expire-days"
+msgstr "Jouw Enterprise-abonnement vervalt over %s dagen (%s)"
+
+#: src/app/main/ui/dashboard/subscription.cljs:220
+msgid "subscription.dashboard.banner.subscription-expired"
+msgstr "Jouw Enterprise-abonnement is verlopen. (%s)"
+
+#: src/app/main/ui/dashboard/subscription.cljs:201
+msgid "subscription.dashboard.banner.unlock-features"
+msgstr "Enterprise-functies ontgrendelen"
+
+#: src/app/main/ui/dashboard/subscription.cljs:208
+msgid "subscription.dashboard.banner.upgrade-nitrate"
+msgstr "Aan de slag met Enterprise"
+
+#: src/app/main/ui/settings/subscription.cljs:408
+msgid "subscription.error.nitrate.checkout-cancelled"
+msgstr ""
+"Betaling is niet voltooid. Probeer het opnieuw wanneer je er klaar voor bent."
+
+#: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
+msgid "subscription.error.nitrate.checkout-failed"
+msgstr ""
+"We konden niet beginnen met de kassa. Probeer het alsjeblieft nog eens. Als "
+"het probleem aanhoudt, neem dan contact met ons op: support@penpot.app."
+
+#: src/app/main/ui/settings/subscription.cljs:407
+msgid "subscription.error.nitrate.checkout-finish-failed"
+msgstr ""
+"We konden je abonnement niet bevestigen. Controleer je abonnementsstatus op "
+"de Abonnementspagina. Indien nodig kun je het opnieuw proberen."
+
+#: src/app/main/ui/settings/subscription.cljs:97
+msgid "subscription.settings.activate-by-code"
+msgstr "Activatiecode invoeren"
+
+#: src/app/main/ui/settings/subscription.cljs:724
+#, fuzzy
+msgid "subscription.settings.organization-member-month"
+msgstr "org deelnemer per maand"
+
+#: src/app/main/ui/settings/integrations.cljs:659
+msgid "title.settings.integrations"
+msgstr "Integraties - Penpot"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:76
+msgid "webgl.modals.webgl-unavailable.cta-dashboard"
+msgstr "Ga naar het dashboard"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:78
+msgid "webgl.modals.webgl-unavailable.cta-troubleshooting"
+msgstr "Gids voor probleemoplossing"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:62
+msgid "webgl.modals.webgl-unavailable.message"
+msgstr ""
+"WebGL is niet beschikbaar in je browser, wat vereist is om Penpot te laten "
+"werken. Controleer je browserinstellingen en/of sluit tabbladen met veel "
+"afbeeldingen."
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:58
+msgid "webgl.modals.webgl-unavailable.title"
+msgstr "Oeps! WebGL is niet beschikbaar"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:71
+msgid "webgl.modals.webgl-unavailable.troubleshooting.after"
+msgstr ""
+" om browserinstellingen, GPU-versnelling, stuurprogramma's en "
+"veelvoorkomende systeemproblemen te controleren."
+
+#: src/app/main/ui/workspace/main_menu.cljs:869
+msgid "workspace.header.menu.mcp.plugin.status.connect"
+msgstr "Verbinding maken"
+
+#: src/app/main/ui/workspace/main_menu.cljs:868
+msgid "workspace.header.menu.mcp.plugin.status.disconnect"
+msgstr "Verbinding verbreken"
+
+#: src/app/main/ui/workspace/main_menu.cljs:878
+msgid "workspace.header.menu.mcp.server.status.disabled"
+msgstr "Beheren (status: uitgeschakeld)"
+
+#: src/app/main/ui/workspace/main_menu.cljs:877
+msgid "workspace.header.menu.mcp.server.status.enabled"
+msgstr "Beheren (status: ingeschakeld)"
+
+#: src/app/main/ui/workspace/main_menu.cljs:1101
+msgid "workspace.header.menu.option.mcp"
+msgstr "MCP-server"
+
+#: src/app/main/ui/workspace/main_menu.cljs:422
+msgid "workspace.header.menu.show-comments"
+msgstr "Commentaar weergeven"
+
+#: src/app/main/ui/workspace/main_menu.cljs:409
+msgid "workspace.header.menu.unlock-guides"
+msgstr "Hulplijnen ontgrendelen"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:354
+msgid "workspace.libraries.colors.add-library-color"
+msgstr "Kleur toevoegen aan bilbliotheek"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:371, src/app/main/ui/workspace/colorpicker/libraries.cljs:387
+msgid "workspace.libraries.colors.empty-recent-colors"
+msgstr "Er zijn nog geen recente kleuren"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:336
+msgid "workspace.libraries.colors.toggle-color-palette"
+msgstr "Kleurenpalet wisselen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:541
+msgid "workspace.libraries.text.mixed-tokens"
+msgstr "Gemengde tokens"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:536
+msgid "workspace.libraries.text.mixed-tokens-and-assets"
+msgstr "Gemengde activa en tokens"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:556
+msgid "workspace.libraries.text.mixed-typography"
+msgstr "Gemengde activa"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:558
+msgid "workspace.libraries.text.multiple-assets-tooltip"
+msgstr "Alle activa ontkoppelen"
+
+#: src/app/main/data/workspace/mcp.cljs:186
+#, unused
+msgid "labels.dismiss"
+msgstr "Afwijzen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:543
+msgid "workspace.libraries.text.multiple-token-tooltip"
+msgstr "Alle tokens loskoppelen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
+#, unused
+msgid "workspace.options.blur-effects-options.title"
+msgstr "Vervagingseffecten"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:273
+msgid "workspace.options.blur-effects-options.title.group"
+msgstr "Groepsvervagingseffecten"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:272
+msgid "workspace.options.blur-effects-options.title.multiple"
+msgstr "Selectievervagingseffecten"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:99, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:109
+msgid "workspace.options.blur-options.background-blur"
+msgstr "Achtergrondvervaging"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:144
+msgid "workspace.options.blur-options.blur-type-select"
+msgstr "Vervagingstype selecteren"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:153
+msgid "workspace.options.blur-options.disabled-blur-label"
+msgstr ""
+"Achtergrondvervaging wordt alleen ondersteund in de nieuwe render. Schakel "
+"over naar de nieuwe render in het menu Voorkeuren om dit effect te gebruiken"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:98, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:112
+msgid "workspace.options.blur-options.layer-blur"
+msgstr "Laagvervaging"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:138
+msgid "workspace.options.blur-options.toggle-more-options"
+msgstr "Meer opties tonen/verbergen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:517
+msgid "workspace.options.convert-to-typography"
+msgstr "Typografiestijl maken"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/fill.cljs:198
+msgid "workspace.options.fill.section"
+msgstr "Sectie vullen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:223, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:285
+msgid "workspace.options.layer-options.layer-section"
+msgstr "Menusectie laag"
+
+#: src/app/main/ui/workspace/sidebar/options/drawing/frame.cljs:117, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:488
+msgid "workspace.options.no-size-preset-results"
+msgstr "Geen overeenkomende maatvoorinstelling"
+
+#: src/app/main/ui/workspace/sidebar/options/page.cljs
+#, unused
+msgid "workspace.options.pixel grid-color"
+msgstr "Kleur van het pixelraster"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:626
+msgid "workspace.sidebar.layers.replace-all"
+msgstr "Alles vervangen"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:587
+msgid "workspace.sidebar.layers.replace-placeholder"
+msgstr "Vervangen door…"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:575
+msgid "workspace.sidebar.layers.search-and-replace"
+msgstr "Zoeken en vervangen"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:606
+msgid "workspace.sidebar.layers.search-scope-canvas"
+msgstr "Tekstinhoud"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:610
+msgid "workspace.sidebar.layers.search-scope-layers"
+msgstr "Laagnamen"
+
+#, unused
+msgid "workspace.toast.comments-hidden"
+msgstr "Commentaar verborgen"
+
+#, unused
+msgid "workspace.toast.comments-visible"
+msgstr "Commentaar zichtbaar"
+
+#: src/app/main/ui/workspace/tokens/management/context_menu.cljs:357
+msgid "workspace.tokens.copy-name"
+msgstr "Tokenpad kopiëren"
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:60
+msgid "workspace.tokens.duplicate-group"
+msgstr "Tokensgroep dupliceren"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:32
+#, unused
+msgid "workspace.tokens.duplicated-json-token-name"
+msgstr "Importeerfout: dubbele tokennaam in JSON."
+
+#: src/app/main/data/workspace/tokens/errors.cljs:33
+#, unused
+msgid "workspace.tokens.duplicated-json-token-name-detail"
+msgstr ""
+"Er bestaat al een token bij het pad '%s' of bij een voorvoegsel daarvan, in "
+"een andere set."
+
+#: src/app/main/data/workspace/tokens/application.cljs:730, src/app/main/ui/workspace/tokens/management/group.cljs:161
+msgid "workspace.tokens.error-text-edition"
+msgstr ""
+"Tokens kunnen niet worden toegepast tijdens het bewerken van tekst. "
+"Selecteer in plaats daarvan de tekstlaag."
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:102
+msgid "workspace.tokens.remap-node-references-title"
+msgstr ""
+"'%s' hernoemen naar '%s' en alle tokens in deze groep opnieuw in kaart "
+"brengen?"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:106
+msgid "workspace.tokens.remap-node-warning-effects"
+msgstr ""
+"Hiermee worden alle tokens en referenties die de oude tokensnaam gebruiken "
+"bijgewerkt ."
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:105
+msgid "workspace.tokens.remap-token-warning-effects"
+msgstr ""
+"Hierdoor worden alle lagen en verwijzingen die de oude tokennaam gebruiken, "
+"gewijzigd."
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:59
+msgid "workspace.tokens.rename-group"
+msgstr "Tokensgroep hernoemen"
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:68
+msgid "workspace.tokens.rename-group-name-hint"
+msgstr "Je tokens worden automatisch hernoemd naar % s.(suffix).(tokenName)"
+
+#: src/app/main/ui/workspace/colorpicker/color_tokens.cljs:297, src/app/main/ui/workspace/sidebar/options/menus/text.cljs:527
+msgid "workspace.tokens.search-by-token"
+msgstr "Zoeken op tokennaam"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:273
+msgid "workspace.tokens.token-name-duplication-validation-error"
+msgstr "Er bestaat al een token op het pad: %s of op een voorvoegsel daarvan."
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:65, src/app/main/ui/workspace/top_toolbar.cljs:66, src/app/main/ui/workspace/top_toolbar.cljs:77
+msgid "workspace.toolbar.mcp"
+msgstr "MCP"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:87
+msgid "workspace.toolbar.mcp-connect-here"
+msgstr "Hier verbinden"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:84
+msgid "workspace.toolbar.mcp-connected"
+msgstr "MCP verbonden"
+
+#: src/app/main/ui/workspace/palette.cljs:166
+msgid "workspace.toolbar.palette-bar"
+msgstr "Paletbalk"
+
+#, unused
+msgid "workspace.top-bar.webgl-context-lost"
+msgstr "Weergave niet beschikbaar. Vernieuwen om de bewerking te herstellen."
+
+#: src/app/main/ui/workspace/viewport/top_bar.cljs:43
+msgid "workspace.top-bar.webgl-context-lost.reload"
+msgstr "Vernieuwen"
+
+#: src/app/main/ui/workspace/sidebar/history.cljs:358
+msgid "workspace.undo.entry.by"
+msgstr "door %s"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:234, src/app/main/ui/workspace/sidebar/versions.cljs:314
+msgid "workspace.versions.button.preview"
+msgstr "Voorvertoning van versie"
+
+#: src/app/main/data/workspace/versions.cljs:303
+msgid "workspace.versions.preview-banner-title"
+msgstr "Voorvertoning van versie: % s"
+
+#: src/app/main/data/workspace/versions.cljs:297
+msgid "workspace.versions.preview.unnamed"
+msgstr "Versie zonder naam"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:335
+#, unused
+msgid "workspace.libraries.text.multiple-token-and-asset-tooltip"
+msgstr "Alle tokens losmaken & alle typografieën loskoppelen"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:337
+msgid "workspace.options.stroke-gap"
+msgstr "Ruimte"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:248
+msgid "workspace.options.stroke.toggle-stroke"
+msgstr "Streek wisselen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:501
+msgid "workspace.options.text-options.text-section"
+msgstr "Tekstsectie"
+
+#: src/app/main/ui/workspace/plugins.cljs:317
+msgid "workspace.plugins.permissions.clipboard-read"
+msgstr "Lees de inhoud van je klembord."
+
+#: src/app/main/ui/workspace/plugins.cljs:311
+msgid "workspace.plugins.permissions.clipboard-write"
+msgstr "Lees en schrijf naar je klembord."
+
+#: src/app/main/ui/workspace/context_menu.cljs:651
+msgid "workspace.shape.menu.clear-guides"
+msgstr "Bordhulplijnen wissen"
+
+#: src/app/main/ui/workspace/context_menu.cljs:229
+msgid "workspace.shape.menu.copy-as-image"
+msgstr "Als afbeelding kopiëren"
+
+#: src/app/main/ui/workspace/context_menu.cljs:453
+msgid "workspace.shape.menu.stroke-to-path"
+msgstr "Streek naar pad"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs
+#, unused
+msgid "workspace.sidebar.layers.match-count"
+msgstr "%s van %s"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:601
+msgid "workspace.sidebar.layers.no-matches"
+msgstr "Geen overeenkomst"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:620
+msgid "workspace.sidebar.layers.replace"
+msgstr "Vervangen"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:169, src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:287
+msgid "workspace.options.radius.radius-section"
+msgstr "Randradius van sectie"
+
+#: src/app/main/ui/workspace/sidebar/options/drawing/frame.cljs:111, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:482
+msgid "workspace.options.search-size-preset"
+msgstr "Groottevoorinstelling zoeken"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs:200
+msgid "workspace.options.selection-color.section"
+msgstr "Kleurselectie van sectie"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:327
+msgid "workspace.options.stroke-dash"
+msgstr "Streepjes"
diff --git a/frontend/translations/pl.po b/frontend/translations/pl.po
index 982243749b..c1ebc61542 100644
--- a/frontend/translations/pl.po
+++ b/frontend/translations/pl.po
@@ -2170,10 +2170,6 @@ msgstr "Witamy w Penpot!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Po nazwaniu swojego zespołu będziesz mógł zapraszać osoby do dołączenia."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Wprowadź nazwę zespołu"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Zaproś członków"
@@ -2286,11 +2282,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Edytuj"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Ogólny"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Ogólny"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -2709,14 +2701,6 @@ msgstr "Przyciągaj do siatki pikseli"
 msgid "shortcuts.start-editing"
 msgstr "Rozpocznij edycję"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Rozpocznij pomiary"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Zakończ pomiary"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Ustaw miniaturki"
diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po
index 9563253ed1..e1fbdd7b93 100644
--- a/frontend/translations/pt_BR.po
+++ b/frontend/translations/pt_BR.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Renan Mayrinck <renan.mtk@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) "
-"<https://hosted.weblate.org/projects/penpot/frontend/pt_BR/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
+"penpot/frontend/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -2922,10 +2922,6 @@ msgstr "Bem-vindo ao Penpot!"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Depois de nomear sua equipe, você poderá convidar pessoas para participar."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Digite o nome da equipe"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Convide membros"
@@ -3004,6 +3000,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Este token não existe ou foi excluído."
 
@@ -3042,11 +3039,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editar"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Geral"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Geral"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3465,14 +3458,6 @@ msgstr "Ajustar a grade de Pixels"
 msgid "shortcuts.start-editing"
 msgstr "Começar a editar"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Iniciar medição"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Parar medição"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Definir como miniatura"
diff --git a/frontend/translations/pt_PT.po b/frontend/translations/pt_PT.po
index 0e55c63192..a8725278b6 100644
--- a/frontend/translations/pt_PT.po
+++ b/frontend/translations/pt_PT.po
@@ -3007,10 +3007,6 @@ msgstr "Poderás enviar convites mais tarde"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Depois de nomeares a tua equipa, poderás convidar pessoas para entrar."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Escreve o nome da equipa"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Criar equipa"
@@ -3309,11 +3305,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editar"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Genérico"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Genérico"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3788,14 +3780,6 @@ msgstr "Ajustar à grade de píxeis"
 msgid "shortcuts.start-editing"
 msgstr "Iniciar edição"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Iniciar medição"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Parar medição"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Definir imagem destaque"
diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po
index 6c341e704f..acee45ae90 100644
--- a/frontend/translations/ro.po
+++ b/frontend/translations/ro.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: AlexTECPlayz <alextecplayz@vantainteractive.com>\n"
-"Language-Team: Romanian "
-"<https://hosted.weblate.org/projects/penpot/frontend/ro/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/penpot/frontend/"
+"ro/>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -3572,10 +3572,6 @@ msgstr "Poți invita și mai târziu"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "După ce îți denumești echipa, vei putea invita oameni să se alăture."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Introduceți numele echipei"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Creează echipă"
@@ -3828,6 +3824,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Acest token nu există sau a fost șters."
 
@@ -3878,11 +3875,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Editează"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Generic"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Generic"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4376,14 +4369,6 @@ msgstr "Fixare la grila de pixeli"
 msgid "shortcuts.start-editing"
 msgstr "Începeți editarea"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Începeți măsurarea"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Opriți măsurarea"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Setează miniaturile"
@@ -4708,10 +4693,6 @@ msgstr "Mai multe informații"
 msgid "subscription.settings.other-plans"
 msgstr "Alte abonamente Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "editor per lună"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organizație per lună"
@@ -4762,11 +4743,6 @@ msgstr "Mulțumim pentru că ai ales planul Penpot %s!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Ești %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Ne ai ajutat prin acest abonament din: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Încearcă gratuit pentru 14 zile"
diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po
index a68e44ccb9..075b36e53d 100644
--- a/frontend/translations/ru.po
+++ b/frontend/translations/ru.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: The_BadUser <vanjavs41@gmail.com>\n"
-"Language-Team: Russian "
-"<https://hosted.weblate.org/projects/penpot/frontend/ru/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/penpot/frontend/"
+"ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -364,7 +364,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(копия)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Создать новую организацию"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -3614,10 +3614,6 @@ msgstr ""
 "После добавления названия команды, вы сможете пригласить людей "
 "присоединиться."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Введите название команды"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Создать команду"
@@ -3855,6 +3851,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Этот токен не существует или был удален."
 
@@ -3905,11 +3902,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Редактировать"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Общее"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Общее"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4384,14 +4377,6 @@ msgstr "Привязать к пиксельной сетке"
 msgid "shortcuts.start-editing"
 msgstr "Начать редактирование"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Начать измерение"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Остановить измерение"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Установить миниатюры"
diff --git a/frontend/translations/sr.po b/frontend/translations/sr.po
index 3f6cde261a..1429d1c36b 100644
--- a/frontend/translations/sr.po
+++ b/frontend/translations/sr.po
@@ -2531,10 +2531,6 @@ msgstr "Моћи ћете да позовете касније"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Након што дате име свом тиму, моћи ћете да позовете људе да се придруже."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Унесите име тима"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Направите тим"
@@ -2812,11 +2808,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Уреди"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Опште"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Опште"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3283,14 +3275,6 @@ msgstr "Залепи на мрежу пиксела"
 msgid "shortcuts.start-editing"
 msgstr "Започни уређивање"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Започни мерење"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Заустави мерење"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Подеси сличице"
diff --git a/frontend/translations/sv.po b/frontend/translations/sv.po
index fe624b7c13..95e10b36f4 100644
--- a/frontend/translations/sv.po
+++ b/frontend/translations/sv.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Henrik Allberg <henrik@thexorb.com>\n"
-"Language-Team: Swedish "
-"<https://hosted.weblate.org/projects/penpot/frontend/sv/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Swedish <https://hosted.weblate.org/projects/penpot/frontend/"
+"sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -18,14 +18,14 @@ msgstr "Har du redan ett konto?"
 #: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
 #, unused
 msgid "auth.check-mail"
-msgstr "Kontrollera din e-post"
+msgstr "Kolla din e-post"
 
 #: src/app/main/ui/auth/register.cljs:277
 #, unused
 msgid "auth.check-your-email"
 msgstr ""
-"Kontrollera din e-post och klicka på länken för att verifiera och börja "
-"använda Penpot."
+"Kolla din e-post och klicka på länken för att verifiera och börja använda "
+"Penpot."
 
 #: src/app/main/ui/auth/recovery.cljs:67
 msgid "auth.confirm-password"
@@ -96,7 +96,7 @@ msgid "auth.new-password"
 msgstr "Skriv ett nytt lösenord"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "Du är nu med i %s"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -293,7 +293,7 @@ msgid "common.unpublish"
 msgstr "Avpublicera"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "Du är inte längre med i organisationen %s."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -363,25 +363,25 @@ msgid "dashboard.change-email"
 msgstr "Ändra e-post"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "FLYTTA TEAM"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Flytta till:"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Välj en organisation"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "Projekt och filer kommer att förbli tillgängliga för teammedlemmar. Teamet "
 "kommer att hämta konfigurationen från den nya organisationen."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Ändra teamets organisation"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -393,7 +393,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(kopia)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Skapa org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -812,7 +812,7 @@ msgid "dashboard.invite-profile"
 msgstr "Bjud in personer"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Lämna org"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -864,6 +864,7 @@ msgid "dashboard.move-to-other-team"
 msgstr "Flytta till andra team"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
 msgid "dashboard.my-teams"
 msgstr "Mina team"
 
@@ -888,7 +889,7 @@ msgid "dashboard.no-matches-for"
 msgstr "Inga träffar hittades för ”%s”"
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "Du har inte behörighet att lägga till team i någon av dina organisationer."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -958,7 +959,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Sortera efter status"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "Organisationen %s har tagits bort."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -998,7 +999,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Testa plugin: "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Skapa org"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1083,36 +1084,36 @@ msgid "dashboard.section.organizations"
 msgstr "Organisationer"
 
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "LÄGG TILL I ORGANISATION"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Välj en organisation:"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "\"%s\" tillåter endast organisationsmedlemmar att gå med i dess team. Alla "
 "väntande inbjudningar till personer utanför organisationen kommer att "
 "återkallas."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Väntande inbjudningar till externa användare kommer att avbrytas."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Här hittar du alla dina organisationer där du har rätt att skapa eller "
 "lägga till team."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Välj en organisation"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Lägg till team i en organisation"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1236,7 +1237,7 @@ msgid "dashboard.success-move-project"
 msgstr "Ditt projekt har flyttats"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "Detta team tillhör nu %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1248,7 +1249,7 @@ msgid "dashboard.team-members"
 msgstr "Teammedlemmar"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "Detta team tillhör inte längre organisation %s"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1260,7 +1261,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Lägg till i en organisation"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr ""
 "Du har inte behörighet att lägga till det här teamet i någon av dina "
 "organisationer."
@@ -1270,7 +1271,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Ändra teamorganisation"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr "Endast personer inom din organisation kan bjudas in."
 
 #: src/app/main/ui/dashboard/team.cljs:1639
@@ -1336,7 +1337,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Gratis Penpot"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "Du är inte längre medlem i organisation %s"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1712,15 +1713,15 @@ msgid "errors.only-creator-can-unlock"
 msgstr "Endast skaparen av versionen kan låsa upp den"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr "Det uppstod ett fel när du skulle lämna organisationen. Försök igen."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "Organisationsägaren kan inte lämna organisationen."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "Den organisationen finns inte"
 
 #: src/app/main/ui/settings/password.cljs
@@ -2409,7 +2410,6 @@ msgid "inspect.tabs.styles.active-themes"
 msgstr "Aktiva teman"
 
 #: src/app/main/ui/inspect/styles/style_box.cljs:75
-#, fuzzy
 msgid "inspect.tabs.styles.copy-shorthand"
 msgstr "Kopiera CSS-förkortning till urklipp"
 
@@ -3731,17 +3731,17 @@ msgid "modals.add-shared-confirm.message"
 msgstr "Lägg till \"%s\" som delat bibliotek"
 
 #: src/app/main/data/nitrate.cljs:199
-msgid "modals.before-leave-org.message"
+msgid "modals.before-leave-organization.message"
 msgstr ""
 "Du är den enda medlemmen i vissa av teamen. Dessa team kommer att raderas "
 "tillsammans med deras projekt och filer."
 
 #: src/app/main/data/nitrate.cljs:198, src/app/main/ui/dashboard/change_owner.cljs:151
-msgid "modals.before-leave-org.title"
+msgid "modals.before-leave-organization.title"
 msgstr "INNAN DU LÄMNAR ORGANISATIONEN"
 
 #: src/app/main/data/nitrate.cljs:202
-msgid "modals.before-leave-org.warning"
+msgid "modals.before-leave-organization.warning"
 msgstr "Alla team där du är den enda medlemmen kommer att raderas."
 
 #: src/app/main/ui/workspace/nudge.cljs:59
@@ -3801,22 +3801,22 @@ msgstr "Genom att ta bort ditt konto förlorar du alla dina projekt och arkiv."
 
 #: src/app/main/ui/settings/delete_account.cljs
 #, unused
-msgid "modals.delete-account.info.with-orgs"
+msgid "modals.delete-account.info.with-organizations"
 msgstr ""
 "Denna åtgärd kan inte ångras. Ditt konto, din prenumeration och dina "
 "organisationer kommer att raderas omedelbart. Du kommer också att förlora "
 "åtkomsten till dina nuvarande projekt och filer."
 
 #: src/app/main/ui/settings/delete_account.cljs:83
-msgid "modals.delete-account.owned-orgs.list-title"
+msgid "modals.delete-account.owned-organizations.list-title"
 msgstr "Organisationer som kommer att raderas"
 
 #: src/app/main/ui/settings/delete_account.cljs:98
-msgid "modals.delete-account.owned-orgs.members-count"
+msgid "modals.delete-account.owned-organizations.members-count"
 msgstr "%s medlemmar"
 
 #: src/app/main/ui/settings/delete_account.cljs:96
-msgid "modals.delete-account.owned-orgs.teams-count"
+msgid "modals.delete-account.owned-organizations.teams-count"
 msgstr "%s team"
 
 #: src/app/main/ui/settings/delete_account.cljs:64
@@ -3900,7 +3900,7 @@ msgid "modals.delete-font.title"
 msgstr "Tar bort typsnitt"
 
 #: src/app/main/data/team.cljs:129
-msgid "modals.delete-org-team-confirm.message"
+msgid "modals.delete-organization-team-confirm.message"
 msgstr ""
 "Är du säker på att du vill ta bort det här teamet som är en del av "
 "organisation %s?"
@@ -4048,7 +4048,7 @@ msgid "modals.invite-restricted-members.all-blocked-title"
 msgstr "Inga inbjudningar skickades"
 
 #: src/app/main/data/team.cljs:162
-msgid "modals.invite-restricted-members.all-org-members-in-team"
+msgid "modals.invite-restricted-members.all-organization-members-in-team"
 msgstr ""
 "Endast medlemmar i organisationen \"%s\" kan bjudas in till det här teamet, "
 "och de är alla redan teammedlemmar. Om du behöver mer information, kontakta "
@@ -4135,35 +4135,35 @@ msgid "modals.leave-confirm.title"
 msgstr "Lämnar teamet"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:158
-msgid "modals.leave-org-and-reassign.hint"
+msgid "modals.leave-organization-and-reassign.hint"
 msgstr ""
 "Du är ägare till teamen i vissa organisationer. Vänligen befordra en annan "
 "medlem till att bli ägare."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:161
-msgid "modals.leave-org-and-reassign.hint-delete"
+msgid "modals.leave-organization-and-reassign.hint-delete"
 msgstr ""
 "Du är den enda medlemmen i vissa av teamen. Dessa team kommer att raderas "
 "tillsammans med deras projekt och filer."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:163
-msgid "modals.leave-org-and-reassign.hint-promote"
+msgid "modals.leave-organization-and-reassign.hint-promote"
 msgstr ""
 "Du är också ägare till vissa organisationers team. Vänligen befordra en "
 "annan medlem till att bli ägare."
 
 #: src/app/main/data/nitrate.cljs:200, src/app/main/data/nitrate.cljs:209
-msgid "modals.leave-org-confirm.accept"
+msgid "modals.leave-organization-confirm.accept"
 msgstr "Lämna organisation"
 
 #: src/app/main/data/nitrate.cljs:208
-msgid "modals.leave-org-confirm.message"
+msgid "modals.leave-organization-confirm.message"
 msgstr ""
 "Du kommer permanent att förlora åtkomsten till alla team, projekt och filer "
 "i den."
 
 #: src/app/main/data/nitrate.cljs:207
-msgid "modals.leave-org-confirm.title"
+msgid "modals.leave-organization-confirm.title"
 msgstr "Lämnar du organisation %s?"
 
 #: src/app/main/ui/delete_shared.cljs:54
@@ -4239,21 +4239,21 @@ msgid "modals.remove-shared-confirm.message"
 msgstr "Ta bort \"%s\" som delat bibliotek"
 
 #: src/app/main/data/nitrate.cljs:256
-msgid "modals.remove-team-org.accept"
+msgid "modals.remove-team-organization.accept"
 msgstr "Ta bort från organisationen"
 
 #: src/app/main/data/nitrate.cljs:254
-msgid "modals.remove-team-org.info"
+msgid "modals.remove-team-organization.info"
 msgstr ""
 "Projekt och filer kommer att förbli tillgängliga för teammedlemmar, men "
 "organisationens inställningar kommer inte längre att gälla."
 
 #: src/app/main/data/nitrate.cljs:253
-msgid "modals.remove-team-org.text"
+msgid "modals.remove-team-organization.text"
 msgstr "Är du säker på att du vill ta bort teamet '%s' från organisationen '%s'?"
 
 #: src/app/main/data/nitrate.cljs:252
-msgid "modals.remove-team-org.title"
+msgid "modals.remove-team-organization.title"
 msgstr "TA BORT TEAMET FRÅN ORGANISATIONEN"
 
 #: src/app/main/ui/workspace/nudge.cljs:52
@@ -4321,7 +4321,7 @@ msgid "nitrate.activation-success.active-until"
 msgstr "Ditt abonnemang är aktivt till %s."
 
 #: src/app/main/ui/dashboard/subscription.cljs:195, src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:68
-msgid "nitrate.activation-success.create-org"
+msgid "nitrate.activation-success.create-organization"
 msgstr "Skapa organisation"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
@@ -4329,19 +4329,12 @@ msgid "nitrate.activation-success.enjoy"
 msgstr "Lycka till med ditt abonnemang!"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
+#, fuzzy
 msgid "nitrate.activation-success.manage-info"
 msgstr ""
 "Du kan hantera din prenumeration när som helst från prenumerationssidan i "
 "dina kontoinställningar."
 
-#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:53
-msgid "nitrate.activation-success.title"
-msgstr "Du är Business Nitrate!"
-
-#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:104
-msgid "nitrate.code-activation.footer"
-msgstr "Behöver du en kod? Kontakta oss:"
-
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
 msgid "nitrate.code-activation.input-label"
 msgstr "Ange din aktiveringskod"
@@ -4374,7 +4367,7 @@ msgstr ""
 "korrekt konfigurerat."
 
 #, unused
-msgid "nitrate.contact-sales.downgrade-org-deleted"
+msgid "nitrate.contact-sales.downgrade-organization-deleted"
 msgstr "Din organisation kommer att raderas."
 
 #, unused
@@ -4430,6 +4423,7 @@ msgid "nitrate.form.enterprise-feature-3"
 msgstr "Full frihet med öppen källkod, med den styrning din organisation behöver"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:54
+#, fuzzy
 msgid "nitrate.form.enterprise-intro"
 msgstr "Allt dina team behöver för att arbeta säkert i stor skala:"
 
@@ -4437,10 +4431,6 @@ msgstr "Allt dina team behöver för att arbeta säkert i stor skala:"
 msgid "nitrate.form.enterprise.price"
 msgstr "per medlem per månad"
 
-#: src/app/main/ui/nitrate/nitrate_form.cljs:80, src/app/main/ui/nitrate/nitrate_form.cljs:98
-msgid "nitrate.form.have-code"
-msgstr "Har du en aktiveringskod?"
-
 #: src/app/main/ui/nitrate/nitrate_form.cljs:86
 msgid "nitrate.form.see-plan"
 msgstr "Se mitt nuvarande abonnemang"
@@ -4493,7 +4483,7 @@ msgstr "Vi har skickat ett återställningsmail till"
 
 #: src/app/main/ui/auth/recovery_request.cljs:116
 msgid "not-found.login.sent-recovery-check"
-msgstr "Kontrollera din e-post och klicka på länken för att skapa ett nytt lösenord."
+msgstr "Kolla din e-post och klicka på länken för att skapa ett nytt lösenord."
 
 #: src/app/main/ui/static.cljs:174
 msgid "not-found.login.signup-free"
@@ -4612,7 +4602,7 @@ msgstr "Profilen sparades!"
 
 #: src/app/main/ui/settings/change_email.cljs:46
 msgid "notifications.validation-email-sent"
-msgstr "Verifiering e-post skickas till %s. Kontrollera din e-post!"
+msgstr "Verifieringsmejl skickas till %s. Kolla din e-post!"
 
 #, unused
 msgid "onboarding-v2.before-start.desc1"
@@ -4730,10 +4720,6 @@ msgstr ""
 "Efter att ha namngett ditt team kommer du att kunna bjuda in människor att "
 "gå med."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Ange namnet på teamet"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Skapa team"
@@ -4986,6 +4972,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Denna token existerar inte eller har raderats."
 
@@ -5040,11 +5027,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Redigera"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Allmän"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Allmän"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5550,14 +5533,6 @@ msgstr "Fäst till pixelrutnät"
 msgid "shortcuts.start-editing"
 msgstr "Börja redigera"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Starta mätningen"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Stoppa mätningen"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Ställ in miniatyrbilder"
@@ -5675,7 +5650,7 @@ msgid "shortcuts.zoom-selected"
 msgstr "Zooma in markerad"
 
 #: src/app/main/ui/dashboard/subscription.cljs:191
-msgid "subscription.banner.create-org-info"
+msgid "subscription.banner.create-organization-info"
 msgstr ""
 "Skapa en organisation och se exakt hur Enterprise fungerar. Sätt regler, "
 "hantera dina team och upptäck en ny nivå av kontroll över ditt "
@@ -5717,12 +5692,6 @@ msgstr "Unlimited-testversion"
 msgid "subscription.dashboard.banner.unlock-features"
 msgstr "Lås upp Enterprise-funktioner"
 
-#: src/app/main/ui/dashboard/subscription.cljs:203
-msgid "subscription.dashboard.banner.unlock-features-description"
-msgstr ""
-"Ställ in detaljerade behörigheter och håll din designverksamhet säker, utan "
-"att kompromissa med friheten av öppen källkod som ditt team redan älskar."
-
 #: src/app/main/ui/dashboard/subscription.cljs:208
 msgid "subscription.dashboard.banner.upgrade-nitrate"
 msgstr "Kom igång med Enterprise"
@@ -5841,6 +5810,7 @@ msgid "subscription.error.nitrate.checkout-cancelled"
 msgstr "Betalningen slutfördes inte. Försök igen när du är redo."
 
 #: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
 msgid "subscription.error.nitrate.checkout-failed"
 msgstr ""
 "Vi kunde inte starta utcheckningen. Försök igen. Om problemet kvarstår, "
@@ -5975,6 +5945,7 @@ msgid "subscription.settings.more-information"
 msgstr "Mer information"
 
 #: src/app/main/ui/settings/subscription.cljs:724
+#, fuzzy
 msgid "subscription.settings.organization-member-month"
 msgstr "org-medlem per månad"
 
@@ -5982,10 +5953,6 @@ msgstr "org-medlem per månad"
 msgid "subscription.settings.other-plans"
 msgstr "Övriga Penpot-abonnemang"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "redaktör per månad"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "organisation per månad"
@@ -6052,11 +6019,6 @@ msgstr "Tack för att du valt Penpot %s-abonnemanget!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Du är %!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Du har stöttat oss med detta abonnemang sedan: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Prova det gratis i 14 dagar"
@@ -9350,7 +9312,6 @@ msgid "workspace.tokens.num-active-sets"
 msgstr "%s aktiva uppsättningar"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "Ursprungligt värde: %s"
 
@@ -9417,7 +9378,6 @@ msgid "workspace.tokens.rename-group-name-hint"
 msgstr "Dina tokens kommer automatiskt att byta namn till %s.(suffix).(tokenName)"
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
 msgstr "Uträknat värde: %s"
 
@@ -9550,7 +9510,6 @@ msgid "workspace.tokens.themes-list"
 msgstr "Temalista"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
 msgstr "Beskrivning"
 
@@ -9990,3 +9949,131 @@ msgstr "Autosparade versioner sparas i %s dagar."
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Klicka för att stänga bana"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "Kolla din e-post!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "Vi har skickat ett verifieringsmejl till:"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:49
+msgid "errors.tokens.circular-reference"
+msgstr "Token har en cirkulär referens"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:30, src/app/main/ui/inspect/styles/style_box.cljs:32, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:262, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:274
+msgid "labels.blur-effects"
+msgstr "Oskärpaeffekter"
+
+#: src/app/main/ui/onboarding/questions.cljs:222
+msgid "onboarding.questions.team-size.101-500"
+msgstr "101 - 500"
+
+#: src/app/main/ui/onboarding/questions.cljs:220
+msgid "onboarding.questions.team-size.2-100"
+msgstr "2 - 100"
+
+#: src/app/main/ui/onboarding/questions.cljs:224
+msgid "onboarding.questions.team-size.501-1000"
+msgstr "501 - 1000"
+
+#: src/app/main/ui/onboarding/questions.cljs:218
+msgid "onboarding.questions.team-size.just-me"
+msgstr "Bara jag"
+
+#: src/app/main/ui/onboarding/questions.cljs:228
+msgid "onboarding.questions.team-size.more-than-5001"
+msgstr "5001+"
+
+#: src/app/main/ui/dashboard/subscription.cljs:229
+msgid "subscription.dashboard.banner.renew"
+msgstr "Förnya"
+
+#: src/app/main/ui/dashboard/subscription.cljs:216
+msgid "subscription.dashboard.banner.renew-subscription"
+msgstr "Förnya din prenumeration"
+
+#: src/app/main/ui/dashboard/subscription.cljs:222
+msgid "subscription.dashboard.banner.subscription-expire-days"
+msgstr "Din Enterprise-prenumeration löper ut om %s dagar (%s)"
+
+#: src/app/main/ui/dashboard/subscription.cljs:220
+msgid "subscription.dashboard.banner.subscription-expired"
+msgstr "Din Enterprise-prenumeration har löpt ut. (%s)"
+
+#: src/app/main/ui/workspace/main_menu.cljs:421
+msgid "workspace.header.menu.hide-comments"
+msgstr "Dölj kommentarer"
+
+#: src/app/main/ui/workspace/main_menu.cljs:422
+msgid "workspace.header.menu.show-comments"
+msgstr "Visa kommentarer"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:354
+msgid "workspace.libraries.colors.add-library-color"
+msgstr "Lägg till färg i biblioteket"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:371, src/app/main/ui/workspace/colorpicker/libraries.cljs:387
+msgid "workspace.libraries.colors.empty-recent-colors"
+msgstr "Det finns inga nya färger ännu"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:336
+msgid "workspace.libraries.colors.toggle-color-palette"
+msgstr "Växla färgpalett"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
+#, unused
+msgid "workspace.options.blur-effects-options.title"
+msgstr "Oskärpaeffekter"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:273
+msgid "workspace.options.blur-effects-options.title.group"
+msgstr "Grupposkärpaeffekter"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:272
+msgid "workspace.options.blur-effects-options.title.multiple"
+msgstr "Oskärpaeffekter för val"
+
+#: src/app/main/ui/onboarding/questions.cljs:226
+msgid "onboarding.questions.team-size.1001-5000"
+msgstr "1001 - 5000"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:144
+msgid "workspace.options.blur-options.blur-type-select"
+msgstr "Oskärpatyp"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:153
+msgid "workspace.options.blur-options.disabled-blur-label"
+msgstr ""
+"Bakgrundsoskärpa stöds endast i den nya renderingsmotorn. Växla över till "
+"den nya renderingsmotorn i Inställningar-menyn för att använda den här "
+"effekten"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:138
+msgid "workspace.options.blur-options.toggle-more-options"
+msgstr "Visa/dölj fler alternativ"
+
+#, unused
+msgid "workspace.toast.comments-hidden"
+msgstr "Kommentarer dolda"
+
+#, unused
+msgid "workspace.toast.comments-visible"
+msgstr "Kommentarer synliga"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:65, src/app/main/ui/workspace/top_toolbar.cljs:66, src/app/main/ui/workspace/top_toolbar.cljs:77
+msgid "workspace.toolbar.mcp"
+msgstr "MCP"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:87
+msgid "workspace.toolbar.mcp-connect-here"
+msgstr "Anslut här"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:84
+msgid "workspace.toolbar.mcp-connected"
+msgstr "MCP ansluten"
+
+#: src/app/main/ui/workspace/palette.cljs:166
+msgid "workspace.toolbar.palette-bar"
+msgstr "Palett"
diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po
index 11d791a4a7..888fb891a9 100644
--- a/frontend/translations/tr.po
+++ b/frontend/translations/tr.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
-"Language-Team: Turkish "
-"<https://hosted.weblate.org/projects/penpot/frontend/tr/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Turkish <https://hosted.weblate.org/projects/penpot/frontend/"
+"tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -98,7 +98,7 @@ msgid "auth.new-password"
 msgstr "Yeni bir parola gir"
 
 #: src/app/main/ui/auth/verify_token.cljs:53
-msgid "auth.notifications.org-invitation-accepted"
+msgid "auth.notifications.organization-invitation-accepted"
 msgstr "Artık %s organizasyonunun bir parçasısınız"
 
 #: src/app/main/ui/auth/recovery.cljs:36
@@ -294,7 +294,7 @@ msgid "common.unpublish"
 msgstr "Yayından kaldır"
 
 #: src/app/main/data/nitrate.cljs:165
-msgid "dasboard.leave-org.toast"
+msgid "dashboard.leave-organization.toast"
 msgstr "Artık %s organizasyonunun bir parçası değilsiniz."
 
 #: src/app/main/ui/dashboard/projects.cljs:90
@@ -364,25 +364,25 @@ msgid "dashboard.change-email"
 msgstr "E-posta adresini değiştir"
 
 #, unused
-msgid "dashboard.change-org-modal.accept"
+msgid "dashboard.change-organization-modal.accept"
 msgstr "TAKIMI TAŞI"
 
 #, unused
-msgid "dashboard.change-org-modal.choose"
+msgid "dashboard.change-organization-modal.choose"
 msgstr "Şuraya taşı:"
 
 #, unused
-msgid "dashboard.change-org-modal.select"
+msgid "dashboard.change-organization-modal.select"
 msgstr "Organizasyon seç"
 
 #, unused
-msgid "dashboard.change-org-modal.text"
+msgid "dashboard.change-organization-modal.text"
 msgstr ""
 "Projeler ve dosyalar takım üyeleri tarafından erişilebilir olmaya devam "
 "edecek. Takım, yeni organizasyondan yapılandırmayı alacak."
 
 #: src/app/main/data/nitrate.cljs:399, src/app/main/ui/dashboard/team_form.cljs:157
-msgid "dashboard.change-org-modal.title"
+msgid "dashboard.change-organization-modal.title"
 msgstr "Takımın organizasyonunu değiştir"
 
 #: src/app/main/ui/dashboard/deleted.cljs:316
@@ -394,7 +394,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(kopya)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Yeni organizasyon oluştur"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -816,7 +816,7 @@ msgid "dashboard.invite-profile"
 msgstr "İnsanları davet et"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:671
-msgid "dashboard.leave-org"
+msgid "dashboard.leave-organization"
 msgstr "Organizasyondan ayrıl"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
@@ -870,6 +870,7 @@ msgid "dashboard.move-to-other-team"
 msgstr "Başka takıma taşı"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
 msgid "dashboard.my-teams"
 msgstr "Takımlarım"
 
@@ -894,7 +895,7 @@ msgid "dashboard.no-matches-for"
 msgstr "\"%s\" için sonuç bulunamadı"
 
 #: src/app/main/ui/dashboard/team_form.cljs:156
-msgid "dashboard.no-org-allows-create-team.message"
+msgid "dashboard.no-organization-allows-create-team.message"
 msgstr "Hiçbir organizasyonunuza takım ekleme izniniz yok."
 
 #: src/app/main/ui/dashboard/team_form.cljs:152
@@ -964,7 +965,7 @@ msgid "dashboard.order-invitations-by-status"
 msgstr "Duruma göre sırala"
 
 #: src/app/main/data/dashboard.cljs:753
-msgid "dashboard.org-deleted"
+msgid "dashboard.organization-deleted"
 msgstr "%s organizasyonu silindi."
 
 #: src/app/main/ui/settings/password.cljs:96, src/app/main/ui/settings/password.cljs:109
@@ -1004,7 +1005,7 @@ msgid "dashboard.plugins.try-plugin"
 msgstr "Eklentiyi deneyin: "
 
 #: src/app/main/ui/dashboard/sidebar.cljs:798
-msgid "dashboard.plus-create-new-org"
+msgid "dashboard.plus-create-new-organization"
 msgstr "+ Organizasyon oluştur"
 
 #: src/app/main/data/dashboard.cljs:805
@@ -1091,36 +1092,36 @@ msgid "dashboard.section.organizations"
 msgstr "Organizasyonlar"
 
 #, unused
-msgid "dashboard.select-org-modal.accept"
+msgid "dashboard.select-organization-modal.accept"
 msgstr "ORGANİZASYONA EKLE"
 
 #, unused
-msgid "dashboard.select-org-modal.choose"
+msgid "dashboard.select-organization-modal.choose"
 msgstr "Organizasyon seç:"
 
 #: src/app/main/ui/dashboard/team.cljs:975
-msgid "dashboard.select-org-modal.external-invitations-warning"
+msgid "dashboard.select-organization-modal.external-invitations-warning"
 msgstr ""
 "\"%s\", yalnızca organizasyon üyelerinin takımlarına katılmasına izin "
 "veriyor. Organizasyon dışındaki kişilere gönderilmiş bekleyen davetler "
 "iptal edilecektir."
 
 #: src/app/main/ui/dashboard/team.cljs:971
-msgid "dashboard.select-org-modal.external-invitations-will-be-canceled"
+msgid "dashboard.select-organization-modal.external-invitations-will-be-canceled"
 msgstr "Dış kullanıcılara gönderilen bekleyen davetler iptal edilecektir."
 
 #, unused
-msgid "dashboard.select-org-modal.permission-info"
+msgid "dashboard.select-organization-modal.permission-info"
 msgstr ""
 "Burada, takım oluşturmanıza veya eklemenize izin verilen tüm "
 "organizasyonlarınızı bulabilirsiniz."
 
 #, unused
-msgid "dashboard.select-org-modal.select"
+msgid "dashboard.select-organization-modal.select"
 msgstr "Organizasyon seç"
 
 #: src/app/main/data/nitrate.cljs:342, src/app/main/ui/dashboard/team_form.cljs:155
-msgid "dashboard.select-org-modal.title"
+msgid "dashboard.select-organization-modal.title"
 msgstr "Takımı bir organizasyona ekle"
 
 #: src/app/main/ui/settings/options.cljs:66
@@ -1244,7 +1245,7 @@ msgid "dashboard.success-move-project"
 msgstr "Projen başarıyla taşındı"
 
 #, unused
-msgid "dashboard.team-belong-org"
+msgid "dashboard.team-belong-organization"
 msgstr "Bu takım artık %s organizasyonuna ait"
 
 #: src/app/main/ui/dashboard/team.cljs:1602
@@ -1256,7 +1257,7 @@ msgid "dashboard.team-members"
 msgstr "Takım üyeleri"
 
 #, unused
-msgid "dashboard.team-no-longer-belong-org"
+msgid "dashboard.team-no-longer-belong-organization"
 msgstr "Bu takım artık %s organizasyonuna ait değil"
 
 #: src/app/main/ui/dashboard/team.cljs:1609
@@ -1268,7 +1269,7 @@ msgid "dashboard.team-organization.add"
 msgstr "Organizasyona ekle"
 
 #: src/app/main/data/nitrate.cljs:341, src/app/main/data/nitrate.cljs:398
-msgid "dashboard.team-organization.add.no-valid-orgs"
+msgid "dashboard.team-organization.add.no-valid-organizations"
 msgstr "Bu takımı hiçbir organizasyonunuza ekleme izniniz yok."
 
 #: src/app/main/ui/dashboard/team.cljs:1632
@@ -1276,7 +1277,7 @@ msgid "dashboard.team-organization.change"
 msgstr "Takım organizasyonunu değiştir"
 
 #: src/app/main/ui/dashboard/team.cljs:905
-msgid "dashboard.team-organization.disabled-org-tooltip"
+msgid "dashboard.team-organization.disabled-organization-tooltip"
 msgstr "Yalnızca organizasyonunuzdaki kişiler davet edilebilir."
 
 #: src/app/main/ui/dashboard/team.cljs:1639
@@ -1342,7 +1343,7 @@ msgid "dashboard.upgrade-plan.penpot-free"
 msgstr "Penpot Ücretsiz"
 
 #, unused
-msgid "dashboard.user-no-longer-belong-org"
+msgid "dashboard.user-no-longer-belong-organization"
 msgstr "Artık %s organizasyonunun üyesi değilsiniz"
 
 #: src/app/main/ui/settings/options.cljs:109
@@ -1719,15 +1720,15 @@ msgid "errors.only-creator-can-unlock"
 msgstr "Yalnızca sürüm oluşturucu onun kilidini açabilir"
 
 #, unused
-msgid "errors.org-leave.no-valid-teams"
+msgid "errors.organization-leave.no-valid-teams"
 msgstr "Organizasyondan ayrılma sırasında bir hata oluştu. Lütfen tekrar deneyin."
 
 #, unused
-msgid "errors.org-leave.org-owner-cannot-leave"
+msgid "errors.organization-leave.organization-owner-cannot-leave"
 msgstr "Organizasyon sahibi organizasyondan ayrılamaz."
 
 #: src/app/main/ui/auth/verify_token.cljs:97
-msgid "errors.org-not-found"
+msgid "errors.organization-not-found"
 msgstr "Bu organizasyon yok"
 
 #: src/app/main/ui/settings/password.cljs
@@ -2414,7 +2415,6 @@ msgid "inspect.tabs.styles.active-themes"
 msgstr "Etkin temalar"
 
 #: src/app/main/ui/inspect/styles/style_box.cljs:75
-#, fuzzy
 msgid "inspect.tabs.styles.copy-shorthand"
 msgstr "CSS kısaltmasını panoya kopyala"
 
@@ -3737,17 +3737,17 @@ msgid "modals.add-shared-confirm.message"
 msgstr "Paylaşılmış Kütüphane olarak “%s” Ekle"
 
 #: src/app/main/data/nitrate.cljs:199
-msgid "modals.before-leave-org.message"
+msgid "modals.before-leave-organization.message"
 msgstr ""
 "Bazı takımların tek üyesi sizsiniz. Bu takımlar, projeleriyle ve "
 "dosyalarıyla birlikte silinecek."
 
 #: src/app/main/data/nitrate.cljs:198, src/app/main/ui/dashboard/change_owner.cljs:151
-msgid "modals.before-leave-org.title"
+msgid "modals.before-leave-organization.title"
 msgstr "ORGANİZASYONDAN AYRILMADAN ÖNCE"
 
 #: src/app/main/data/nitrate.cljs:202
-msgid "modals.before-leave-org.warning"
+msgid "modals.before-leave-organization.warning"
 msgstr "Tek üyesi olduğunuz tüm takımlar silinecektir."
 
 #: src/app/main/ui/workspace/nudge.cljs:59
@@ -3807,22 +3807,22 @@ msgstr "Hesabını silerek tüm projelerini ve arşivlerini kaybedeceksin."
 
 #: src/app/main/ui/settings/delete_account.cljs
 #, unused
-msgid "modals.delete-account.info.with-orgs"
+msgid "modals.delete-account.info.with-organizations"
 msgstr ""
 "Bu işlem geri alınamaz. Hesabınız, aboneliğiniz ve organizasyonlarınız "
 "hemen silinecektir. Ayrıca var olan projelerinize ve dosyalarınıza "
 "erişiminizi de kaybedeceksiniz."
 
 #: src/app/main/ui/settings/delete_account.cljs:83
-msgid "modals.delete-account.owned-orgs.list-title"
+msgid "modals.delete-account.owned-organizations.list-title"
 msgstr "Silinecek organizasyonlar"
 
 #: src/app/main/ui/settings/delete_account.cljs:98
-msgid "modals.delete-account.owned-orgs.members-count"
+msgid "modals.delete-account.owned-organizations.members-count"
 msgstr "%s üye"
 
 #: src/app/main/ui/settings/delete_account.cljs:96
-msgid "modals.delete-account.owned-orgs.teams-count"
+msgid "modals.delete-account.owned-organizations.teams-count"
 msgstr "%s takım"
 
 #: src/app/main/ui/settings/delete_account.cljs:64
@@ -3906,7 +3906,7 @@ msgid "modals.delete-font.title"
 msgstr "Yazı tipini sil"
 
 #: src/app/main/data/team.cljs:129
-msgid "modals.delete-org-team-confirm.message"
+msgid "modals.delete-organization-team-confirm.message"
 msgstr ""
 "%s organizasyonunun parçası olan bu takımı silmek istediğinizden emin "
 "misiniz?"
@@ -4054,7 +4054,7 @@ msgid "modals.invite-restricted-members.all-blocked-title"
 msgstr "Davet gönderilmedi"
 
 #: src/app/main/data/team.cljs:162
-msgid "modals.invite-restricted-members.all-org-members-in-team"
+msgid "modals.invite-restricted-members.all-organization-members-in-team"
 msgstr ""
 "Bu takıma yalnızca \"%s\" organizasyonunun üyeleri davet edilebilir ve bu "
 "kişiler zaten takımın üyeleridir. Daha fazla bilgiye ihtiyacınız varsa, "
@@ -4141,35 +4141,35 @@ msgid "modals.leave-confirm.title"
 msgstr "Takımdan ayrıl"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:158
-msgid "modals.leave-org-and-reassign.hint"
+msgid "modals.leave-organization-and-reassign.hint"
 msgstr ""
 "Bazı organizasyon takımlarının sahibi sizsiniz. Lütfen başka bir üyeyi "
 "sahibi olarak atayın."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:161
-msgid "modals.leave-org-and-reassign.hint-delete"
+msgid "modals.leave-organization-and-reassign.hint-delete"
 msgstr ""
 "Bazı takımların tek üyesi sizsiniz. Bu takımlar, projeleriyle ve "
 "dosyalarıyla birlikte silinecek."
 
 #: src/app/main/ui/dashboard/change_owner.cljs:163
-msgid "modals.leave-org-and-reassign.hint-promote"
+msgid "modals.leave-organization-and-reassign.hint-promote"
 msgstr ""
 "Ayrıca, bazı organizasyon takımlarının sahibi sizsiniz. Lütfen başka bir "
 "üyeyi sahibi olarak atayın."
 
 #: src/app/main/data/nitrate.cljs:200, src/app/main/data/nitrate.cljs:209
-msgid "modals.leave-org-confirm.accept"
+msgid "modals.leave-organization-confirm.accept"
 msgstr "Organizasyondan ayrıl"
 
 #: src/app/main/data/nitrate.cljs:208
-msgid "modals.leave-org-confirm.message"
+msgid "modals.leave-organization-confirm.message"
 msgstr ""
 "İçindeki tüm takımlara, projelere ve dosyalara erişiminizi kalıcı olarak "
 "kaybedeceksiniz."
 
 #: src/app/main/data/nitrate.cljs:207
-msgid "modals.leave-org-confirm.title"
+msgid "modals.leave-organization-confirm.title"
 msgstr "%s organizasyonundan ayrılıyor musunuz?"
 
 #: src/app/main/ui/delete_shared.cljs:54
@@ -4244,21 +4244,21 @@ msgid "modals.remove-shared-confirm.message"
 msgstr "“%s” Paylaşılan Kütüphanesini Kaldır"
 
 #: src/app/main/data/nitrate.cljs:256
-msgid "modals.remove-team-org.accept"
+msgid "modals.remove-team-organization.accept"
 msgstr "Organizasyondan kaldır"
 
 #: src/app/main/data/nitrate.cljs:254
-msgid "modals.remove-team-org.info"
+msgid "modals.remove-team-organization.info"
 msgstr ""
 "Projeler ve dosyalar takım üyeleri tarafından kullanılabilir olmaya devam "
 "edecek, ancak organizasyonun ayarları artık geçerli olmayacaktır."
 
 #: src/app/main/data/nitrate.cljs:253
-msgid "modals.remove-team-org.text"
+msgid "modals.remove-team-organization.text"
 msgstr "'%s' takımını '%s' organizasyonundan kaldırmak istediğinizden emin misiniz?"
 
 #: src/app/main/data/nitrate.cljs:252
-msgid "modals.remove-team-org.title"
+msgid "modals.remove-team-organization.title"
 msgstr "TAKIMI ORGANİZASYONDAN KALDIR"
 
 #: src/app/main/ui/workspace/nudge.cljs:52
@@ -4326,7 +4326,7 @@ msgid "nitrate.activation-success.active-until"
 msgstr "Planınız %s tarihine kadar etkindir."
 
 #: src/app/main/ui/dashboard/subscription.cljs:195, src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:68
-msgid "nitrate.activation-success.create-org"
+msgid "nitrate.activation-success.create-organization"
 msgstr "Organizasyon oluştur"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
@@ -4334,19 +4334,12 @@ msgid "nitrate.activation-success.enjoy"
 msgstr "Planınızın tadını çıkarın!"
 
 #: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
+#, fuzzy
 msgid "nitrate.activation-success.manage-info"
 msgstr ""
 "Hesap ayarlarınızdaki Abonelik sayfasından aboneliğinizi istediğiniz zaman "
 "yönetebilirsiniz."
 
-#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:53
-msgid "nitrate.activation-success.title"
-msgstr "Business Nitrate'siniz!"
-
-#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:104
-msgid "nitrate.code-activation.footer"
-msgstr "Koda mı ihtiyacınız var? Bizimle iletişime geçin:"
-
 #: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
 msgid "nitrate.code-activation.input-label"
 msgstr "Etkinleştirme kodunuzu girin"
@@ -4379,7 +4372,7 @@ msgstr ""
 "ayarlandığından emin olacağız."
 
 #, unused
-msgid "nitrate.contact-sales.downgrade-org-deleted"
+msgid "nitrate.contact-sales.downgrade-organization-deleted"
 msgstr "Organizasyonunuz silinecek."
 
 #, unused
@@ -4435,17 +4428,15 @@ msgid "nitrate.form.enterprise-feature-3"
 msgstr "Organizasyonunuzun ihtiyaç duyduğu yönetim ile tam açık kaynak özgürlüğü"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:54
+#, fuzzy
 msgid "nitrate.form.enterprise-intro"
-msgstr "Takımlarınızın güvenli ve geniş ölçekte çalışabilmesi için gereken her şey:"
+msgstr ""
+"Takımlarınızın güvenli ve geniş ölçekte çalışabilmesi için gereken her şey:"
 
 #: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
 msgid "nitrate.form.enterprise.price"
 msgstr "üye başına aylık"
 
-#: src/app/main/ui/nitrate/nitrate_form.cljs:80, src/app/main/ui/nitrate/nitrate_form.cljs:98
-msgid "nitrate.form.have-code"
-msgstr "Etkinleştirme kodunuz var mı?"
-
 #: src/app/main/ui/nitrate/nitrate_form.cljs:86
 msgid "nitrate.form.see-plan"
 msgstr "Geçerli planımı gör"
@@ -4734,10 +4725,6 @@ msgstr "Daha sonra davet edebileceksiniz"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "Takımınızı adlandırdıktan sonra, insanları katılmaya davet edebileceksiniz."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Takımın adını girin"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Takım oluşturun"
@@ -4988,6 +4975,7 @@ msgid "onboarding.welcome.alt"
 msgstr "Penpot"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
 msgid "options.deleted-token"
 msgstr "Bu token yok veya silindi."
 
@@ -5042,11 +5030,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Düzenle"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Genel"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Genel"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -5552,14 +5536,6 @@ msgstr "Piksel ızgarasına tuttur"
 msgid "shortcuts.start-editing"
 msgstr "Düzenlemeye başla"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Ölçüme başla"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Ölçümü durdur"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Küçük resimleri ayarla"
@@ -5677,7 +5653,7 @@ msgid "shortcuts.zoom-selected"
 msgstr "Seçilene yakınlaştır"
 
 #: src/app/main/ui/dashboard/subscription.cljs:191
-msgid "subscription.banner.create-org-info"
+msgid "subscription.banner.create-organization-info"
 msgstr ""
 "Bir organizasyon oluşturun ve Kurumsal planın tam olarak nasıl çalıştığını "
 "görün. Kurallar belirleyin, takımlarınızı yönetin ve tasarım iş akışınız "
@@ -5719,12 +5695,6 @@ msgstr "Sınırsız Deneyin"
 msgid "subscription.dashboard.banner.unlock-features"
 msgstr "Kurumsal plan özelliklerinin kilidini açın"
 
-#: src/app/main/ui/dashboard/subscription.cljs:203
-msgid "subscription.dashboard.banner.unlock-features-description"
-msgstr ""
-"Takımınızın çok sevdiği açık kaynak özgürlüğünden ödün vermeden, ayrıntılı "
-"izinler belirleyin ve tasarım işlemlerinizin güvenliğini sağlayın."
-
 #: src/app/main/ui/dashboard/subscription.cljs:208
 msgid "subscription.dashboard.banner.upgrade-nitrate"
 msgstr "Kurumsal planı kullanmaya başlayın"
@@ -5846,6 +5816,7 @@ msgid "subscription.error.nitrate.checkout-cancelled"
 msgstr "Ödeme işlemi tamamlanmadı. Hazır olduğunuzda lütfen tekrar deneyin."
 
 #: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
 msgid "subscription.error.nitrate.checkout-failed"
 msgstr ""
 "Ödeme işlemini başlatamadık. Lütfen tekrar deneyin. Sorun devam ederse "
@@ -5982,6 +5953,7 @@ msgid "subscription.settings.more-information"
 msgstr "Daha fazla bilgi"
 
 #: src/app/main/ui/settings/subscription.cljs:724
+#, fuzzy
 msgid "subscription.settings.organization-member-month"
 msgstr "aylık organizasyon üyesi"
 
@@ -5989,10 +5961,6 @@ msgstr "aylık organizasyon üyesi"
 msgid "subscription.settings.other-plans"
 msgstr "Diğer penpot planları"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "aylık düzenleyici"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "aylık organizasyon"
@@ -6059,11 +6027,6 @@ msgstr "Penpot %s planını seçtiğiniz için teşekkür ederiz!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "%s oldunuz!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Bu planla bizi şu zamandan beri destekliyorsunuz: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "14 gün boyunca ücretsiz deneyin"
@@ -9357,7 +9320,6 @@ msgid "workspace.tokens.num-active-sets"
 msgstr "%s etkin küme"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "Orijinal değer: %s"
 
@@ -9424,7 +9386,6 @@ msgstr ""
 "adlandırılacak"
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
 msgstr "Çözülen değer: %s"
 
@@ -9559,7 +9520,6 @@ msgid "workspace.tokens.themes-list"
 msgstr "Tema listesi"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
 msgstr "Açıklama"
 
@@ -10001,3 +9961,130 @@ msgstr "Otomatik kaydedilen sürümler %s gün boyunca saklanacaktır."
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Yolu kapatmak için tıklayın"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "E-posta kutunuza bakın!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "Şu adrese bir doğrulama e-postası gönderdik:"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:30, src/app/main/ui/inspect/styles/style_box.cljs:32, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:262, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:274
+msgid "labels.blur-effects"
+msgstr "Bulanıklık efektleri"
+
+#: src/app/main/ui/onboarding/questions.cljs:220
+msgid "onboarding.questions.team-size.2-100"
+msgstr "2 - 100"
+
+#: src/app/main/ui/onboarding/questions.cljs:224
+msgid "onboarding.questions.team-size.501-1000"
+msgstr "501 - 1000"
+
+#: src/app/main/ui/onboarding/questions.cljs:218
+msgid "onboarding.questions.team-size.just-me"
+msgstr "Yalnızca ben"
+
+#: src/app/main/ui/onboarding/questions.cljs:228
+msgid "onboarding.questions.team-size.more-than-5001"
+msgstr "5001 ve üzeri"
+
+#: src/app/main/ui/dashboard/subscription.cljs:229
+msgid "subscription.dashboard.banner.renew"
+msgstr "Yenile"
+
+#: src/app/main/ui/dashboard/subscription.cljs:216
+msgid "subscription.dashboard.banner.renew-subscription"
+msgstr "Aboneliğinizi yenileyin"
+
+#: src/app/main/ui/dashboard/subscription.cljs:222
+msgid "subscription.dashboard.banner.subscription-expire-days"
+msgstr "Kurumsal aboneliğinizin süresi %s gün sonra dolacak (%s)"
+
+#: src/app/main/ui/dashboard/subscription.cljs:220
+msgid "subscription.dashboard.banner.subscription-expired"
+msgstr "Kurumsal aboneliğinizin süresi doldu. (%s)"
+
+#: src/app/main/ui/workspace/main_menu.cljs:421
+msgid "workspace.header.menu.hide-comments"
+msgstr "Yorumları gizle"
+
+#: src/app/main/ui/workspace/main_menu.cljs:422
+msgid "workspace.header.menu.show-comments"
+msgstr "Yorumları göster"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:354
+msgid "workspace.libraries.colors.add-library-color"
+msgstr "Kütüphaneye renk ekle"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:371, src/app/main/ui/workspace/colorpicker/libraries.cljs:387
+msgid "workspace.libraries.colors.empty-recent-colors"
+msgstr "Henüz son kullanılan renkler yok"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:336
+msgid "workspace.libraries.colors.toggle-color-palette"
+msgstr "Renk paletini değiştir"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
+#, unused
+msgid "workspace.options.blur-effects-options.title"
+msgstr "Bulanıklık efektleri"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:273
+msgid "workspace.options.blur-effects-options.title.group"
+msgstr "Grup bulanıklık efektleri"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:272
+msgid "workspace.options.blur-effects-options.title.multiple"
+msgstr "Seçim bulanıklık efektleri"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:153
+msgid "workspace.options.blur-options.disabled-blur-label"
+msgstr ""
+"Arka plan bulanıklığı yalnızca yeni görselleştirmede desteklenir. Bu efekti "
+"kullanmak için Tercihler menüsünden yeni görselleştirmeye geçin"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:138
+msgid "workspace.options.blur-options.toggle-more-options"
+msgstr "Daha fazla seçenek göster/gizle"
+
+#, unused
+msgid "workspace.toast.comments-hidden"
+msgstr "Yorumlar gizlendi"
+
+#, unused
+msgid "workspace.toast.comments-visible"
+msgstr "Yorumlar görünür"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:65, src/app/main/ui/workspace/top_toolbar.cljs:66, src/app/main/ui/workspace/top_toolbar.cljs:77
+msgid "workspace.toolbar.mcp"
+msgstr "MCP"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:87
+msgid "workspace.toolbar.mcp-connect-here"
+msgstr "Buradan bağlanın"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:84
+msgid "workspace.toolbar.mcp-connected"
+msgstr "MCP bağlandı"
+
+#: src/app/main/ui/workspace/palette.cljs:166
+msgid "workspace.toolbar.palette-bar"
+msgstr "Palet çubuğu"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:49
+msgid "errors.tokens.circular-reference"
+msgstr "Tokende döngüsel referans var"
+
+#: src/app/main/ui/onboarding/questions.cljs:226
+msgid "onboarding.questions.team-size.1001-5000"
+msgstr "1001 - 5000"
+
+#: src/app/main/ui/onboarding/questions.cljs:222
+msgid "onboarding.questions.team-size.101-500"
+msgstr "101 - 500"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:144
+msgid "workspace.options.blur-options.blur-type-select"
+msgstr "Bulanıklık türü seçimi"
diff --git a/frontend/translations/ukr_UA.po b/frontend/translations/ukr_UA.po
index 93b48db66c..b1b7d05d12 100644
--- a/frontend/translations/ukr_UA.po
+++ b/frontend/translations/ukr_UA.po
@@ -1,16 +1,16 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
 "Last-Translator: Denys Kisil <ossenjoyer@proton.me>\n"
-"Language-Team: Ukrainian "
-"<https://hosted.weblate.org/projects/penpot/frontend/ukr_UA/>\n"
+"Language-Team: Ukrainian <https://hosted.weblate.org/projects/penpot/"
+"frontend/ukr_UA/>\n"
 "Language: ukr_UA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -368,7 +368,7 @@ msgid "dashboard.copy-suffix"
 msgstr "(копія)"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:371
-msgid "dashboard.create-new-org"
+msgid "dashboard.create-new-organization"
 msgstr "Створити організацію"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:439
@@ -3811,10 +3811,6 @@ msgstr ""
 "Після того, як Ви назвали свою команду, Ви зможете запрошувати людей "
 "приєднатись до неї."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Вкажіть ім'я команди"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "Створити команду"
@@ -4113,11 +4109,7 @@ msgid "shortcut-subsection.edit"
 msgstr "Редагувати"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "Загальні"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "Загальні"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -4611,14 +4603,6 @@ msgstr "Прив'язати до піскельної сітки"
 msgid "shortcuts.start-editing"
 msgstr "Почати редагування"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Почати вимірювання"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "Припинити вимірювання"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Вставити мініатюри"
@@ -4964,10 +4948,6 @@ msgstr "Більше інформації"
 msgid "subscription.settings.other-plans"
 msgstr "Інші плани Penpot"
 
-#: src/app/main/ui/settings/subscription.cljs:669, src/app/main/ui/settings/subscription.cljs:692
-msgid "subscription.settings.price-editor-month"
-msgstr "редакторів на місяць"
-
 #: src/app/main/ui/settings/subscription.cljs:708
 msgid "subscription.settings.price-organization-month"
 msgstr "організацій на місяць"
@@ -5022,11 +5002,6 @@ msgstr "Дякуємо за вибір плану %s Penpot!"
 msgid "subscription.settings.success.dialog.title"
 msgstr "Ви %s!"
 
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "Ви підтримуєте нас цим планом з: %s"
-
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
 msgstr "Спробуйте перші 14 днів безкоштовно"
@@ -8607,3 +8582,169 @@ msgstr "Автозбережені версії зберігатимуться 
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "Натисність щоб закінчити шлях"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "Перевірте поштову скриньку!"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "Лист було надіслано на:"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:376
+msgid "dashboard.go-to-admin-console"
+msgstr "Перейти до Адмін. Панелі"
+
+#: src/app/main/ui/dashboard/import.cljs:505
+msgid "dashboard.import.import-error.check-error"
+msgstr "Не вдалось перевірити файл."
+
+#: src/app/main/ui/dashboard/import.cljs:509
+msgid "dashboard.import.import-error.corrupt-file"
+msgstr "Файл здається пошкодженим."
+
+#: src/app/main/ui/dashboard/import.cljs:512
+msgid "dashboard.import.import-error.unknown-error"
+msgstr "Щось пішло не так під час обробки файлу."
+
+#: src/app/main/ui/dashboard/team.cljs:831, src/app/main/ui/dashboard/team.cljs:1136
+msgid "dashboard.invitations.no-permission"
+msgstr ""
+"Ви не маєте дозволів на створення, редагування чи видалення запрошень до "
+"команди."
+
+#: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
+msgid "dashboard.my-teams"
+msgstr "Мої команди"
+
+#: src/app/main/ui/dashboard/team_form.cljs:152
+msgid "dashboard.no-permission-create-team.message"
+msgstr ""
+"Ви не маєте дозволів на створення команд у організації %s. Для подробиць "
+"зверніться до її власника."
+
+#: src/app/main/ui/dashboard/team_form.cljs:154
+msgid "dashboard.no-permission-delete-team.message"
+msgstr ""
+"Ви не маєте дозволів на видалення команд що є частиною організації %s. Для "
+"подробить зверніться до її власника."
+
+#: src/app/main/ui/dashboard/team_form.cljs:158
+msgid "dashboard.no-permission-move-team.message"
+msgstr ""
+"Ви не маєте дозволів переміщати команди, що належать організації %s. Для "
+"подробиць зверніться до її власника."
+
+#: src/app/main/ui/dashboard/sidebar.cljs:354
+msgid "dashboard.section.organizations"
+msgstr "Організації"
+
+#: src/app/main/ui/dashboard/team.cljs:1609
+msgid "dashboard.team-organization"
+msgstr "Команда організації"
+
+#: src/app/main/ui/dashboard/team.cljs:1643
+msgid "dashboard.team-organization.add"
+msgstr "Додати до організації"
+
+#: src/app/main/ui/dashboard/team.cljs:1632
+msgid "dashboard.team-organization.change"
+msgstr "Змінити команду організації"
+
+#: src/app/main/ui/dashboard/team.cljs:1639
+msgid "dashboard.team-organization.none"
+msgstr "Ця команда не належить до жодної з організацій"
+
+#: src/app/main/ui/dashboard/team.cljs:1635
+msgid "dashboard.team-organization.remove"
+msgstr "Вилучити команду з організації"
+
+#: src/app/main/ui/settings/options.cljs:109
+msgid "dashboard.webgl-switch.beta"
+msgstr "Бета"
+
+#: src/app/main/ui/settings/options.cljs:110
+msgid "dashboard.webgl-switch.description"
+msgstr ""
+"Відмальовування WebGL може покращити швидкодію, проте функція в беті, тому є "
+"менш стабільною. Можуть зʼявлятись візуальні відмінності між полотном, "
+"експортами (SVG/PDF) та режимом перегляду."
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.disabled"
+msgstr "Вимкнено"
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.enabled"
+msgstr "Увімкнено"
+
+#: src/app/main/ui/settings/options.cljs:116
+msgid "dashboard.webgl-switch.feedback"
+msgstr "Зворотній звʼязок"
+
+#: src/app/main/ui/settings/options.cljs:112
+msgid "dashboard.webgl-switch.status"
+msgstr "Стан"
+
+#: src/app/main/ui/settings/options.cljs:108
+msgid "dashboard.webgl-switch.title"
+msgstr "Відмальовування WebGL"
+
+#: src/app/main/data/workspace/clipboard.cljs:327, src/app/main/data/workspace/clipboard.cljs:535
+msgid "errors.clipboard-api-unavailable"
+msgstr ""
+"API буферу обміну недоступне. Надайте доступ до Penpot через HTTPS, щоб "
+"увімкнути доступ"
+
+#: src/app/main/data/workspace/clipboard.cljs:321, src/app/main/data/workspace/clipboard.cljs:529
+msgid "errors.clipboard-permission-denied"
+msgstr ""
+"Відмовлено у доступі до буферу обміну. Надайте дозвіл на використання буферу "
+"обміну у Вашому бровзері аби вставити вміст"
+
+#: src/app/main/ui/dashboard/fonts.cljs:341
+msgid "errors.font-family-invalid-chars"
+msgstr ""
+"Імʼя сімейства шрифтів може мати лише літери, числа, пробіли, дефіси, нижні "
+"підкреслювання та крапки."
+
+#: src/app/main/ui/static.cljs:89
+msgid "errors.invite-email-mismatch"
+msgstr ""
+"Це запрошення для іншої поштової адреси. Вийдіть та зайдіть через запрошений "
+"обліковий запис, або попросіть у власника команди нове."
+
+#: src/app/main/ui/static.cljs:93
+msgid "errors.invite-expired"
+msgstr "Запрошення протерміноване. Запитайте власника команди про нове."
+
+#: src/app/main/ui/settings/integrations.cljs:581
+msgid "integrations.mcp-server.mcp-keys.info"
+msgstr ""
+"Це URL серверу, для якого потрібно налаштувати MCP клієнт для того щоб "
+"зʼєднати його з сервером MCP Penpot'у."
+
+#: src/app/main/ui/settings/integrations.cljs:561
+msgid "integrations.mcp-server.mcp-keys.regenerate"
+msgstr "Регенерувати ключ MCP"
+
+#: src/app/main/ui/settings/integrations.cljs:554
+msgid "integrations.mcp-server.mcp-keys.title"
+msgstr "Ключ MCP"
+
+#: src/app/main/ui/settings/integrations.cljs:562
+msgid "integrations.mcp-server.mcp-keys.tootip"
+msgstr "MCP ключ потрібен для налаштування клієнту MCP"
+
+#: src/app/main/ui/settings/integrations.cljs:517
+msgid "integrations.mcp-server.status"
+msgstr "Стан"
+
+#: src/app/main/ui/settings/integrations.cljs:537
+msgid "integrations.mcp-server.status.disabled"
+msgstr "Вимкнено"
+
+#: src/app/main/ui/settings/integrations.cljs:536
+msgid "integrations.mcp-server.status.enabled"
+msgstr "Увімкнено"
diff --git a/frontend/translations/yo.po b/frontend/translations/yo.po
index 90b330b8d2..b1885d5fe9 100644
--- a/frontend/translations/yo.po
+++ b/frontend/translations/yo.po
@@ -2168,10 +2168,6 @@ msgstr ""
 "Lẹ́yìn tí o bá ti fún ẹgbẹ́ rẹ lórúkọ, Ó le pe àwọn ènìyàn láti darapọ̀ mọ́ "
 "ẹgbẹ́."
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "Tẹ orúkọ ẹgbẹ́"
-
 #: src/app/main/ui/dashboard/projects.cljs:94, src/app/main/ui/onboarding/team_choice.cljs:199
 msgid "onboarding.choice.team-up.invite-members"
 msgstr "Fìwépè ọmọ àwọn ẹgbẹ́"
@@ -2318,10 +2314,6 @@ msgstr "Titete"
 msgid "shortcut-subsection.edit"
 msgstr "Sàtunkọ"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
-msgstr "àbùdá"
-
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
 msgid "shortcut-subsection.main-menu"
 msgstr "Akojọ ólórì aṣyn"
@@ -2746,14 +2738,6 @@ msgstr "Yaa si awon apa"
 msgid "shortcuts.snap-pixel-grid"
 msgstr "Yaa si pikseli ilana"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "Bẹ̀rẹ̀ wíwọ̀n"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "da wíwọ̀n duro"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "Se étò awòn áwòran fun fidio"
diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po
index d69e418790..a4c2eef88f 100644
--- a/frontend/translations/zh_CN.po
+++ b/frontend/translations/zh_CN.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2026-06-22 07:30+0000\n"
-"Last-Translator: Jun Fang <junfang123@gmail.com>\n"
-"Language-Team: Chinese (Simplified Han script) "
-"<https://hosted.weblate.org/projects/penpot/frontend/zh_Hans/>\n"
+"PO-Revision-Date: 2026-07-31 17:02+0000\n"
+"Last-Translator: DoubleCat <zerozedwm@gmail.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
+"projects/penpot/frontend/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 2026.7.dev0\n"
+"X-Generator: Weblate 2026.8.dev0\n"
 
 #: src/app/main/ui/auth/register.cljs:214, src/app/main/ui/static.cljs:180, src/app/main/ui/viewer/login.cljs:100
 msgid "auth.already-have-account"
@@ -18,12 +18,12 @@ msgstr "已经有账号了？"
 #: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
 #, unused
 msgid "auth.check-mail"
-msgstr "请检查您的邮箱"
+msgstr "请检查你的邮箱"
 
 #: src/app/main/ui/auth/register.cljs:277
 #, unused
 msgid "auth.check-your-email"
-msgstr "请检查您的邮箱，点击邮件中的链接来验证，然后开始使用Penpot。"
+msgstr "请检查你的邮箱，点击邮件中的链接完成验证，然后开始使用 Penpot。"
 
 #: src/app/main/ui/auth/recovery.cljs:67
 msgid "auth.confirm-password"
@@ -40,7 +40,7 @@ msgstr "只是想试试？"
 
 #: src/app/main/ui/auth/login.cljs:40
 msgid "auth.demo-warning"
-msgstr "这是一个演示服务，请【不要】用于真实工作，这些项目将被周期性地抹除。"
+msgstr "这是演示服务，请勿用于实际工作。项目会被定期清除。"
 
 #: src/app/main/ui/auth/login.cljs:197, src/app/main/ui/viewer/login.cljs:86
 msgid "auth.forgot-password"
@@ -65,27 +65,27 @@ msgstr "登录"
 
 #: src/app/main/ui/auth/login.cljs:273
 msgid "auth.login-tagline"
-msgstr "Penpot是一款自由开源的设计工具，用于「设计」和「开发」协同"
+msgstr "Penpot 是一款用于设计与代码协作的自由开源设计工具"
 
 #: src/app/main/ui/auth/login.cljs:230
 msgid "auth.login-with-github-submit"
-msgstr "GitHub登录"
+msgstr "使用 GitHub 登录"
 
 #: src/app/main/ui/auth/login.cljs:236
 msgid "auth.login-with-gitlab-submit"
-msgstr "GitLab登录"
+msgstr "使用 GitLab 登录"
 
 #: src/app/main/ui/auth/login.cljs:224
 msgid "auth.login-with-google-submit"
-msgstr "Google登录"
+msgstr "使用 Google 登录"
 
 #: src/app/main/ui/auth/login.cljs:209
 msgid "auth.login-with-ldap-submit"
-msgstr "LDAP登录"
+msgstr "使用 LDAP 登录"
 
 #: src/app/main/ui/auth/login.cljs:242
 msgid "auth.login-with-oidc-submit"
-msgstr "OpenID登录"
+msgstr "使用 OpenID 登录"
 
 #: src/app/main/ui/auth/recovery.cljs:60
 msgid "auth.new-password"
@@ -97,7 +97,7 @@ msgstr "密码修改成功"
 
 #: src/app/main/ui/auth/recovery_request.cljs:50
 msgid "auth.notifications.profile-not-verified"
-msgstr "个人资料未验证，请于验证后继续。"
+msgstr "个人资料尚未验证，请验证后再继续。"
 
 #: src/app/main/ui/auth/recovery_request.cljs:33
 msgid "auth.notifications.recovery-token-sent"
@@ -113,7 +113,7 @@ msgstr "密码"
 
 #: src/app/main/ui/auth/register.cljs:174
 msgid "auth.password-length-hint"
-msgstr "至少8位字符"
+msgstr "至少 8 个字符"
 
 #: src/app/main/ui/auth/register.cljs:259
 msgid "auth.privacy-policy"
@@ -125,7 +125,7 @@ msgstr "找回密码"
 
 #: src/app/main/ui/auth/recovery_request.cljs:95
 msgid "auth.recovery-request-subtitle"
-msgstr "我们将给你发送一封带有说明的电子邮件"
+msgstr "我们会向你发送一封包含操作说明的邮件"
 
 #: src/app/main/ui/auth/recovery_request.cljs:94
 msgid "auth.recovery-request-title"
@@ -141,11 +141,11 @@ msgstr "现在还没有账号？"
 
 #: src/app/main/ui/auth/register.cljs:352
 msgid "auth.register-account-tagline"
-msgstr "让我们知道在仪表板和电子邮件中如何称呼您。"
+msgstr "请告诉我们在仪表板和邮件中该如何称呼你。"
 
 #: src/app/main/ui/auth/register.cljs:351
 msgid "auth.register-account-title"
-msgstr "您的昵称"
+msgstr "你的姓名"
 
 #: src/app/main/ui/auth/login.cljs:290, src/app/main/ui/auth/register.cljs:186, src/app/main/ui/auth/register.cljs:339, src/app/main/ui/static.cljs:170, src/app/main/ui/viewer/login.cljs:93
 msgid "auth.register-submit"
@@ -154,7 +154,9 @@ msgstr "创建账号"
 #: src/app/main/ui/auth/register.cljs:124
 #, unused
 msgid "auth.register-tagline"
-msgstr "拥有一个Penpot的免费账户，您可以创建任意多的团队并与其他设计师和开发人员在任意数量的项目中协作。 "
+msgstr ""
+"注册免费的 Penpot 账号后，你可以创建任意数量的团队，并与其他设计师和开发者在"
+"任意数量的项目中协作。 "
 
 #: src/app/main/ui/auth/register.cljs:205
 msgid "auth.register-title"
@@ -163,25 +165,25 @@ msgstr "创建账号"
 #: src/app/main/ui/auth.cljs
 #, unused
 msgid "auth.sidebar-tagline"
-msgstr "设计与原型的开源解决方案。"
+msgstr "面向大规模数字产品开发团队的开源设计平台。"
 
 #: src/app/main/ui/auth/register.cljs:50
 #, markdown
 msgid "auth.terms-and-privacy-agreement"
-msgstr "我同意 [服务条款](%s) 与 [隐私政策](%s)。"
+msgstr "我同意[服务条款](%s)和[隐私政策](%s)。"
 
 #: src/app/main/ui/auth/register.cljs:251, src/app/main/ui/dashboard/sidebar.cljs:1221, src/app/main/ui/workspace/main_menu.cljs:205
 msgid "auth.terms-of-service"
-msgstr "服务协议"
+msgstr "服务条款"
 
 #, unused
 msgid "auth.terms-privacy-agreement"
-msgstr "创建账号意味着您认可我们的服务条例和隐私政策。"
+msgstr "创建新账号即表示你同意我们的服务条款和隐私政策。"
 
 #: src/app/main/ui/auth/register.cljs:238
 #, unused
 msgid "auth.verification-email-sent"
-msgstr "我们已经发送了一封验证邮件到"
+msgstr "我们已将验证邮件发送至"
 
 #: src/app/main/ui/auth/login.cljs:178, src/app/main/ui/auth/recovery_request.cljs:77, src/app/main/ui/auth/register.cljs:168
 msgid "auth.work-email"
@@ -202,19 +204,19 @@ msgstr "发布"
 
 #: src/app/main/ui/viewer/share_link.cljs:305, src/app/main/ui/viewer/share_link.cljs:315
 msgid "common.share-link.all-users"
-msgstr "所有Penpot用户"
+msgstr "所有 Penpot 用户"
 
 #: src/app/main/ui/viewer/share_link.cljs:199
 msgid "common.share-link.confirm-deletion-link-description"
-msgstr "你确定要移除链接？那么任何人都无法再访问它"
+msgstr "确定要移除此链接吗？移除后，任何人都无法再通过此链接访问"
 
 #: src/app/main/ui/viewer/share_link.cljs:260, src/app/main/ui/viewer/share_link.cljs:290
 msgid "common.share-link.current-tag"
-msgstr "(当前)"
+msgstr "（当前）"
 
 #: src/app/main/ui/viewer/share_link.cljs:208, src/app/main/ui/viewer/share_link.cljs:215
 msgid "common.share-link.destroy-link"
-msgstr "去除链接"
+msgstr "移除链接"
 
 #: src/app/main/ui/viewer/share_link.cljs:222
 msgid "common.share-link.get-link"
@@ -231,8 +233,8 @@ msgstr "权限管理"
 #: src/app/main/ui/viewer/share_link.cljs:278
 msgid "common.share-link.page-shared"
 msgid_plural "common.share-link.page-shared"
-msgstr[0] "1页已共享"
-msgstr[1] "%s页已共享"
+msgstr[0] "已共享 1 个页面"
+msgstr[1] "已共享 %s 个页面"
 
 #: src/app/main/ui/viewer/share_link.cljs:299
 msgid "common.share-link.permissions-can-comment"
@@ -240,7 +242,7 @@ msgstr "可评论"
 
 #: src/app/main/ui/viewer/share_link.cljs:309
 msgid "common.share-link.permissions-can-inspect"
-msgstr "可审查代码"
+msgstr "可检查代码"
 
 #: src/app/main/ui/viewer/share_link.cljs:194
 msgid "common.share-link.permissions-hint"
@@ -256,7 +258,7 @@ msgstr "可分享的链接会在此处显示"
 
 #: src/app/main/ui/viewer/share_link.cljs:304, src/app/main/ui/viewer/share_link.cljs:314
 msgid "common.share-link.team-members"
-msgstr "只团队成员"
+msgstr "仅团队成员"
 
 #: src/app/main/ui/viewer/share_link.cljs:172
 msgid "common.share-link.title"
@@ -264,11 +266,11 @@ msgstr "分享原型"
 
 #: src/app/main/ui/viewer/share_link.cljs:270
 msgid "common.share-link.view-all"
-msgstr "选择所有"
+msgstr "全选"
 
 #: src/app/main/ui/workspace/libraries.cljs:344
 msgid "common.unpublish"
-msgstr "未发布"
+msgstr "取消发布"
 
 #: src/app/main/ui/dashboard/projects.cljs:90
 msgid "dasboard.team-hero.management"
@@ -276,16 +278,16 @@ msgstr "团队管理"
 
 #: src/app/main/ui/dashboard/projects.cljs:89
 msgid "dasboard.team-hero.text"
-msgstr "Penpot是为团队协作而设计，邀请成员合作处理项目和文件"
+msgstr "Penpot 专为团队协作而设计。邀请成员共同处理项目和文件"
 
 #: src/app/main/ui/dashboard/projects.cljs:87
 msgid "dasboard.team-hero.title"
-msgstr "组建团队!"
+msgstr "组建团队！"
 
 #: src/app/main/ui/dashboard/projects.cljs
 #, unused
 msgid "dasboard.tutorial-hero.info"
-msgstr "通过有趣的实践教程学习Penpot的基础知识。"
+msgstr "通过有趣的实践教程学习 Penpot 基础知识。"
 
 #: src/app/main/ui/dashboard/projects.cljs
 #, unused
@@ -300,7 +302,7 @@ msgstr "实践教程"
 #: src/app/main/ui/dashboard/projects.cljs
 #, unused
 msgid "dasboard.walkthrough-hero.info"
-msgstr "浏览Penpot, 了解其主要功能。"
+msgstr "浏览 Penpot，了解其主要功能。"
 
 #: src/app/main/ui/dashboard/projects.cljs
 #, unused
@@ -314,11 +316,11 @@ msgstr "界面浏览"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:40
 msgid "dashboard.add-file"
-msgstr "新增文件"
+msgstr "添加文件"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:323, src/app/main/ui/workspace/main_menu.cljs:695
 msgid "dashboard.add-shared"
-msgstr "新增为共享库"
+msgstr "添加为共享库"
 
 #: src/app/main/ui/settings/profile.cljs:75
 msgid "dashboard.change-email"
@@ -338,7 +340,7 @@ msgstr "固定此版本"
 
 #: src/app/main/ui/components/context_menu_a11y.cljs:300, src/app/main/ui/dashboard/sidebar.cljs:882
 msgid "dashboard.default-team-name"
-msgstr "你的Penpot"
+msgstr "你的 Penpot"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:588, src/app/main/ui/dashboard/team_form.cljs:153
 msgid "dashboard.delete-team"
@@ -346,12 +348,12 @@ msgstr "删除团队"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:329, src/app/main/ui/workspace/main_menu.cljs:732
 msgid "dashboard.download-binary-file"
-msgstr "下载Penpot文件 (.penpot)"
+msgstr "下载 Penpot 文件（.penpot）"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:321, src/app/main/ui/workspace/main_menu.cljs:712
 #, unused
 msgid "dashboard.download-standard-file"
-msgstr "下载标准文件(.svg + .json)"
+msgstr "下载标准文件（.svg + .json）"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:305, src/app/main/ui/dashboard/project_menu.cljs:92
 msgid "dashboard.duplicate"
@@ -381,15 +383,15 @@ msgstr "还没有文件。"
 #, markdown
 msgid "dashboard.empty-placeholder-libraries"
 msgstr ""
-"添加至项目的库将显示在这里。您可以尝试共享您的文件，或从我们的[库和模板](https://penpot.app/libraries-"
-"templates)添加。"
+"添加到项目的库会显示在这里。你可以尝试共享文件，或从我们的[库和模板](https://"
+"penpot.app/libraries-templates)中添加。"
 
 #: src/app/main/ui/dashboard/placeholder.cljs
 #, markdown, unused
 msgid "dashboard.empty-placeholder-libraries-subtitle"
 msgstr ""
-"添加至项目的库将显示在这里。您可以尝试共享您的文件，或从我们的[库和模板](https://penpot.app/libraries-"
-"templates)添加。"
+"添加到项目的库会显示在这里。你可以尝试共享文件，或从我们的[库和模板](https://"
+"penpot.app/libraries-templates)中添加。"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:113
 msgid "dashboard.empty-placeholder-libraries-subtitle-viewer-role"
@@ -401,7 +403,7 @@ msgstr "还没有库。"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:58
 msgid "dashboard.empty-project.add-library"
-msgstr "新增一个库或一个模版"
+msgstr "添加库或模板"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:42, src/app/main/ui/dashboard/placeholder.cljs:133
 msgid "dashboard.empty-project.create"
@@ -409,27 +411,27 @@ msgstr "创建新文件"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:60
 msgid "dashboard.empty-project.explore"
-msgstr "浏览并新增"
+msgstr "浏览可添加的内容"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:56
 msgid "dashboard.empty-project.go-to-libraries"
-msgstr "转至库和模版"
+msgstr "前往库和模板"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:48, src/app/main/ui/dashboard/placeholder.cljs:50
 msgid "dashboard.empty-project.import"
-msgstr "导入一个文件"
+msgstr "导入文件"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:52
 msgid "dashboard.empty-project.import-penpot"
-msgstr "导入一个 .penpot 文件"
+msgstr "导入 .penpot 文件"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:44
 msgid "dashboard.empty-project.start"
-msgstr "开始构建令人惊奇的材料"
+msgstr "开始打造惊人的作品"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:281
 msgid "dashboard.export-binary-multi"
-msgstr "下载 %s Penpot文件 (.penpot)"
+msgstr "下载 %s 个 Penpot 文件（.penpot）"
 
 #: src/app/main/ui/workspace/main_menu.cljs:740
 msgid "dashboard.export-frames"
@@ -437,15 +439,15 @@ msgstr "将画板导出为 PDF 格式"
 
 #: src/app/main/ui/exports/assets.cljs:202
 msgid "dashboard.export-frames.title"
-msgstr "导出为PDF"
+msgstr "导出为 PDF"
 
 #, unused
 msgid "dashboard.export-multi"
-msgstr "导出 %s 个文件"
+msgstr "导出 %s 个 Penpot 文件"
 
 #: src/app/main/ui/exports/assets.cljs:108
 msgid "dashboard.export-multiple.selected"
-msgstr "已选择 %s / %s 元素"
+msgstr "已选择 %s/%s 个元素"
 
 #: src/app/main/ui/workspace/main_menu.cljs:723
 msgid "dashboard.export-shapes"
@@ -453,24 +455,24 @@ msgstr "导出"
 
 #: src/app/main/ui/exports/assets.cljs:179
 msgid "dashboard.export-shapes.how-to"
-msgstr "你可以在设计选项中为元素添加导出设置（位于右侧边栏底部）。"
+msgstr "你可以在设计属性中为元素添加导出设置（位于右侧边栏底部）。"
 
 #: src/app/main/ui/exports/assets.cljs:183
 msgid "dashboard.export-shapes.how-to-link"
-msgstr "关于如何使用Penpot导出。"
+msgstr "了解如何在 Penpot 中设置导出。"
 
 #: src/app/main/ui/exports/assets.cljs:178
 msgid "dashboard.export-shapes.no-elements"
-msgstr "在导出设置中没找到任何元素。"
+msgstr "没有设置为导出的元素。"
 
 #: src/app/main/ui/exports/assets.cljs:189
 msgid "dashboard.export-shapes.title"
-msgstr "导出已选中"
+msgstr "导出所选内容"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:262
 #, unused
 msgid "dashboard.export-standard-multi"
-msgstr "下载 %s 标准文件 (.svg + .json)"
+msgstr "下载 %s 个标准文件（.svg + .json）"
 
 #: src/app/main/ui/exports/files.cljs:132
 msgid "files-download-modal.description-1"
@@ -478,43 +480,45 @@ msgstr "你想导出的一个或多个文件用到了共享库。你想怎么处
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:336
 msgid "dashboard.fonts.deleted-placeholder"
-msgstr "字体已删除"
+msgstr "缺失字体"
 
 #: src/app/main/ui/dashboard/fonts.cljs:235
 msgid "dashboard.fonts.dismiss-all"
-msgstr "全部取消"
+msgstr "全部忽略"
 
 #: src/app/main/ui/dashboard/fonts.cljs:495
 msgid "dashboard.fonts.empty-placeholder"
-msgstr "您上传的自定义字体将显示在此处。"
+msgstr "你上传的自定义字体会显示在这里。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:498
 msgid "dashboard.fonts.empty-placeholder-viewer"
-msgstr "还没有定制化的字体。"
+msgstr "还没有自定义字体。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:499
 msgid "dashboard.fonts.empty-placeholder-viewer-sub"
-msgstr "一旦项目成员上传定制化的字体，它将会显示在这里。"
+msgstr "项目成员上传自定义字体后，字体会显示在这里。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:223
 msgid "dashboard.fonts.fonts-added"
 msgid_plural "dashboard.fonts.fonts-added"
-msgstr[0] "1 个字体添加成功"
-msgstr[1] "%s 个字体添加成功"
+msgstr[0] "已添加 1 个字体"
+msgstr[1] "已添加 %s 个字体"
 
 #: src/app/main/ui/dashboard/fonts.cljs:198
 #, markdown
 msgid "dashboard.fonts.hero-text1"
 msgstr ""
-"你在此上传的任何网络字体文件，将会被添加至本团队下文件的字体属性中的可用字体族列表中。拥有相同字体族名称的字体文件，将会按照字体族进行分组。你可以上传以"
-"下格式的字体文件：**TTF，OTF和WOFF**（你只需要上传其中一种即可）。"
+"你在这里上传的任何 Web 字体都会添加到此团队所有文件的文本属性中的可用字体家族"
+"列表。字体家族名称相同的字体会归为**一个字体家族**。你可以上传以下格式的字体"
+"：**TTF、OTF 和 WOFF**（只需上传其中一种格式）。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:211
 #, markdown
 msgid "dashboard.fonts.hero-text2"
 msgstr ""
-"你应当只向Penpot上传你所拥有的字体，或是你持有使用许可的字体。点击[Penpot服务条例](https://penpot.app/terms."
-"html)查看更多有关内容权利的章节。或许你也想了解一下[字体许可授权] (https://www.typography.com/faq)。"
+"你应当只向 Penpot 上传你拥有或获准使用的字体。请参阅 [Penpot 服务条款](%s)中"
+"的“内容权利”章节了解更多信息。你也可以阅读有关[字体许可](https://"
+"www.typography.com/faq)的信息。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:231
 msgid "dashboard.fonts.upload-all"
@@ -524,25 +528,25 @@ msgstr "全部上传"
 #, markdown
 msgid "dashboard.fonts.warning-text"
 msgstr ""
-"我们在你的字体中检测到一个可能的问题，与不同操作系统的垂直度量有关。为了检查它，你可以使用字体垂直度量服务，如[这个](https://"
-"vertical-metrics.netlify.app/)。此外，我们建议使用[Transfonter](https://transfonter."
-"org/)来生成网络字体并修复错误。 "
+"我们检测到你的字体可能存在与不同操作系统的垂直度量有关的问题。你可以使用[此字"
+"体垂直度量服务](https://vertical-metrics.netlify.app/)进行检查。此外，我们建"
+"议使用 [Transfonter](https://transfonter.org/)生成网络字体并修复错误。 "
 
 #: src/app/main/ui/dashboard/import.cljs:463, src/app/main/ui/dashboard/project_menu.cljs:109
 msgid "dashboard.import"
-msgstr "导入文件"
+msgstr "导入 Penpot 文件"
 
 #: src/app/main/ui/dashboard/import.cljs:290, src/app/worker/import.cljs:138, src/app/worker/import.cljs:141
 msgid "dashboard.import.analyze-error"
-msgstr "文件无法导入"
+msgstr "糟糕！无法导入此文件"
 
 #, unused
 msgid "dashboard.import.analyze-error.components-v2"
-msgstr "文件已启用“组件v2”功能，但这个团队尚未支持该功能。"
+msgstr "此文件启用了组件 v2，但该团队尚不支持此功能。"
 
 #: src/app/main/ui/dashboard.cljs:259
 msgid "dashboard.import.bad-url"
-msgstr "导入失败，模版 URL 不正确"
+msgstr "导入失败。模板 URL 不正确"
 
 #: src/app/main/ui/dashboard.cljs:241
 #, unused
@@ -552,11 +556,11 @@ msgstr "导入失败，请重试"
 #: src/app/main/ui/dashboard/import.cljs:292
 #, unused
 msgid "dashboard.import.import-error"
-msgstr "文件导入过程中出现未知问题，导入失败。"
+msgstr "导入文件时出现问题。文件未导入。"
 
 #: src/app/main/ui/dashboard/import.cljs:484
 msgid "dashboard.import.import-error.disclaimer"
-msgstr "不是所有文件都被导入"
+msgstr "部分文件未能导入"
 
 #: src/app/main/ui/dashboard/import.cljs:488
 msgid "dashboard.import.import-error.message1"
@@ -569,48 +573,48 @@ msgstr "有错误的文件将不会被上传。"
 #: src/app/main/ui/dashboard/import.cljs:478
 msgid "dashboard.import.import-message"
 msgid_plural "dashboard.import.import-message"
-msgstr[0] "1个文件导入成功。"
-msgstr[1] "%s 个文件导入成功。"
+msgstr[0] "已成功导入 1 个文件。"
+msgstr[1] "已成功导入 %s 个文件。"
 
 #: src/app/main/ui/dashboard/import.cljs:473
 msgid "dashboard.import.import-warning"
-msgstr "一些包含无效对象的文档已被移除。"
+msgstr "部分文件包含无效对象，这些对象已被移除。"
 
 #: src/app/main/ui/dashboard.cljs:260
 msgid "dashboard.import.no-perms"
-msgstr "你没有权限导入到此团队"
+msgstr "你没有权限将文件导入此团队"
 
 #: src/app/main/ui/dashboard/import.cljs:125
 msgid "dashboard.import.progress.process-colors"
-msgstr "处理颜色中"
+msgstr "正在处理颜色"
 
 #: src/app/main/ui/dashboard/import.cljs:134, src/app/main/ui/dashboard/import.cljs:137
 msgid "dashboard.import.progress.process-components"
-msgstr "处理组件中"
+msgstr "正在处理组件"
 
 #: src/app/main/ui/dashboard/import.cljs:131
 msgid "dashboard.import.progress.process-media"
-msgstr "处理视频中"
+msgstr "正在处理媒体"
 
 #: src/app/main/ui/dashboard/import.cljs:122
 msgid "dashboard.import.progress.process-page"
-msgstr "处理页面中：%s"
+msgstr "正在处理页面：%s"
 
 #: src/app/main/ui/dashboard/import.cljs:128
 msgid "dashboard.import.progress.process-typographies"
-msgstr "处理字体中"
+msgstr "正在处理排版"
 
 #: src/app/main/ui/dashboard/import.cljs:116
 msgid "dashboard.import.progress.upload-data"
-msgstr "数据上传中"
+msgstr "正在将数据上传到服务器（%s/%s）"
 
 #: src/app/main/ui/dashboard/import.cljs:119
 msgid "dashboard.import.progress.upload-media"
-msgstr "文件上传中"
+msgstr "正在上传文件：%s"
 
 #: src/app/main/ui/dashboard/team.cljs:137, src/app/main/ui/dashboard/team.cljs:829
 msgid "dashboard.invite-profile"
-msgstr "邀请people"
+msgstr "邀请成员"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:570, src/app/main/ui/dashboard/sidebar.cljs:577, src/app/main/ui/dashboard/sidebar.cljs:582, src/app/main/ui/dashboard/team.cljs:433
 msgid "dashboard.leave-team"
@@ -622,7 +626,7 @@ msgstr "库和模板"
 
 #: src/app/main/ui/dashboard/templates.cljs:263
 msgid "dashboard.libraries-and-templates.description"
-msgstr "这里你有一些可以添加至你项目的库和模版"
+msgstr "这里列出了可以添加到项目的库和模板"
 
 #: src/app/main/ui/dashboard/templates.cljs:167
 msgid "dashboard.libraries-and-templates.explore"
@@ -634,11 +638,11 @@ msgstr "导入模板时发生错误。模板未导入成功。"
 
 #: src/app/main/ui/dashboard/libraries.cljs:68
 msgid "dashboard.libraries-title"
-msgstr "共享库"
+msgstr "库"
 
 #: src/app/main/ui/dashboard/placeholder.cljs:142
 msgid "dashboard.loading-files"
-msgstr "正在加载文档…"
+msgstr "正在加载文件…"
 
 #: src/app/main/ui/dashboard/fonts.cljs:489
 msgid "dashboard.loading-fonts"
@@ -646,7 +650,7 @@ msgstr "正在加载字体…"
 
 #: src/app/main/data/comments.cljs:481
 msgid "dashboard.mark-all-as-read.success"
-msgstr "标记所有通知为已读"
+msgstr "已将所有通知标为已读"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:313, src/app/main/ui/dashboard/project_menu.cljs:101
 msgid "dashboard.move-to"
@@ -662,7 +666,7 @@ msgstr "移动到其他团队"
 
 #: src/app/main/ui/dashboard/files.cljs:106, src/app/main/ui/dashboard/projects.cljs:253, src/app/main/ui/dashboard/projects.cljs:254
 msgid "dashboard.new-file"
-msgstr "+ 新文档"
+msgstr "+ 新文件"
 
 #: src/app/main/data/dashboard.cljs:539, src/app/main/data/dashboard.cljs:651
 msgid "dashboard.new-file-prefix"
@@ -682,7 +686,7 @@ msgstr "没有找到“%s”的匹配项"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1103
 msgid "dashboard.no-projects-placeholder"
-msgstr "被钉住的项目会显示在这儿"
+msgstr "固定的项目会显示在这里"
 
 #: src/app/main/ui/dashboard/comments.cljs:89
 msgid "dashboard.notifications"
@@ -690,11 +694,11 @@ msgstr "通知"
 
 #: src/app/main/ui/auth/verify_token.cljs:36
 msgid "dashboard.notifications.email-changed-successfully"
-msgstr "已经成功更新你的电子邮件"
+msgstr "电子邮箱地址已成功更新"
 
 #: src/app/main/ui/auth/verify_token.cljs:30
 msgid "dashboard.notifications.email-verified-successfully"
-msgstr "已经成功验证你的电子邮件"
+msgstr "电子邮箱地址已成功验证"
 
 #: src/app/main/data/profile.cljs:281
 msgid "dashboard.notifications.notifications-saved"
@@ -702,7 +706,7 @@ msgstr "通知设置已更新"
 
 #: src/app/main/ui/settings/password.cljs:38
 msgid "dashboard.notifications.password-saved"
-msgstr "已经成功保存密码！"
+msgstr "密码已成功保存！"
 
 #: src/app/main/ui/dashboard/comments.cljs:43
 msgid "dashboard.notifications.view"
@@ -710,7 +714,7 @@ msgstr "查看通知"
 
 #: src/app/main/ui/dashboard/team.cljs:1658
 msgid "dashboard.num-of-members"
-msgstr "成员%s人"
+msgstr "%s 名成员"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:296
 msgid "dashboard.open-in-new-tab"
@@ -730,19 +734,19 @@ msgstr "你现在是此团队的管理员。"
 
 #: src/app/main/data/common.cljs:191
 msgid "dashboard.permissions-change.editor"
-msgstr "你现在是此团队的编辑人员。"
+msgstr "你现在是此团队的编辑者。"
 
 #: src/app/main/data/common.cljs:193
 msgid "dashboard.permissions-change.owner"
-msgstr "你现在是此团队的拥有者。"
+msgstr "你现在是此团队的所有者。"
 
 #: src/app/main/data/common.cljs:190
 msgid "dashboard.permissions-change.viewer"
-msgstr "你现在是此团队的查看人员。"
+msgstr "你现在是此团队的查看者。"
 
 #: src/app/main/ui/dashboard/pin_button.cljs:22, src/app/main/ui/dashboard/project_menu.cljs:96
 msgid "dashboard.pin-unpin"
-msgstr "钉到侧边栏/取消钉住"
+msgstr "固定到侧边栏/取消固定"
 
 #: src/app/main/ui/dashboard.cljs:223
 msgid "dashboard.plugins.bad-url"
@@ -754,7 +758,7 @@ msgstr "不能解析插件清单"
 
 #: src/app/main/ui/dashboard.cljs:184
 msgid "dashboard.plugins.try-plugin"
-msgstr "尝试插件 "
+msgstr "尝试插件： "
 
 #: src/app/main/ui/dashboard/deleted.cljs:63, src/app/main/ui/dashboard/projects.cljs:56
 msgid "dashboard.projects-title"
@@ -762,7 +766,7 @@ msgstr "项目"
 
 #: src/app/main/ui/settings/profile.cljs:86
 msgid "dashboard.remove-account"
-msgstr "希望注销您的账号？"
+msgstr "想要删除账号？"
 
 #: src/app/main/ui/workspace/header.cljs, src/app/main/ui/dashboard/file_menu.cljs
 #, unused
@@ -795,7 +799,7 @@ msgstr "选择界面主题"
 
 #: src/app/main/ui/settings/options.cljs:76
 msgid "dashboard.select-ui-theme.dark"
-msgstr "Penpot 暗黑模式（缺省）"
+msgstr "Penpot 深色模式（默认）"
 
 #: src/app/main/ui/settings/options.cljs:77
 msgid "dashboard.select-ui-theme.light"
@@ -867,7 +871,7 @@ msgstr "通知"
 
 #: src/app/main/ui/dashboard/projects.cljs:305
 msgid "dashboard.show-all-files"
-msgstr "显示全部文档"
+msgstr "显示所有文件"
 
 #: src/app/main/ui/workspace/main_menu.cljs:713
 msgid "dashboard.show-version-history"
@@ -876,8 +880,8 @@ msgstr "版本历史"
 #: src/app/main/ui/dashboard/file_menu.cljs:99
 msgid "dashboard.success-delete-file"
 msgid_plural "dashboard.success-delete-file"
-msgstr[0] "您的文件已被成功删除"
-msgstr[1] "您的多个文件已被成功删除"
+msgstr[0] "文件已成功删除"
+msgstr[1] "文件已成功删除"
 
 #: src/app/main/ui/dashboard/project_menu.cljs:63
 msgid "dashboard.success-delete-project"
@@ -886,8 +890,8 @@ msgstr "成功删除了项目"
 #: src/app/main/ui/dashboard/file_menu.cljs:94
 msgid "dashboard.success-duplicate-file"
 msgid_plural "dashboard.success-delete-file"
-msgstr[0] "您的文件已被成功复制"
-msgstr[1] "您的多个文件已被成功复制"
+msgstr[0] "文件已成功复制"
+msgstr[1] "文件已成功复制"
 
 #: src/app/main/ui/dashboard/project_menu.cljs:35
 msgid "dashboard.success-duplicate-project"
@@ -919,7 +923,7 @@ msgstr "团队项目"
 
 #: src/app/main/ui/dashboard/templates.cljs:132
 msgid "dashboard.template.add-to-project"
-msgstr "添加至您的项目"
+msgstr "添加到你的项目"
 
 #: src/app/main/ui/settings/options.cljs:71
 msgid "dashboard.theme-change"
@@ -931,7 +935,7 @@ msgstr "搜索结果"
 
 #: src/app/main/ui/dashboard/search.cljs:66
 msgid "dashboard.type-something"
-msgstr "输入关键词进行搜索"
+msgstr "输入内容以搜索"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:320, src/app/main/ui/workspace/main_menu.cljs:687
 msgid "dashboard.unpublish-shared"
@@ -939,11 +943,11 @@ msgstr "取消发布库"
 
 #: src/app/main/ui/settings/options.cljs:82
 msgid "dashboard.update-settings"
-msgstr "保存设置"
+msgstr "更新设置"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1328
 msgid "dashboard.upgrade-plan.no-limits"
-msgstr "无创作能力限制"
+msgstr "创意不设限"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1326
 msgid "dashboard.upgrade-plan.penpot-free"
@@ -951,15 +955,15 @@ msgstr "Penpot 免费"
 
 #: src/app/main/ui/dashboard/team.cljs:1338
 msgid "dashboard.webhooks.active"
-msgstr "处于活跃状态"
+msgstr "已启用"
 
 #: src/app/main/ui/dashboard/team.cljs:1339
 msgid "dashboard.webhooks.active.explain"
-msgstr "当这个webhook被触发时，事件细节将被传递"
+msgstr "触发此 Webhook 时会传递事件详情"
 
 #: src/app/main/ui/dashboard/team.cljs:1381
 msgid "dashboard.webhooks.cant-edit"
-msgstr "您只能删除或修改由您创建的 webhooks。"
+msgstr "你只能删除或修改自己创建的 Webhook。"
 
 #: src/app/main/ui/dashboard/team.cljs:1329
 msgid "dashboard.webhooks.content-type"
@@ -967,27 +971,29 @@ msgstr "内容类型"
 
 #: src/app/main/ui/dashboard/team.cljs:1361
 msgid "dashboard.webhooks.create"
-msgstr "创建webhook"
+msgstr "创建 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1264
 msgid "dashboard.webhooks.create.success"
-msgstr "Webhook创建成功。"
+msgstr "Webhook 创建成功。"
 
 #: src/app/main/ui/dashboard/team.cljs:1358
 msgid "dashboard.webhooks.description"
-msgstr "Webhooks是一种简单的方式，允许其他网站和应用程序在Penpot的某些事件发生时得到通知。我们将发送一个POST请求到你提供的每个URL。"
+msgstr ""
+"Webhook 是一种让其他网站和应用在 Penpot 中发生特定事件时收到通知的简便方式。"
+"我们会向你提供的每个 URL 发送 POST 请求。"
 
 #: src/app/main/ui/dashboard/team.cljs:1485
 msgid "dashboard.webhooks.empty.add-one"
-msgstr "按“添加webhook”按钮添加一个。"
+msgstr "点击“添加 Webhook”按钮即可添加。"
 
 #: src/app/main/ui/dashboard/team.cljs:1484
 msgid "dashboard.webhooks.empty.no-webhooks"
-msgstr "到目前为止还没有创建webhook。"
+msgstr "尚未创建 Webhook。"
 
 #, unused
 msgid "dashboard.webhooks.update.success"
-msgstr "Webhook成功更新。"
+msgstr "Webhook 更新成功。"
 
 #: src/app/main/ui/settings.cljs:34
 msgid "dashboard.your-account-title"
@@ -1003,11 +1009,11 @@ msgstr "你的姓名"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:40, src/app/main/ui/dashboard/fonts.cljs:46, src/app/main/ui/dashboard/libraries.cljs:55, src/app/main/ui/dashboard/projects.cljs:352, src/app/main/ui/dashboard/search.cljs:47, src/app/main/ui/dashboard/sidebar.cljs:411, src/app/main/ui/dashboard/team.cljs:616, src/app/main/ui/dashboard/team.cljs:1191, src/app/main/ui/dashboard/team.cljs:1471, src/app/main/ui/dashboard/team.cljs:1577
 msgid "dashboard.your-penpot"
-msgstr "你的Penpot"
+msgstr "你的 Penpot"
 
 #: src/app/main/ui/alert.cljs:36
 msgid "ds.alert-ok"
-msgstr "好"
+msgstr "确定"
 
 #: src/app/main/ui/alert.cljs:35, src/app/main/ui/alert.cljs:38
 msgid "ds.alert-title"
@@ -1027,7 +1033,7 @@ msgstr "取消"
 
 #: src/app/main/ui/confirm.cljs:43, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:157, src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:102
 msgid "ds.confirm-ok"
-msgstr "OK"
+msgstr "确定"
 
 #: src/app/main/ui/confirm.cljs:41, src/app/main/ui/confirm.cljs:45
 msgid "ds.confirm-title"
@@ -1035,7 +1041,7 @@ msgstr "你确定？"
 
 #: src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs:24
 msgid "ds.inputs.numeric-input.no-applicable-tokens"
-msgstr "活动集合或主题中无可用token。"
+msgstr "已启用的令牌集或主题中没有适用的令牌。"
 
 #: src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs:25
 msgid "ds.inputs.numeric-input.no-matches"
@@ -1043,15 +1049,15 @@ msgstr "无匹配项。"
 
 #: src/app/main/ui/ds/controls/numeric_input.cljs:728, src/app/main/ui/workspace/sidebar/options/menus/text.cljs:511, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:146, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:270
 msgid "ds.inputs.numeric-input.open-token-list-dropdown"
-msgstr "打开token列表"
+msgstr "打开令牌列表"
 
 #: src/app/main/data/auth.cljs:346
 msgid "errors.auth-provider-not-allowed"
-msgstr "认证提供者不允许访问此个人设定"
+msgstr "此个人资料不允许使用该身份验证提供商"
 
 #: src/app/main/data/auth.cljs:193
 msgid "errors.auth-provider-not-configured"
-msgstr "没有配置身份认证服务源."
+msgstr "未配置身份验证提供商。"
 
 #: src/app/main/errors.cljs:238
 msgid "errors.auth.unable-to-login"
@@ -1059,11 +1065,11 @@ msgstr "你似乎还没有登录或会话已过期。"
 
 #: src/app/main/data/fonts.cljs:256, src/app/main/ui/dashboard/fonts.cljs:134, src/app/main/ui/dashboard/fonts.cljs:178
 msgid "errors.bad-font"
-msgstr "无法加载%s字体"
+msgstr "无法加载字体 %s"
 
 #: src/app/main/data/fonts.cljs:255
 msgid "errors.bad-font-plural"
-msgstr "无法加载%s等字体"
+msgstr "无法加载字体 %s"
 
 #: src/app/main/data/workspace/media.cljs:226
 msgid "errors.cannot-upload"
@@ -1075,23 +1081,23 @@ msgstr "超出字符限制"
 
 #: src/app/main/data/workspace/clipboard.cljs:541
 msgid "errors.clipboard-not-implemented"
-msgstr "你的浏览器不支持该操作"
+msgstr "你的浏览器不支持此操作"
 
 #: src/app/main/errors.cljs:346
 msgid "errors.comment-error"
-msgstr "评论有错误"
+msgstr "处理评论时出错"
 
 #: src/app/main/errors.cljs:414
 msgid "errors.deprecated"
-msgstr "抱歉！这是一个使用了已弃用的 Penpot 资源类型的旧文件，您无法打开它。"
+msgstr "抱歉！这是一个使用已弃用 Penpot 素材类型的旧文件，你无法打开它。"
 
 #: src/app/main/errors.cljs:417
 msgid "errors.deprecated.contact.after"
-msgstr "所以我们可以帮助你。"
+msgstr "链接并向我们说明情况。"
 
 #: src/app/main/errors.cljs:415
 msgid "errors.deprecated.contact.before"
-msgstr "虽然Penpot不再支持此类型的资源，但您可以"
+msgstr "虽然 Penpot 不再支持此类素材，但如需帮助，请点击下方的"
 
 #: src/app/main/errors.cljs:416
 msgid "errors.deprecated.contact.text"
@@ -1103,11 +1109,11 @@ msgstr "无法将父集放置到自己的子路径中。"
 
 #: src/app/main/ui/auth/register.cljs:103, src/app/main/ui/auth/verify_token.cljs:109, src/app/main/ui/settings/change_email.cljs:29
 msgid "errors.email-already-exists"
-msgstr "电子邮件已被占用"
+msgstr "此电子邮箱已被使用"
 
 #: src/app/main/ui/auth/verify_token.cljs:114
 msgid "errors.email-already-validated"
-msgstr "电子邮件已经验证通过。"
+msgstr "电子邮箱已验证。"
 
 #: src/app/main/ui/auth/register.cljs:107, src/app/main/ui/settings/password.cljs:29
 msgid "errors.email-as-password"
@@ -1115,7 +1121,7 @@ msgstr "密码不能为邮箱地址"
 
 #: src/app/main/ui/auth/register.cljs:88
 msgid "errors.email-does-not-match-invitation"
-msgstr "邮件和此邀请不匹配。"
+msgstr "电子邮箱与邀请不匹配。"
 
 #: src/app/main/data/auth.cljs:348, src/app/main/ui/auth/register.cljs:94, src/app/main/ui/dashboard/team.cljs:223
 msgid "errors.email-domain-not-allowed"
@@ -1123,15 +1129,15 @@ msgstr "不允许使用此域名"
 
 #: src/app/main/ui/auth/recovery_request.cljs:57, src/app/main/ui/auth/register.cljs:97, src/app/main/ui/auth/register.cljs:100, src/app/main/ui/dashboard/team.cljs:709, src/app/main/ui/settings/change_email.cljs:37
 msgid "errors.email-has-permanent-bounces"
-msgstr "电子邮件“%s”收到了非常多的永久退信报告。"
+msgstr "电子邮箱 «%s» 有多次永久退信记录。"
 
 #: src/app/main/ui/dashboard/team.cljs:219, src/app/main/ui/dashboard/team.cljs:1062, src/app/main/ui/onboarding/team_choice.cljs:121
 msgid "errors.email-spam-or-permanent-bounces"
-msgstr "此邮箱[%s]已被标记为垃圾邮件或已被永久拉黑。"
+msgstr "电子邮箱 «%s» 已被举报为垃圾邮件来源或有永久退信记录。"
 
 #: src/app/main/errors.cljs:391
 msgid "errors.feature-mismatch"
-msgstr "看起来你正在打开一个启用了'%s'功能的文件，但当前penpot版本并不支持该功能或已将其禁用。"
+msgstr "你打开的文件启用了“%s”功能，但当前 Penpot 版本不支持或未启用此功能。"
 
 #: src/app/main/errors.cljs:395, src/app/main/errors.cljs:409
 msgid "errors.feature-not-supported"
@@ -1139,7 +1145,7 @@ msgstr "不支持功能“%s”。"
 
 #, unused
 msgid "errors.field-min-length"
-msgstr "至少需要包含1个字符。"
+msgstr "至少需要包含 1 个字符。"
 
 #: src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:471
 msgid "errors.field-missing"
@@ -1152,11 +1158,13 @@ msgstr "名称必须包含除空格外的其他字符。"
 
 #: src/app/main/errors.cljs:387
 msgid "errors.file-feature-mismatch"
-msgstr "看起来当前启用的功能，与正在打开的文件所依赖的功能不匹配。在打开文件前，需要应用对“%s”修改。"
+msgstr ""
+"当前启用的功能与要打开的文件所需功能不匹配。必须先对“%s”应用迁移，才能打开此"
+"文件。"
 
 #: src/app/main/data/auth.cljs:354, src/app/main/errors.cljs:190, src/app/main/ui/auth/login.cljs:103, src/app/main/ui/auth/register.cljs:112, src/app/main/ui/auth/register.cljs:304, src/app/main/ui/auth/verify_token.cljs:119, src/app/main/ui/dashboard/fonts.cljs:386, src/app/main/ui/dashboard/team.cljs:227, src/app/main/ui/dashboard/team.cljs:1065, src/app/main/ui/onboarding/team_choice.cljs:124, src/app/main/ui/settings/feedback.cljs:84, src/app/main/ui/settings/integrations.cljs:156, src/app/main/ui/workspace/main_menu.cljs:971
 msgid "errors.generic"
-msgstr "发生了某种错误。"
+msgstr "出现了问题。"
 
 #: src/app/main/errors.cljs:200
 #, unused
@@ -1165,7 +1173,7 @@ msgstr "内部断言错误"
 
 #: src/app/main/errors.cljs:325
 msgid "errors.internal-worker-error"
-msgstr "web worker 出错。"
+msgstr "Web Worker 出错。"
 
 #: src/app/main/ui/components/color_input.cljs:51
 msgid "errors.invalid-color"
@@ -1183,7 +1191,7 @@ msgstr "请输入有效的电子邮件"
 
 #: src/app/main/ui/settings/change_email.cljs:62
 msgid "errors.invalid-email-confirmation"
-msgstr "确认电子邮件必须保持一致"
+msgstr "两次输入的电子邮箱必须一致"
 
 #: src/app/main/ui/auth/recovery.cljs:32
 msgid "errors.invalid-recovery-token"
@@ -1204,15 +1212,15 @@ msgstr "此邀请可能已取消或已过期。"
 
 #: src/app/main/ui/auth/login.cljs:88
 msgid "errors.ldap-disabled"
-msgstr "LDAP身份验证已禁用。"
+msgstr "LDAP 身份验证已禁用。"
 
 #: src/app/main/errors.cljs:403, src/app/main/ui/dashboard/team.cljs:214, src/app/main/ui/onboarding/team_choice.cljs:116
 msgid "errors.max-quota-reached"
-msgstr "您已达到“%s”报价。与支持人员联系。"
+msgstr "你已达到“%s”配额。请联系支持团队。"
 
 #: src/app/main/ui/dashboard/team.cljs:210, src/app/main/ui/dashboard/team.cljs:1053, src/app/main/ui/onboarding/team_choice.cljs:112
 msgid "errors.maximum-invitations-by-request-reached"
-msgstr "已达到单次请求中可邀请的电子邮件数量上限（%s）"
+msgstr "已达到单次请求可邀请的电子邮箱数量上限（%s）"
 
 #: src/app/main/data/workspace/media.cljs:217
 msgid "errors.media-too-large"
@@ -1228,7 +1236,7 @@ msgstr "该图片好像不可用。"
 
 #: src/app/main/ui/dashboard/team.cljs:704
 msgid "errors.member-is-muted"
-msgstr "你邀请的人设置了邮件免打扰（报告垃圾邮件或者多次退信）。"
+msgstr "受邀用户已停用邮件通知（曾举报垃圾邮件或多次发生退信）。"
 
 #: src/app/main/errors.cljs:377
 msgid "errors.migration-in-progress"
@@ -1245,24 +1253,24 @@ msgstr "只有版本创建者可以解除锁定"
 #: src/app/main/ui/settings/password.cljs
 #, unused
 msgid "errors.password-invalid-confirmation"
-msgstr "确认密码必须保持一致"
+msgstr "两次输入的密码必须一致"
 
 #: src/app/main/ui/settings/password.cljs
 #, unused
 msgid "errors.password-too-short"
-msgstr "密码最少需要8位字符"
+msgstr "密码至少需要 8 个字符"
 
 #: src/app/main/errors.cljs:267
 msgid "errors.paste-data-validation"
-msgstr "剪切板中为无效数据"
+msgstr "剪贴板中的数据无效"
 
 #: src/app/main/data/auth.cljs:344, src/app/main/ui/auth/login.cljs:84, src/app/main/ui/auth/login.cljs:92
 msgid "errors.profile-blocked"
-msgstr "个人资料已被屏蔽"
+msgstr "此账号已被封禁"
 
 #: src/app/main/ui/auth/recovery_request.cljs:53, src/app/main/ui/dashboard/team.cljs:205, src/app/main/ui/dashboard/team.cljs:700, src/app/main/ui/dashboard/team.cljs:1048, src/app/main/ui/onboarding/team_choice.cljs:108, src/app/main/ui/settings/change_email.cljs:33
 msgid "errors.profile-is-muted"
-msgstr "你设置了邮件免打扰（报告垃圾邮件或者多次退信）。"
+msgstr "你的邮件通知已停用（曾举报垃圾邮件或多次发生退信）。"
 
 #: src/app/main/data/auth.cljs:342, src/app/main/ui/auth/register.cljs:91
 msgid "errors.registration-disabled"
@@ -1270,7 +1278,7 @@ msgstr "当前禁止注册。"
 
 #: src/app/main/errors.cljs:337
 msgid "errors.svg-parser.invalid-svg"
-msgstr "SVG无效或格式错误"
+msgstr "SVG 无效或格式错误"
 
 #: src/app/main/errors.cljs:382
 msgid "errors.team-feature-mismatch"
@@ -1278,32 +1286,32 @@ msgstr "检测到不兼容功能“%s”"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:469, src/app/main/ui/dashboard/team.cljs:474
 msgid "errors.team-leave.insufficient-members"
-msgstr "离开团队后成员不足，您可能要将其删除。"
+msgstr "团队成员不足，无法退出。你可能需要删除此团队。"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:472, src/app/main/ui/dashboard/team.cljs:477
 msgid "errors.team-leave.member-does-not-exists"
-msgstr "您尝试分配的成员不存在。"
+msgstr "你尝试指定的成员不存在。"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:475, src/app/main/ui/dashboard/team.cljs:480
 msgid "errors.team-leave.owner-cant-leave"
-msgstr "所有者不能离开团队，您必须转让所有者角色。"
+msgstr "所有者无法退出团队，你必须先转让所有者角色。"
 
 #: src/app/main/ui/workspace/tokens/sets/helpers.cljs:25, src/app/main/ui/workspace/tokens/sets/helpers.cljs:46
 msgid "errors.token-set-already-exists"
-msgstr "同名的集已经存在"
+msgstr "已存在同名令牌集"
 
 #: src/app/main/data/tokens.cljs:
 #, unused
 msgid "errors.token-set-doesnt-exists"
-msgstr "不能复制一个未知的集"
+msgstr "无法复制未知令牌集"
 
 #: src/app/main/data/workspace/tokens/library_edit.cljs:449
 msgid "errors.token-set-exists-on-drop"
-msgstr "无法完成删除，同名集合已存在于路径中。"
+msgstr "无法完成放置：此路径中已存在同名令牌集。"
 
 #: src/app/main/data/workspace/tokens/library_edit.cljs:237, src/app/main/data/workspace/tokens/library_edit.cljs:256
 msgid "errors.token-theme-already-exists"
-msgstr "同名的主题选项已经存在"
+msgstr "已存在同名令牌主题"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:15
 msgid "errors.tokens.error-parse"
@@ -1319,7 +1327,9 @@ msgstr "无效的颜色值：%s"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:103
 msgid "errors.tokens.invalid-font-weight-token-value"
-msgstr "字体粗细值无效：使用数值（100-950）或标准名称（细、亮、常规、粗体等），后跟可选的“斜体”"
+msgstr ""
+"字重值无效：请使用数值（100-950）或标准名称（thin、light、regular、bold 等）"
+"，后面可加“Italic”"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:23
 msgid "errors.tokens.invalid-json"
@@ -1327,21 +1337,21 @@ msgstr "导入错误：JSON 中存在无效的令牌数据。"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:27
 msgid "errors.tokens.invalid-json-token-name"
-msgstr "导入错误；JSON中存在无效的令牌名。"
+msgstr "导入错误：JSON 中存在无效的令牌名称。"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:28
 msgid "errors.tokens.invalid-json-token-name-detail"
 msgstr ""
-"“%s” 不是有效的 token 名称。\n"
-"token 名称只能包含字母和数字，并以 . 字符分隔，并且不能以 $ 符号开头。"
+"“%s”不是有效的令牌名称。\n"
+"令牌名称只能包含以英文句点（.）分隔的字母和数字，且不能以美元符号（$）开头。"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:95
 msgid "errors.tokens.invalid-text-case-token-value"
-msgstr "无效的token值：仅接受无、大写、小写或大写"
+msgstr "令牌值无效：仅接受以下字面值：none、uppercase、lowercase 或 capitalize"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:99
 msgid "errors.tokens.invalid-text-decoration-token-value"
-msgstr "无效的token值：仅接受无、下划线和删除线"
+msgstr "令牌值无效：仅接受以下字面值：none、underline 或 strike-through"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:75, src/app/main/data/workspace/tokens/errors.cljs:87, src/app/main/data/workspace/tokens/errors.cljs:91
 msgid "errors.tokens.invalid-value"
@@ -1349,15 +1359,15 @@ msgstr "无效的令牌值：%s"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:71
 msgid "errors.tokens.missing-references"
-msgstr "缺少token引用： "
+msgstr "缺少令牌引用： "
 
 #: src/app/main/data/workspace/tokens/errors.cljs:19
 msgid "errors.tokens.no-token-files-found"
-msgstr "在此文件中未找到任何标记、集合或主题。"
+msgstr "此文件中未找到任何令牌、令牌集或令牌主题。"
 
 #: src/app/main/data/workspace/tokens/errors.cljs:45, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:305, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:235
 msgid "errors.tokens.self-reference"
-msgstr "Token存在自我引用"
+msgstr "令牌存在自引用"
 
 #: src/app/main/data/media.cljs:74
 msgid "errors.unexpected-error"
@@ -1409,7 +1419,7 @@ msgstr "验证时出现意外错误"
 
 #: src/app/main/ui/dashboard/team.cljs:1243, src/app/main/ui/dashboard/team.cljs:1430
 msgid "errors.webhooks.unexpected-status"
-msgstr "意外状态%s"
+msgstr "意外状态 %s"
 
 #: src/app/main/ui/auth/login.cljs:96, src/app/main/ui/auth/login.cljs:100
 msgid "errors.wrong-credentials"
@@ -1425,15 +1435,15 @@ msgstr "描述"
 
 #: src/app/main/ui/settings/feedback.cljs:150
 msgid "feedback.discourse-subtitle1"
-msgstr "我们很欢迎你的到来。请在发布帮助请求前搜索你所需要的帮助内容。"
+msgstr "很高兴在这里见到你。如需帮助，请先搜索再发帖。"
 
 #: src/app/main/ui/settings/feedback.cljs:149
 msgid "feedback.discourse-title"
-msgstr "Penpot社区"
+msgstr "Penpot 社区"
 
 #: src/app/main/ui/settings/feedback.cljs:105
 msgid "feedback.subject"
-msgstr "话题"
+msgstr "主题"
 
 #: src/app/main/ui/settings/feedback.cljs:102
 msgid "feedback.subtitle"
@@ -1441,19 +1451,19 @@ msgstr "请说明你发邮件的原因，详细说明这是一个问题反馈、
 
 #: src/app/main/ui/settings/feedback.cljs:156
 msgid "feedback.twitter-subtitle1"
-msgstr "这里可以帮助您解决技术问题。"
+msgstr "帮助你解决技术问题。"
 
 #: src/app/main/ui/settings/feedback.cljs:155
 msgid "feedback.twitter-title"
-msgstr "X(原Twitter)支持帐号"
+msgstr "X 支持账号"
 
 #: src/app/main/ui/exports/files.cljs:132
 msgid "files-download-modal.description-2"
-msgstr "* 可能包含组件、图形、颜色和/或排版。"
+msgstr "* 可能包括组件、图形、颜色和/或排版。"
 
 #: src/app/main/ui/exports/files.cljs:140
 msgid "files-download-modal.options.all.message"
-msgstr "使用了共享库的文件将会在导出时保持引用关系。"
+msgstr "使用共享库的文件会连同共享库一起导出，并保持引用关系。"
 
 #: src/app/main/ui/exports/files.cljs:141
 msgid "files-download-modal.options.all.title"
@@ -1461,7 +1471,7 @@ msgstr "导出共享库"
 
 #: src/app/main/ui/exports/files.cljs:142
 msgid "files-download-modal.options.detach.message"
-msgstr "导出文件中将不包含共享库，素材也不会被添加到库中。 "
+msgstr "导出内容中不会包含共享库，也不会向文件库添加任何素材。 "
 
 #: src/app/main/ui/exports/files.cljs:143
 msgid "files-download-modal.options.detach.title"
@@ -1469,7 +1479,7 @@ msgstr "将共享库素材作为基本对象"
 
 #: src/app/main/ui/exports/files.cljs:144
 msgid "files-download-modal.options.merge.message"
-msgstr "导出您的文件时所有的外部素材将会被合并到库中。"
+msgstr "导出文件时，所有外部素材都会合并到文件库中。"
 
 #: src/app/main/ui/exports/files.cljs:145
 msgid "files-download-modal.options.merge.title"
@@ -1477,7 +1487,7 @@ msgstr "将共享库素材加入文件库"
 
 #: src/app/main/ui/settings/password.cljs:31
 msgid "generic.error"
-msgstr "发生了一个错误"
+msgstr "发生错误"
 
 #: src/app/main/ui/inspect/attributes/blur.cljs:31
 #, unused
@@ -1568,7 +1578,7 @@ msgstr "尺寸和位置"
 
 #: src/app/main/ui/inspect/attributes/stroke.cljs:89
 msgid "inspect.attributes.stroke"
-msgstr "边框"
+msgstr "描边"
 
 #, permanent, unused
 msgid "inspect.attributes.stroke.alignment.center"
@@ -1576,15 +1586,15 @@ msgstr "居中"
 
 #, permanent, unused
 msgid "inspect.attributes.stroke.alignment.inner"
-msgstr "内部"
+msgstr "内侧"
 
 #, permanent, unused
 msgid "inspect.attributes.stroke.alignment.outer"
-msgstr "外部"
+msgstr "外侧"
 
 #, unused
 msgid "inspect.attributes.stroke.style.dotted"
-msgstr "虚线"
+msgstr "点线"
 
 #, unused
 msgid "inspect.attributes.stroke.style.mixed"
@@ -1609,7 +1619,7 @@ msgstr "排版"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:316
 msgid "inspect.attributes.typography.font-family"
-msgstr "字体"
+msgstr "字体家族"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:340, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:346
 msgid "inspect.attributes.typography.font-size"
@@ -1617,16 +1627,16 @@ msgstr "字号"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:357
 msgid "inspect.attributes.typography.font-style"
-msgstr "文字风格"
+msgstr "字体样式"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:113
 #, unused
 msgid "inspect.attributes.typography.font-weight"
-msgstr "字体粗细"
+msgstr "字重"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:410, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:421
 msgid "inspect.attributes.typography.letter-spacing"
-msgstr "字距"
+msgstr "字间距"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:392, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:402
 msgid "inspect.attributes.typography.line-height"
@@ -1635,7 +1645,7 @@ msgstr "行高"
 #: src/app/main/ui/inspect/attributes/text.cljs:140
 #, unused
 msgid "inspect.attributes.typography.text-decoration"
-msgstr "文字装饰"
+msgstr "文本装饰"
 
 #, unused
 msgid "inspect.attributes.typography.text-decoration.line-through"
@@ -1652,11 +1662,11 @@ msgstr "下划线"
 #: src/app/main/ui/inspect/attributes/text.cljs:153
 #, unused
 msgid "inspect.attributes.typography.text-transform"
-msgstr "文本变换"
+msgstr "大小写转换"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:125, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:451
 msgid "inspect.attributes.typography.text-transform.capitalize"
-msgstr "首字母大写"
+msgstr "单词首字母大写"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:123, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:455
 msgid "inspect.attributes.typography.text-transform.lowercase"
@@ -1668,7 +1678,7 @@ msgstr "无"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:127
 msgid "inspect.attributes.typography.text-transform.unset"
-msgstr "取消设置"
+msgstr "未设置"
 
 #: src/app/main/ui/inspect/attributes/text.cljs:126, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:445
 msgid "inspect.attributes.typography.text-transform.uppercase"
@@ -1684,11 +1694,11 @@ msgstr "变体属性"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:235
 msgid "inspect.empty.help"
-msgstr "如果您想了解有关设计检查的更多信息，请访问Penpot的帮助中心"
+msgstr "如需进一步了解设计检查功能，请访问 Penpot 帮助中心"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:233
 msgid "inspect.empty.select"
-msgstr "选择形状、板或组以检查其属性和代码"
+msgstr "选择形状、画板或组以检查其属性和代码"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:165
 msgid "inspect.layer-info"
@@ -1696,7 +1706,7 @@ msgstr "图层信息"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:136
 msgid "inspect.multiple-selected"
-msgstr "已选中%s项"
+msgstr "已选择 %s 项"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:67
 msgid "inspect.subtitle.copy"
@@ -1769,7 +1779,7 @@ msgstr "访问令牌"
 
 #: src/app/main/ui/dashboard/team.cljs:1445
 msgid "labels.active"
-msgstr "激活"
+msgstr "启用"
 
 #: src/app/main/ui/workspace/libraries.cljs:172
 msgid "labels.add"
@@ -1781,7 +1791,7 @@ msgstr "添加自定义字体"
 
 #: src/app/main/ui/workspace/libraries.cljs:172
 msgid "labels.adding"
-msgstr "新增..."
+msgstr "正在添加…"
 
 #: src/app/main/ui/dashboard/team.cljs:149, src/app/main/ui/dashboard/team.cljs:402, src/app/main/ui/dashboard/team.cljs:645, src/app/main/ui/dashboard/team.cljs:675, src/app/main/ui/onboarding/team_choice.cljs:71
 msgid "labels.admin"
@@ -1850,7 +1860,7 @@ msgstr "社区"
 
 #: src/app/main/ui/inspect/right_sidebar.cljs:109
 msgid "labels.computed"
-msgstr "计算"
+msgstr "计算结果"
 
 #: src/app/main/ui/settings/password.cljs:93
 msgid "labels.confirm-password"
@@ -1862,11 +1872,11 @@ msgstr "继续"
 
 #, unused
 msgid "labels.continue-with"
-msgstr "继续"
+msgstr "使用以下方式继续"
 
 #: src/app/main/ui/viewer/login.cljs:69
 msgid "labels.continue-with-penpot"
-msgstr "你可以使用Penpot帐号继续"
+msgstr "你可以使用 Penpot 账号继续"
 
 #: src/app/main/ui/components/copy_button.cljs:41
 msgid "labels.copy"
@@ -1898,7 +1908,7 @@ msgstr "自定义字体"
 
 #: src/app/main/ui/settings/sidebar.cljs:82
 msgid "labels.dashboard"
-msgstr "面板"
+msgstr "仪表板"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:337, src/app/main/ui/dashboard/fonts.cljs:286, src/app/main/ui/dashboard/fonts.cljs:363, src/app/main/ui/dashboard/fonts.cljs:397, src/app/main/ui/dashboard/project_menu.cljs:115, src/app/main/ui/dashboard/team.cljs:1379, src/app/main/ui/settings/integrations.cljs:389, src/app/main/ui/settings/profile.cljs:117, src/app/main/ui/settings/profile.cljs:128, src/app/main/ui/settings/profile.cljs:129, src/app/main/ui/workspace/sidebar/assets/common.cljs:231, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:223, src/app/main/ui/workspace/sidebar/versions.cljs:258, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:353, src/app/main/ui/workspace/tokens/management/node_context_menu.cljs:111, src/app/main/ui/workspace/tokens/sets/context_menu.cljs:66, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:378
 msgid "labels.delete"
@@ -1906,7 +1916,7 @@ msgstr "删除"
 
 #: src/app/main/ui/comments.cljs:1015
 msgid "labels.delete-comment"
-msgstr "删除该评论"
+msgstr "删除评论"
 
 #: src/app/main/ui/comments.cljs:937
 msgid "labels.delete-comment-thread"
@@ -1918,11 +1928,11 @@ msgstr "删除邀请"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:292
 msgid "labels.delete-multi-files"
-msgstr "删除%s个文件"
+msgstr "删除 %s 个文件"
 
 #: src/app/main/ui/onboarding/questions.cljs:83
 msgid "labels.developer"
-msgstr "开发者"
+msgstr "开发"
 
 #: src/app/main/ui/onboarding/questions.cljs:260
 #, unused
@@ -1947,7 +1957,7 @@ msgstr "编辑"
 
 #, unused
 msgid "labels.edit-file"
-msgstr "编辑文档"
+msgstr "编辑文件"
 
 #: src/app/main/ui/dashboard/team.cljs:147, src/app/main/ui/dashboard/team.cljs:399, src/app/main/ui/dashboard/team.cljs:646, src/app/main/ui/dashboard/team.cljs:679, src/app/main/ui/onboarding/team_choice.cljs:70
 msgid "labels.editor"
@@ -1976,7 +1986,7 @@ msgstr "导出"
 
 #: src/app/main/ui/settings/feedback.cljs:83
 msgid "labels.feedback-disabled"
-msgstr "反馈被禁止"
+msgstr "反馈已禁用"
 
 #: src/app/main/ui/settings/feedback.cljs:74
 msgid "labels.feedback-sent"
@@ -1988,7 +1998,7 @@ msgstr "Figma"
 
 #: src/app/main/ui/dashboard/fonts.cljs:472
 msgid "labels.font-family"
-msgstr "字体族"
+msgstr "字体家族"
 
 #, unused
 msgid "labels.font-providers"
@@ -2005,7 +2015,7 @@ msgstr "字体"
 #: src/app/main/ui/onboarding/questions.cljs:259
 #, unused
 msgid "labels.founder"
-msgstr "创始人/副总裁"
+msgstr "首席执行官或创始人"
 
 #: src/app/main/ui/onboarding/questions.cljs:258
 #, unused
@@ -2014,7 +2024,7 @@ msgstr "我是一名自由职业者"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1172, src/app/main/ui/workspace/main_menu.cljs:196
 msgid "labels.github-repo"
-msgstr "Github仓库"
+msgstr "GitHub 仓库"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1148, src/app/main/ui/workspace/main_menu.cljs:225
 msgid "labels.give-feedback"
@@ -2038,7 +2048,7 @@ msgstr "隐藏"
 
 #: src/app/main/ui/viewer/comments.cljs:104, src/app/main/ui/workspace/comments.cljs:75
 msgid "labels.hide-resolved-comments"
-msgstr "隐藏已决定的评论"
+msgstr "隐藏已解决的评论"
 
 #: src/app/main/ui/workspace/tokens/sidebar.cljs:131
 msgid "labels.import"
@@ -2074,7 +2084,7 @@ msgstr "语言"
 
 #: src/app/main/ui/workspace/main_menu.cljs:187
 msgid "labels.libraries-and-templates"
-msgstr "库&模板"
+msgstr "库和模板"
 
 #: src/app/main/ui/auth/verify_token.cljs:125, src/app/main/ui/dashboard/grid.cljs:126, src/app/main/ui/dashboard/grid.cljs:146, src/app/main/ui/dashboard/import.cljs:255, src/app/main/ui/dashboard/placeholder.cljs:139, src/app/main/ui/ds/product/loader.cljs:85, src/app/main/ui/exports/files.cljs:59, src/app/main/ui/nitrate/entry.cljs:26, src/app/main/ui/static.cljs:615, src/app/main/ui/viewer.cljs:641, src/app/main/ui/workspace/sidebar/assets/file_library.cljs:247, src/app/main/ui/workspace.cljs:131, src/app/main/ui.cljs:71, src/app/main/ui.cljs:109, src/app/main/ui.cljs:128
 msgid "labels.loading"
@@ -2094,7 +2104,7 @@ msgstr "登录"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1405
 msgid "labels.logout"
-msgstr "登出"
+msgstr "退出登录"
 
 #: src/app/main/ui/onboarding/questions.cljs:86
 msgid "labels.marketing"
@@ -2126,7 +2136,7 @@ msgstr "下一项"
 
 #: src/app/main/ui/dashboard/comments.cljs:120, src/app/main/ui/workspace/comments.cljs:162
 msgid "labels.no-comments-available"
-msgstr "你们都赶上了! 新的评论通知将出现在这里。"
+msgstr "所有评论都已处理完毕！新的评论通知会显示在这里。"
 
 #: src/app/main/ui/dashboard/team.cljs:821
 msgid "labels.no-invitations"
@@ -2134,7 +2144,7 @@ msgstr "没有待处理的邀请。"
 
 #: src/app/main/ui/dashboard/team.cljs:823
 msgid "labels.no-invitations-gather-people"
-msgstr "召集你的人，一起建设伟大的事业。"
+msgstr "邀请大家加入，一起创造精彩成果。"
 
 #: src/app/main/ui/static.cljs
 #, unused
@@ -2152,20 +2162,20 @@ msgstr "通知"
 #: src/app/main/ui/dashboard/projects.cljs:236, src/app/main/ui/dashboard/team.cljs:1672
 msgid "labels.num-of-files"
 msgid_plural "labels.num-of-files"
-msgstr[0] "共1个文档"
-msgstr[1] "共%s个文档"
+msgstr[0] "1 个文件"
+msgstr[1] "%s 个文件"
 
 #: src/app/main/ui/viewer/thumbnails.cljs:82
 msgid "labels.num-of-frames"
 msgid_plural "labels.num-of-frames"
-msgstr[0] "1个画板"
-msgstr[1] "%s个画板"
+msgstr[0] "1 个画板"
+msgstr[1] "%s 个画板"
 
 #: src/app/main/ui/dashboard/team.cljs:1667
 msgid "labels.num-of-projects"
 msgid_plural "labels.num-of-projects"
 msgstr[0] "1 个项目"
-msgstr[1] "共 %s 个项目"
+msgstr[1] "%s 个项目"
 
 #, unused
 msgid "labels.ok"
@@ -2206,7 +2216,7 @@ msgstr "密码"
 
 #: src/app/main/ui/dashboard/team.cljs:752
 msgid "labels.pending-invitation"
-msgstr "待办"
+msgstr "待处理"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1091
 msgid "labels.pinned-projects"
@@ -2222,11 +2232,11 @@ msgstr "前一项"
 
 #: src/app/main/ui/onboarding/questions.cljs:82
 msgid "labels.product-design"
-msgstr "产品或UX设计"
+msgstr "产品或 UX 设计"
 
 #: src/app/main/ui/onboarding/questions.cljs:87
 msgid "labels.product-management"
-msgstr "产品经理/项目经理"
+msgstr "产品管理"
 
 #: src/app/main/ui/settings/profile.cljs:148, src/app/main/ui/settings/sidebar.cljs:91
 msgid "labels.profile"
@@ -2327,7 +2337,7 @@ msgstr "正在发送…"
 
 #: src/app/main/ui/static.cljs:327
 msgid "labels.service-unavailable.desc-message"
-msgstr "我们正在进行系统的程序维护。"
+msgstr "系统正在按计划维护。"
 
 #: src/app/main/ui/static.cljs:326
 msgid "labels.service-unavailable.main-message"
@@ -2351,7 +2361,7 @@ msgstr "分享原型"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1085
 msgid "labels.shared-libraries"
-msgstr "共享库"
+msgstr "库"
 
 #: src/app/main/ui/dashboard/templates.cljs:86
 msgid "labels.show"
@@ -2367,7 +2377,7 @@ msgstr "显示评论列表"
 
 #: src/app/main/ui/workspace/comments.cljs:69, src/app/main/ui/workspace/comments.cljs:138
 msgid "labels.show-mentions"
-msgstr "只显示您的提及"
+msgstr "只显示提及你的评论"
 
 #: src/app/main/ui/viewer/comments.cljs:92, src/app/main/ui/workspace/comments.cljs:63, src/app/main/ui/workspace/comments.cljs:137
 msgid "labels.show-your-comments"
@@ -2379,7 +2389,7 @@ msgstr "Sketch"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1070
 msgid "labels.sources"
-msgstr "源"
+msgstr "来源"
 
 #: src/app/main/ui/onboarding/questions.cljs:53
 msgid "labels.start"
@@ -2421,7 +2431,7 @@ msgstr "解锁"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:286
 msgid "labels.unpublish-multi-files"
-msgstr "取消发布%s文件"
+msgstr "取消发布 %s 个文件"
 
 #: src/app/main/ui/settings/profile.cljs:123
 msgid "labels.update"
@@ -2453,7 +2463,7 @@ msgstr "查看者"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:552, src/app/main/ui/dashboard/team.cljs:116, src/app/main/ui/dashboard/team.cljs:126, src/app/main/ui/dashboard/team.cljs:1356
 msgid "labels.webhooks"
-msgstr "Webhooks"
+msgstr "Webhook"
 
 #: src/app/main/ui/comments.cljs:856
 msgid "labels.write-new-comment"
@@ -2461,11 +2471,11 @@ msgstr "写一条新评论"
 
 #: src/app/main/ui/dashboard/team.cljs:350
 msgid "labels.you"
-msgstr "(你)"
+msgstr "（你）"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1358
 msgid "labels.your-account"
-msgstr "你的账户"
+msgstr "你的账号"
 
 #: src/app/main/ui/onboarding/questions.cljs:403
 #, unused
@@ -2482,7 +2492,7 @@ msgstr "可重用组件"
 
 #: src/app/main/ui/ds/product/loader.cljs:23
 msgid "loader.tips.02.message"
-msgstr "与您的团队实时协作，即时分享反馈。"
+msgstr "与团队实时协作，即时分享反馈。"
 
 #: src/app/main/ui/ds/product/loader.cljs:22
 msgid "loader.tips.02.title"
@@ -2490,23 +2500,23 @@ msgstr "实时协作"
 
 #: src/app/main/ui/ds/product/loader.cljs:25
 msgid "loader.tips.03.message"
-msgstr "使用熟悉的类CSS布局控制灵活设计。"
+msgstr "使用熟悉的类 CSS 布局控件灵活设计。"
 
 #: src/app/main/ui/ds/product/loader.cljs:24
 msgid "loader.tips.03.title"
-msgstr "像 CSS 一样自动布局"
+msgstr "CSS 风格布局"
 
 #: src/app/main/ui/ds/product/loader.cljs:27
 msgid "loader.tips.04.message"
-msgstr "从您的设计中直接获取 CSS 和 SVG。"
+msgstr "直接从设计中获取 CSS 和 SVG 代码。"
 
 #: src/app/main/ui/ds/product/loader.cljs:26
 msgid "loader.tips.04.title"
-msgstr "导出为代码"
+msgstr "导出代码"
 
 #: src/app/main/ui/ds/product/loader.cljs:29
 msgid "loader.tips.05.message"
-msgstr "共享资产和风格以保持一致性。"
+msgstr "共享素材和样式以保持一致性。"
 
 #: src/app/main/ui/ds/product/loader.cljs:28
 msgid "loader.tips.05.title"
@@ -2514,7 +2524,7 @@ msgstr "设计库"
 
 #: src/app/main/ui/ds/product/loader.cljs:31
 msgid "loader.tips.06.message"
-msgstr "通过动画和过渡让您的想法变为现实。"
+msgstr "通过动画和过渡让你的想法变为现实。"
 
 #: src/app/main/ui/ds/product/loader.cljs:30
 msgid "loader.tips.06.title"
@@ -2530,7 +2540,7 @@ msgstr "Web 标准格式"
 
 #: src/app/main/ui/ds/product/loader.cljs:35
 msgid "loader.tips.08.message"
-msgstr "使用便捷的快捷键（例如 Shift + A 用于自动布局）来加快您的工作流程。"
+msgstr "使用 Shift + A 等便捷快捷键启用自动布局，加快工作流程。"
 
 #: src/app/main/ui/ds/product/loader.cljs:34
 msgid "loader.tips.08.title"
@@ -2538,15 +2548,15 @@ msgstr "键盘快捷键"
 
 #: src/app/main/ui/ds/product/loader.cljs:37
 msgid "loader.tips.09.message"
-msgstr "选择适合您风格的主题。"
+msgstr "选择适合你风格的主题。"
 
 #: src/app/main/ui/ds/product/loader.cljs:36
 msgid "loader.tips.09.title"
-msgstr "暗黑和浅色模式"
+msgstr "深色和浅色模式"
 
 #: src/app/main/ui/ds/product/loader.cljs:39
 msgid "loader.tips.10.message"
-msgstr "使用社区构建的插件扩展 Penpot 以获得额外的功能。"
+msgstr "使用社区开发的插件扩展 Penpot，获得更多功能。"
 
 #: src/app/main/ui/ds/product/loader.cljs:38
 msgid "loader.tips.10.title"
@@ -2566,7 +2576,7 @@ msgstr "图片"
 
 #: src/app/main/ui/inspect/attributes/common.cljs:53
 msgid "media.image.short"
-msgstr "img"
+msgstr "图片"
 
 #: src/app/main/ui/workspace/colorpicker.cljs:479
 msgid "media.keep-aspect-ratio"
@@ -2592,7 +2602,7 @@ msgstr "纯色"
 
 #: src/app/main/data/common.cljs:118
 msgid "modals.add-shared-confirm-empty.hint"
-msgstr "你的库是空白的。一旦添加为共享库，此文档库中的素材就可被用于你的其他文档中。你确定要发布它吗？"
+msgstr "你的库是空的。添加为共享库后，你创建的素材可供其他文件使用。确定要发布吗？"
 
 #: src/app/main/data/common.cljs:120
 msgid "modals.add-shared-confirm.accept"
@@ -2600,7 +2610,7 @@ msgstr "添加为共享库"
 
 #: src/app/main/data/common.cljs:118
 msgid "modals.add-shared-confirm.hint"
-msgstr "一旦添加为共享库，此文档库中的素材就可被用于你的其他文档中。"
+msgstr "添加为共享库后，此文件库中的素材可供其他文件使用。"
 
 #: src/app/main/data/common.cljs:117
 msgid "modals.add-shared-confirm.message"
@@ -2608,39 +2618,39 @@ msgstr "将“%s”添加为共享库"
 
 #: src/app/main/ui/workspace/nudge.cljs:59
 msgid "modals.big-nudge"
-msgstr "小幅微调"
+msgstr "大幅微调"
 
 #: src/app/main/ui/settings/change_email.cljs:109
 msgid "modals.change-email.confirm-email"
-msgstr "确认新的邮件"
+msgstr "确认新电子邮箱"
 
 #: src/app/main/ui/settings/change_email.cljs:97
 msgid "modals.change-email.info"
-msgstr "我们会发送一封信的邮件到当前的电子邮件“%s”，以验证你的身份。"
+msgstr "我们会向你当前的电子邮箱“%s”发送一封邮件，以验证你的身份。"
 
 #: src/app/main/ui/settings/change_email.cljs:102
 msgid "modals.change-email.new-email"
-msgstr "新电子邮件"
+msgstr "新电子邮箱"
 
 #: src/app/main/ui/settings/change_email.cljs:117
 msgid "modals.change-email.submit"
-msgstr "修改电子邮件"
+msgstr "更改电子邮箱"
 
 #: src/app/main/ui/settings/change_email.cljs:90
 msgid "modals.change-email.title"
-msgstr "修改你的电子邮件"
+msgstr "更改电子邮箱"
 
 #: src/app/main/ui/dashboard/team.cljs:1350
 msgid "modals.create-webhook.submit-label"
-msgstr "创建webhook"
+msgstr "创建 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1315
 msgid "modals.create-webhook.title"
-msgstr "创建webhook"
+msgstr "创建 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1326
 msgid "modals.create-webhook.url.label"
-msgstr "有效负载网址"
+msgstr "有效载荷 URL"
 
 #: src/app/main/ui/dashboard/team.cljs:1327
 msgid "modals.create-webhook.url.placeholder"
@@ -2685,15 +2695,15 @@ msgstr "删除注释"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:126
 msgid "modals.delete-file-confirm.accept"
-msgstr "删除文档"
+msgstr "删除文件"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:125
 msgid "modals.delete-file-confirm.message"
-msgstr "你确定想要删除这个文档？"
+msgstr "确定要删除此文件吗？"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:124
 msgid "modals.delete-file-confirm.title"
-msgstr "正在删除文档"
+msgstr "正在删除文件"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:120
 msgid "modals.delete-file-multi-confirm.accept"
@@ -2701,27 +2711,27 @@ msgstr "删除文件"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:119
 msgid "modals.delete-file-multi-confirm.message"
-msgstr "你确定要删除这%s个文件？"
+msgstr "确定要删除这 %s 个文件吗？"
 
 #: src/app/main/ui/dashboard/file_menu.cljs:118
 msgid "modals.delete-file-multi-confirm.title"
-msgstr "正在删除%s个文件"
+msgstr "删除 %s 个文件"
 
 #: src/app/main/ui/dashboard/fonts.cljs:396
 msgid "modals.delete-font-variant.message"
-msgstr "你确定要删除这个字体样式吗？如果它被用在某个文件里的话，将无法加载。"
+msgstr "确定要删除此字体样式吗？如果文件使用了该样式，将无法加载它。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:395
 msgid "modals.delete-font-variant.title"
-msgstr "正在删除字体样式"
+msgstr "删除字体样式"
 
 #: src/app/main/ui/dashboard/fonts.cljs:362
 msgid "modals.delete-font.message"
-msgstr "你确定要删除这个字体吗？如果它被用在某个文件里的话，将无法加载。"
+msgstr "确定要删除此字体吗？如果文件使用了该字体，将无法加载它。"
 
 #: src/app/main/ui/dashboard/fonts.cljs:361
 msgid "modals.delete-font.title"
-msgstr "正在删除字体"
+msgstr "删除字体"
 
 #: src/app/main/ui/workspace/context_menu.cljs:707, src/app/main/ui/workspace/sidebar/sitemap.cljs:109
 msgid "modals.delete-page.body"
@@ -2747,31 +2757,31 @@ msgstr "删除项目"
 msgid "modals.delete-shared-confirm.accept"
 msgid_plural "modals.delete-shared-confirm.accept"
 msgstr[0] "删除文件"
-msgstr[1] "批量删除文件"
+msgstr[1] "删除文件"
 
 #: src/app/main/ui/delete_shared.cljs:56
 msgid "modals.delete-shared-confirm.activated.no-files-message"
 msgid_plural "modals.delete-shared-confirm.activated.no-files-message"
-msgstr[0] "没有文件引用它。"
-msgstr[1] "没有文件引用它们。"
+msgstr[0] "所选库未在任何文件中启用。"
+msgstr[1] "所选库未在任何文件中启用。"
 
 #: src/app/main/ui/delete_shared.cljs:58
 msgid "modals.delete-shared-confirm.activated.scd-message"
 msgid_plural "modals.delete-shared-confirm.activated.scd-message"
-msgstr[0] "该库被以下文档使用： "
-msgstr[1] "这些库被以下文档使用： "
+msgstr[0] "所选库已在以下文件中启用： "
+msgstr[1] "所选库已在以下文件中启用： "
 
 #: src/app/main/ui/delete_shared.cljs:47
 msgid "modals.delete-shared-confirm.message"
 msgid_plural "modals.delete-shared-confirm.message"
-msgstr[0] "你是否确认要删除这个文件?"
-msgstr[1] "你是否确认要删除这些文件?"
+msgstr[0] "确定要删除所选文件吗？"
+msgstr[1] "确定要删除所选文件吗？"
 
 #: src/app/main/ui/delete_shared.cljs:42
 msgid "modals.delete-shared-confirm.title"
 msgid_plural "modals.delete-shared-confirm.title"
 msgstr[0] "删除文件"
-msgstr[1] "批量删除文件"
+msgstr[1] "删除文件"
 
 #: src/app/main/data/team.cljs:136
 msgid "modals.delete-team-confirm.accept"
@@ -2779,11 +2789,11 @@ msgstr "删除团队"
 
 #: src/app/main/data/team.cljs:130
 msgid "modals.delete-team-confirm.message"
-msgstr "你确定想要删除这个团队？与该团队关联的所有项目和文档都会被永久删除。"
+msgstr "确定要删除此团队吗？与该团队关联的所有项目和文件都将被永久删除。"
 
 #: src/app/main/data/team.cljs:134
 msgid "modals.delete-team-confirm.title"
-msgstr "正在删除团队"
+msgstr "删除团队"
 
 #: src/app/main/ui/dashboard/team.cljs:542
 msgid "modals.delete-team-member-confirm.accept"
@@ -2800,28 +2810,28 @@ msgstr "删除团队成员"
 #: src/app/main/ui/delete_shared.cljs:60
 msgid "modals.delete-unpublish-shared-confirm.activated.hint"
 msgid_plural "modals.delete-unpublish-shared-confirm.activated.hint"
-msgstr[0] "这个文件中被其他文件引用的素材依然在那（其他文件的现有设计不会被破坏）。"
-msgstr[1] "这些文件中被其他文件引用的素材依然在那（其他文件的现有设计不会被破坏）。"
+msgstr[0] "已在这些文件中使用的素材会保留在原处（不会破坏现有设计）。"
+msgstr[1] "已在这些文件中使用的素材会保留在原处（不会破坏现有设计）。"
 
 #: src/app/main/ui/dashboard/team.cljs:1417
 msgid "modals.delete-webhook.accept"
-msgstr "删除webhook"
+msgstr "删除 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1416
 msgid "modals.delete-webhook.message"
-msgstr "你确定要删除这个webhook吗？"
+msgstr "确定要删除此 Webhook 吗？"
 
 #: src/app/main/ui/dashboard/team.cljs:1415
 msgid "modals.delete-webhook.title"
-msgstr "删除webhook"
+msgstr "删除 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1349
 msgid "modals.edit-webhook.submit-label"
-msgstr "编辑webhook"
+msgstr "编辑 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:1314
 msgid "modals.edit-webhook.title"
-msgstr "编辑webhook"
+msgstr "编辑 Webhook"
 
 #: src/app/main/ui/dashboard/team.cljs:273
 msgid "modals.invite-member-confirm.accept"
@@ -2837,7 +2847,7 @@ msgstr "有些成员已经在团队中，我们将邀请其余成员。"
 
 #: src/app/main/ui/dashboard/team.cljs:246
 msgid "modals.invite-team-member.text"
-msgstr "您可以邀请成员加入团队，以便他们可以访问此文件和所有团队文件。"
+msgstr "你可以邀请成员加入团队，以便他们访问此文件及团队的所有文件。"
 
 #: src/app/main/data/team.cljs:165, src/app/main/ui/dashboard/team.cljs:242
 msgid "modals.invite-team-member.title"
@@ -2849,7 +2859,7 @@ msgstr "由于你是这个团队的唯一成员，这个团队将连同其项目
 
 #: src/app/main/ui/dashboard/sidebar.cljs:526, src/app/main/ui/dashboard/team.cljs:507
 msgid "modals.leave-and-close-confirm.message"
-msgstr "您确定要离开 %s 团队吗？"
+msgstr "确定要离开 %s 团队吗？"
 
 #: src/app/main/ui/dashboard/change_owner.cljs:57, src/app/main/ui/dashboard/change_owner.cljs:92
 msgid "modals.leave-and-reassign.forbidden"
@@ -2892,14 +2902,14 @@ msgstr[1] "移动"
 #: src/app/main/ui/delete_shared.cljs:49
 msgid "modals.move-shared-confirm.message"
 msgid_plural "modals.move-shared-confirm.message"
-msgstr[0] "你确定要移动这个共享库吗？"
-msgstr[1] "你确定要移动这些共享库吗？"
+msgstr[0] "确定要移动所选共享库吗？"
+msgstr[1] "确定要移动所选共享库吗？"
 
 #: src/app/main/ui/delete_shared.cljs:44
 msgid "modals.move-shared-confirm.title"
 msgid_plural "modals.move-shared-confirm.title"
 msgstr[0] "移动共享库"
-msgstr[1] "移动多个共享库"
+msgstr[1] "移动共享库"
 
 #: src/app/main/ui/workspace/main_menu.cljs:312, src/app/main/ui/workspace/nudge.cljs:46
 msgid "modals.nudge-title"
@@ -2911,15 +2921,15 @@ msgstr "转让所有权"
 
 #: src/app/main/ui/dashboard/team.cljs:460
 msgid "modals.promote-owner-confirm.hint"
-msgstr "如果你转移所有权，你的角色将变为管理员，失去对这个团队的一些权限。 "
+msgstr "转让所有权后，你的角色将变为管理员，并失去对此团队的部分权限。 "
 
 #: src/app/main/ui/dashboard/team.cljs:459
 msgid "modals.promote-owner-confirm.message"
-msgstr "您是此团队的所有者，你确定想要将所有者转让给该成员？"
+msgstr "你是此团队的当前所有者。确定要将 %s 设为团队的新所有者吗？"
 
 #: src/app/main/ui/dashboard/team.cljs:458
 msgid "modals.promote-owner-confirm.title"
-msgstr "新增团队所有者"
+msgstr "新团队所有者"
 
 #: src/app/main/ui/workspace/libraries.cljs:309
 msgid "modals.publish-empty-library.accept"
@@ -2931,7 +2941,7 @@ msgstr "你的库是空的。你确定想要发布它？"
 
 #: src/app/main/ui/workspace/libraries.cljs:307
 msgid "modals.publish-empty-library.title"
-msgstr "发布空白库"
+msgstr "发布空库"
 
 #: src/app/main/ui/workspace/header.cljs, src/app/main/ui/dashboard/file_menu.cljs
 #, unused
@@ -2961,14 +2971,14 @@ msgstr[1] "取消发布"
 #: src/app/main/ui/delete_shared.cljs:48
 msgid "modals.unpublish-shared-confirm.message"
 msgid_plural "modals.unpublish-shared-confirm.message"
-msgstr[0] "你是否确认取消发布这个库?"
-msgstr[1] "你是否确认取消发布这些库?"
+msgstr[0] "确定要取消发布所选库吗？"
+msgstr[1] "确定要取消发布所选库吗？"
 
 #: src/app/main/ui/delete_shared.cljs:43
 msgid "modals.unpublish-shared-confirm.title"
 msgid_plural "modals.unpublish-shared-confirm.title"
 msgstr[0] "取消发布库"
-msgstr[1] "批量取消发布库"
+msgstr[1] "取消发布库"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs, src/app/main/ui/workspace/context_menu.cljs
 #, unused
@@ -3002,7 +3012,7 @@ msgstr "此页面不存在"
 
 #: src/app/main/ui/static.cljs:308
 msgid "not-found.desc-message.error"
-msgstr "404错误"
+msgstr "404 错误"
 
 #: src/app/main/ui/static.cljs:160
 msgid "not-found.login.free"
@@ -3014,7 +3024,7 @@ msgstr "我们已将恢复电子邮件发送至"
 
 #: src/app/main/ui/auth/recovery_request.cljs:116
 msgid "not-found.login.sent-recovery-check"
-msgstr "检查您的邮箱并点击超链接以创建新的密码。"
+msgstr "请检查电子邮箱，然后点击链接创建新密码。"
 
 #: src/app/main/ui/static.cljs:174
 msgid "not-found.login.signup-free"
@@ -3030,19 +3040,19 @@ msgstr "用爱和开源制作"
 
 #: src/app/main/ui/static.cljs:269
 msgid "not-found.no-permission.already-requested.file"
-msgstr "您已经申请了对此文件的访问权限。"
+msgstr "你已申请访问此文件。"
 
 #: src/app/main/ui/static.cljs:270
 msgid "not-found.no-permission.already-requested.or-others.file"
-msgstr "您已申请对此文件或该团队的其他文件或项目的访问权限。"
+msgstr "你已申请访问此文件，或此团队的其他文件或项目。"
 
 #: src/app/main/ui/static.cljs:276
 msgid "not-found.no-permission.already-requested.or-others.project"
-msgstr "您已经申请了对该项目或该团队的其他项目或文件的访问权限。"
+msgstr "你已申请访问此项目，或此团队的其他项目或文件。"
 
 #: src/app/main/ui/static.cljs:275
 msgid "not-found.no-permission.already-requested.project"
-msgstr "您已经申请了对此项目的访问权限。"
+msgstr "你已申请访问此项目。"
 
 #: src/app/main/ui/static.cljs:290, src/app/main/ui/static.cljs:299
 msgid "not-found.no-permission.ask"
@@ -3050,31 +3060,31 @@ msgstr "请求访问权限"
 
 #: src/app/main/ui/static.cljs:282
 msgid "not-found.no-permission.done.remember"
-msgstr "请记住，如果团队所有者允许，您将被邀请加入此团队。"
+msgstr "请注意，如果所有者批准请求，你将受邀加入此团队。"
 
 #: src/app/main/ui/static.cljs:281
 msgid "not-found.no-permission.done.success"
-msgstr "您的请求已发送！"
+msgstr "你的请求已成功发送！"
 
 #: src/app/main/ui/static.cljs:287
 msgid "not-found.no-permission.file"
-msgstr "您没有针对此文件的访问权限。"
+msgstr "你无权访问此文件。"
 
 #: src/app/main/ui/static.cljs:62, src/app/main/ui/static.cljs:265, src/app/main/ui/static.cljs:271, src/app/main/ui/static.cljs:277, src/app/main/ui/static.cljs:283, src/app/main/ui/static.cljs:292, src/app/main/ui/static.cljs:301
 msgid "not-found.no-permission.go-dashboard"
-msgstr "前往您的Penpot"
+msgstr "前往你的 Penpot"
 
 #: src/app/main/ui/static.cljs:289, src/app/main/ui/static.cljs:298
 msgid "not-found.no-permission.if-approves"
-msgstr "如果所有者允许，您会被邀请加入此团队。"
+msgstr "如果所有者批准请求，你将受邀加入此团队。"
 
 #: src/app/main/ui/static.cljs:527, src/app/main/ui/static.cljs:540
 msgid "not-found.no-permission.penpot-file"
-msgstr "Penpot文件"
+msgstr "Penpot 文件"
 
 #: src/app/main/ui/static.cljs:264, src/app/main/ui/static.cljs:296
 msgid "not-found.no-permission.project"
-msgstr "您没有针对此项目的访问权限。"
+msgstr "你无权访问此项目。"
 
 #: src/app/main/ui/static.cljs:526, src/app/main/ui/static.cljs:538
 msgid "not-found.no-permission.project-name"
@@ -3082,15 +3092,15 @@ msgstr "项目"
 
 #: src/app/main/ui/static.cljs:288
 msgid "not-found.no-permission.you-can-ask.file"
-msgstr "要访问此文件，您可以询问团队拥有者。"
+msgstr "要访问此文件，你可以向团队所有者申请。"
 
 #: src/app/main/ui/static.cljs:297
 msgid "not-found.no-permission.you-can-ask.project"
-msgstr "要访问此项目，您可以询问团队拥有者。"
+msgstr "要访问此项目，你可以向团队所有者申请。"
 
 #: src/app/main/data/common.cljs:89
 msgid "notifications.by-code.maintenance"
-msgstr "维护中断：我们将在5分钟内进行短暂维护。"
+msgstr "维护通知：系统将在 5 分钟内短暂停机维护。"
 
 #: src/app/main/ui/dashboard/team.cljs:193, src/app/main/ui/dashboard/team.cljs:1071
 msgid "notifications.invitation-email-sent"
@@ -3102,7 +3112,7 @@ msgstr "邀请链接已复制"
 
 #: src/app/main/ui/settings/delete_account.cljs:28
 msgid "notifications.profile-deletion-not-allowed"
-msgstr "您无法删除您的个人资料。在继续之前重新分配您的团队。"
+msgstr "你无法删除个人资料。请先转让你拥有的团队。"
 
 #: src/app/main/ui/settings/options.cljs:36, src/app/main/ui/settings/profile.cljs:34
 msgid "notifications.profile-saved"
@@ -3110,15 +3120,15 @@ msgstr "个人资料保存成功！"
 
 #: src/app/main/ui/settings/change_email.cljs:46
 msgid "notifications.validation-email-sent"
-msgstr "验证邮件已发至%s。请检查电子邮箱！"
+msgstr "验证邮件已发送至 %s。请检查电子邮箱！"
 
 #, unused
 msgid "onboarding-v2.before-start.desc1"
-msgstr "有很多资源可以帮助你开始使用Penpot，如用户指南和我们的Youtube频道。"
+msgstr "你可以通过用户指南和 YouTube 频道等丰富资源开始了解 Penpot。"
 
 #, unused
 msgid "onboarding-v2.before-start.desc2"
-msgstr "有关如何使用Penpot的详细信息。从原型设计到组织或共享设计。"
+msgstr "详细了解如何使用 Penpot，包括制作原型、整理和分享设计。"
 
 #, unused
 msgid "onboarding-v2.before-start.desc2.title"
@@ -3126,7 +3136,7 @@ msgstr "用户指南"
 
 #, unused
 msgid "onboarding-v2.before-start.desc3"
-msgstr "您可以观看我们的官方教程以及社区制作的教程。"
+msgstr "你可以观看我们的教程以及社区制作的教程。"
 
 #, unused
 msgid "onboarding-v2.before-start.desc3.title"
@@ -3139,34 +3149,40 @@ msgstr "在开始之前"
 #: src/app/main/ui/onboarding/newsletter.cljs:68
 #, unused
 msgid "onboarding-v2.newsletter.desc"
-msgstr "订阅Penpot通知邮件，跟进产品开发进度，获取最新消息。"
+msgstr "订阅 Penpot 新闻简报，及时了解产品开发进展和新闻。"
 
 #: src/app/main/ui/onboarding/newsletter.cljs:88
 #, unused
 msgid "onboarding-v2.newsletter.news"
-msgstr "发给我有关Penpot的新闻（博客文章、视频教程、直播等）。"
+msgstr "向我发送 Penpot 新闻（博客文章、视频教程、直播等）。"
 
 #: src/app/main/ui/onboarding/newsletter.cljs:96
 #, unused
 msgid "onboarding-v2.newsletter.privacy1"
-msgstr "我们关心隐私，您可在此阅读我们的 "
+msgstr "我们重视隐私，你可以在此阅读我们的 "
 
 #: src/app/main/ui/onboarding/newsletter.cljs:102
 #, unused
 msgid "onboarding-v2.newsletter.privacy2"
-msgstr "我们将仅发送与您有关的邮件，您可以随时在其中任意一封邮件中点击取消订阅。"
+msgstr ""
+"我们只会向你发送相关邮件。你可以随时通过任意一封新闻简报中的退订链接取消订阅"
+"。"
 
 #: src/app/main/ui/auth/register.cljs:35
 msgid "onboarding-v2.newsletter.updates"
-msgstr "向我发送一些产品更新（新功能，新版本，新修复等）。"
+msgstr "向我发送产品更新（新功能、新版本、问题修复等）。"
 
 #, unused
 msgid "onboarding-v2.welcome.desc1"
-msgstr "Penpot是由Kaleidos及社区共同开发的开源软件，许多人已经在社区中互相帮助。每个人都可以通过以下方式进行协作："
+msgstr ""
+"Penpot 是由 Kaleidos 和社区共同开发的开源软件，社区中已有许多人互相帮助。每个"
+"人都可以通过以下方式参与协作："
 
 #, unused
 msgid "onboarding-v2.welcome.desc2"
-msgstr "一个与整个社区和Penpot核心团队学习、分享和讨论Penpot及其现在和未来的公共空间。"
+msgstr ""
+"这是一个公共空间，你可以与整个社区和 Penpot 核心团队一起了解、分享和讨论 "
+"Penpot 的现在与未来。"
 
 #, unused
 msgid "onboarding-v2.welcome.desc2.title"
@@ -3174,7 +3190,7 @@ msgstr "参与到社区中"
 
 #, unused
 msgid "onboarding-v2.welcome.desc3"
-msgstr "在这里，您将了解如何协作进行翻译、功能需求提出、核心代码贡献、BUG修复等…"
+msgstr "你可以在这里了解如何参与翻译、提交功能请求、贡献核心代码和查找错误等…"
 
 #, unused
 msgid "onboarding-v2.welcome.desc3.title"
@@ -3182,7 +3198,7 @@ msgstr "贡献指南"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:248
 msgid "onboarding-v2.welcome.title"
-msgstr "欢迎来到Penpot!"
+msgstr "欢迎来到 Penpot！"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:254
 #, unused
@@ -3207,11 +3223,7 @@ msgstr "你可以稍后再邀请成员"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:193
 msgid "onboarding.choice.team-up.create-team-desc"
-msgstr "命名团队后，您将能够邀请他人加入。"
-
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "输入团队名称"
+msgstr "为团队命名后，你就可以邀请其他人加入。"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
@@ -3227,11 +3239,11 @@ msgstr "邀请成员"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:218
 msgid "onboarding.choice.team-up.invite-members-info"
-msgstr "记得将开发人员、设计师、经理……等各类人员都加进来:)"
+msgstr "记得邀请所有人加入。开发者、设计师、管理者……多元协作让团队更出色 :)"
 
 #: src/app/main/ui/dashboard/team.cljs:258
 msgid "onboarding.choice.team-up.roles"
-msgstr "邀请角色:"
+msgstr "邀请成员担任以下角色："
 
 #: src/app/main/ui/onboarding/team_choice.cljs:222
 #, unused
@@ -3250,12 +3262,12 @@ msgstr "是的，订阅"
 #: src/app/main/ui/onboarding/newsletter.cljs:42
 #, unused
 msgid "onboarding.newsletter.acceptance-message"
-msgstr "您的订阅请求已发送，我们将向您发送一封电子邮件进行确认。"
+msgstr "你的订阅请求已发送，我们会向你发送确认邮件。"
 
 #: src/app/main/ui/onboarding/newsletter.cljs:100
 #, unused
 msgid "onboarding.newsletter.policy"
-msgstr "隐私策略。"
+msgstr "隐私政策。"
 
 #: src/app/main/ui/onboarding/newsletter.cljs:65
 #, unused
@@ -3269,17 +3281,17 @@ msgstr "让我们开始吧！"
 #: src/app/main/ui/onboarding/questions.cljs:248
 #, unused
 msgid "onboarding.questions.reasons.alternative"
-msgstr "寻找 Figma、XD等的替代者"
+msgstr "寻找 Figma、XD 等工具的替代方案"
 
 #: src/app/main/ui/onboarding/questions.cljs:242
 #, unused
 msgid "onboarding.questions.reasons.exploring"
-msgstr "仅浏览"
+msgstr "随便看看"
 
 #: src/app/main/ui/onboarding/questions.cljs:245
 #, unused
 msgid "onboarding.questions.reasons.fit"
-msgstr "评估Penpot是否适合我的团队"
+msgstr "评估 Penpot 是否适合我的团队"
 
 #: src/app/main/ui/onboarding/questions.cljs:251
 #, unused
@@ -3289,7 +3301,7 @@ msgstr "自托管前测试"
 #: src/app/main/ui/onboarding/questions.cljs:407
 #, unused
 msgid "onboarding.questions.referer.article"
-msgstr "文章（博客、帖子、实时通讯）"
+msgstr "文章（博客、帖子、新闻简报）"
 
 #: src/app/main/ui/onboarding/questions.cljs:405
 #, unused
@@ -3299,11 +3311,11 @@ msgstr "搜索引擎（Google、Yahoo、Bing）"
 #: src/app/main/ui/onboarding/questions.cljs:406
 #, unused
 msgid "onboarding.questions.referer.social"
-msgstr "社交媒体（X、Linkedin、FB等）"
+msgstr "社交媒体（X、LinkedIn、Facebook 等）"
 
 #: src/app/main/ui/onboarding/questions.cljs:275
 msgid "onboarding.questions.start-with.code"
-msgstr "从设计中产生真实代码"
+msgstr "从设计中生成真实代码"
 
 #: src/app/main/ui/onboarding/questions.cljs:273
 msgid "onboarding.questions.start-with.ds"
@@ -3315,15 +3327,15 @@ msgstr "原型设计"
 
 #: src/app/main/ui/onboarding/questions.cljs:267
 msgid "onboarding.questions.start-with.ui"
-msgstr "设计 App 的 UI/UX"
+msgstr "设计应用的 UI/UX"
 
 #: src/app/main/ui/onboarding/questions.cljs:269
 msgid "onboarding.questions.start-with.wireframing"
-msgstr "线框图"
+msgstr "线框设计"
 
 #: src/app/main/ui/onboarding/questions.cljs:114
 msgid "onboarding.questions.step1.question1"
-msgstr "您将使用 Penpot 做什么？"
+msgstr "你打算使用 Penpot 做什么？"
 
 #: src/app/main/ui/onboarding/questions.cljs:272
 #, unused
@@ -3332,7 +3344,9 @@ msgstr "是什么让你今天来到 Penpot？"
 
 #: src/app/main/ui/onboarding/questions.cljs:110
 msgid "onboarding.questions.step1.subtitle"
-msgstr "请告诉我们一些关于您的信息，帮助我们完善 Penpot。您的回答将帮助我们确定新功能的优先级，并指导您如何开始使用。"
+msgstr ""
+"请告诉我们一些关于你的信息，帮助我们优化 Penpot。你的回答将帮助我们确定新功能"
+"的优先级，并指引你开始使用。"
 
 #: src/app/main/ui/onboarding/questions.cljs:107
 msgid "onboarding.questions.step1.title"
@@ -3340,11 +3354,11 @@ msgstr "帮助我们了解你"
 
 #: src/app/main/ui/onboarding/questions.cljs:188
 msgid "onboarding.questions.step2.title"
-msgstr "这些工具中您最常使用哪个？"
+msgstr "你最常使用以下哪个工具？"
 
 #: src/app/main/ui/onboarding/questions.cljs:121
 msgid "onboarding.questions.step3.question1"
-msgstr "您做什么工作？"
+msgstr "你从事什么工作？"
 
 #: src/app/main/ui/onboarding/questions.cljs:303
 #, unused
@@ -3358,16 +3372,16 @@ msgstr "你的团队有多少人？"
 
 #: src/app/main/ui/onboarding/questions.cljs:242
 msgid "onboarding.questions.step3.title"
-msgstr "告诉我们您的工作"
+msgstr "你的公司规模有多大？"
 
 #: src/app/main/ui/onboarding/questions.cljs:300
 msgid "onboarding.questions.step4.title"
-msgstr "您想从哪里开始？"
+msgstr "你想从哪里开始？"
 
 #: src/app/main/ui/onboarding/questions.cljs:428
 #, unused
 msgid "onboarding.questions.step5.title"
-msgstr "您是如何听说Penpot的？"
+msgstr "你是如何得知 Penpot 的？"
 
 #: src/app/main/ui/onboarding/questions.cljs:233
 #, unused
@@ -3392,7 +3406,7 @@ msgstr "我是自由工作者"
 #: src/app/main/ui/onboarding/questions.cljs:230
 #, unused
 msgid "onboarding.questions.team-size.more-than-50"
-msgstr "50以上"
+msgstr "50 人以上"
 
 #: src/app/main/ui/onboarding/questions.cljs:235
 #, unused
@@ -3417,11 +3431,11 @@ msgstr "创建一个团队"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:53
 msgid "onboarding.team-modal.create-team-desc"
-msgstr "团队能够让你与其它Penpot用户协作处理相同的文件和项目。"
+msgstr "团队可以让你与其他 Penpot 用户协作处理相同的文件和项目。"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:57
 msgid "onboarding.team-modal.create-team-feature-1"
-msgstr "无限制的文件和项目"
+msgstr "文件和项目数量不限"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:59
 msgid "onboarding.team-modal.create-team-feature-2"
@@ -3433,11 +3447,11 @@ msgstr "角色管理"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:63
 msgid "onboarding.team-modal.create-team-feature-4"
-msgstr "无限制成员"
+msgstr "成员数量不限"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:65
 msgid "onboarding.team-modal.create-team-feature-5"
-msgstr "完全免费!"
+msgstr "完全免费！"
 
 #: src/app/main/ui/onboarding/team_choice.cljs:48
 msgid "onboarding.team-modal.team-definition"
@@ -3482,11 +3496,11 @@ msgstr "基础"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:418
 msgid "shortcut-section.dashboard"
-msgstr "仪表盘"
+msgstr "仪表板"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:421
 msgid "shortcut-section.viewer"
-msgstr "观察者"
+msgstr "阅读器"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:415
 msgid "shortcut-section.workspace"
@@ -3495,18 +3509,14 @@ msgstr "工作区"
 # SUBSECTIONS
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:58
 msgid "shortcut-subsection.alignment"
-msgstr "对准"
+msgstr "对齐"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:59
 msgid "shortcut-subsection.edit"
 msgstr "编辑"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "通用"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "通用"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3639,7 +3649,7 @@ msgstr "移至最上层"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:94
 msgid "shortcuts.clear-undo"
-msgstr "清除回退内容"
+msgstr "清除撤销历史"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:95
 msgid "shortcuts.copy"
@@ -3656,7 +3666,7 @@ msgstr "复制属性"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:98
 msgid "shortcuts.create-new-project"
-msgstr "创建新的"
+msgstr "新建"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:99
 msgid "shortcuts.cut"
@@ -3700,7 +3710,7 @@ msgstr "路径"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:109
 msgid "shortcuts.draw-rect"
-msgstr "长方形"
+msgstr "矩形"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:110
 msgid "shortcuts.draw-text"
@@ -3720,7 +3730,7 @@ msgstr "导出形状"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:116
 msgid "shortcuts.fit-all"
-msgstr "缩放至适应所有"
+msgstr "缩放以显示全部"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:117
 msgid "shortcuts.flip-horizontal"
@@ -3732,11 +3742,11 @@ msgstr "垂直翻转"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:119
 msgid "shortcuts.font-size-dec"
-msgstr "缩小字体大小"
+msgstr "减小字号"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:120
 msgid "shortcuts.font-size-inc"
-msgstr "增加字体大小"
+msgstr "增大字号"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:121
 msgid "shortcuts.go-to-drafts"
@@ -3752,7 +3762,7 @@ msgstr "搜索"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:124
 msgid "shortcuts.group"
-msgstr "组"
+msgstr "编组"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:125
 msgid "shortcuts.h-distribute"
@@ -3760,7 +3770,7 @@ msgstr "水平分布"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:126
 msgid "shortcuts.hide-ui"
-msgstr "显示/隐藏UI"
+msgstr "显示/隐藏 UI"
 
 #: src/app/main/ui/workspace/right_header.cljs:90, src/app/main/ui/workspace/sidebar/shortcuts.cljs:127
 msgid "shortcuts.increase-zoom"
@@ -3776,7 +3786,7 @@ msgstr "切换斜体"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:130
 msgid "shortcuts.join-nodes"
-msgstr "链接节点"
+msgstr "连接节点"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:131
 msgid "shortcuts.line-through"
@@ -3784,11 +3794,11 @@ msgstr "切换删除线"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:132
 msgid "shortcuts.make-corner"
-msgstr "制作圆角"
+msgstr "转换为角点"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:133
 msgid "shortcuts.make-curve"
-msgstr "制作曲线"
+msgstr "转换为曲线"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:134
 msgid "shortcuts.mask"
@@ -3844,47 +3854,47 @@ msgstr "下个画板"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:510
 msgid "shortcuts.not-found"
-msgstr "没找到快捷方式"
+msgstr "未找到快捷键"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:147
 msgid "shortcuts.opacity-0"
-msgstr "设置不透明度为100%"
+msgstr "将不透明度设为 100%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:148
 msgid "shortcuts.opacity-1"
-msgstr "设置不透明度为10%"
+msgstr "将不透明度设为 10%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:149
 msgid "shortcuts.opacity-2"
-msgstr "设置不透明度为20%"
+msgstr "将不透明度设为 20%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:150
 msgid "shortcuts.opacity-3"
-msgstr "设置不透明度为30%"
+msgstr "将不透明度设为 30%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:151
 msgid "shortcuts.opacity-4"
-msgstr "设置不透明度为40%"
+msgstr "将不透明度设为 40%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:152
 msgid "shortcuts.opacity-5"
-msgstr "设置不透明度为50%"
+msgstr "将不透明度设为 50%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:153
 msgid "shortcuts.opacity-6"
-msgstr "设置不透明度为60%"
+msgstr "将不透明度设为 60%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:154
 msgid "shortcuts.opacity-7"
-msgstr "设置不透明度为70%"
+msgstr "将不透明度设为 70%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:155
 msgid "shortcuts.opacity-8"
-msgstr "设置不透明度为80%"
+msgstr "将不透明度设为 80%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:156
 msgid "shortcuts.opacity-9"
-msgstr "设置不透明度为90%"
+msgstr "将不透明度设为 90%"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:157
 msgid "shortcuts.open-color-picker"
@@ -3892,23 +3902,23 @@ msgstr "色彩拾取器"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:158
 msgid "shortcuts.open-comments"
-msgstr "前往查阅者评论区"
+msgstr "前往阅读器的评论区"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:159
 msgid "shortcuts.open-dashboard"
-msgstr "前往看板"
+msgstr "前往仪表板"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:160
 msgid "shortcuts.open-inspect"
-msgstr "转到查看器检查部分"
+msgstr "前往阅读器的检查区域"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:161
 msgid "shortcuts.open-interactions"
-msgstr "转往阅读器交互部分"
+msgstr "前往阅读器的交互区域"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:162
 msgid "shortcuts.open-viewer"
-msgstr "转往阅读器交互部分"
+msgstr "打开阅读器"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:163
 msgid "shortcuts.open-workspace"
@@ -3994,15 +4004,7 @@ msgstr "对齐像素网格"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:181
 msgid "shortcuts.start-editing"
-msgstr "启用编辑"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "启用测量"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "停止测量"
+msgstr "开始编辑"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
@@ -4018,7 +4020,7 @@ msgstr "切换动态对齐"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:186
 msgid "shortcuts.toggle-assets"
-msgstr "切换资产"
+msgstr "切换素材面板"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:187
 msgid "shortcuts.toggle-colorpalette"
@@ -4042,11 +4044,11 @@ msgstr "切换历史"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:192
 msgid "shortcuts.toggle-layers"
-msgstr "切换层"
+msgstr "切换图层面板"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:193
 msgid "shortcuts.toggle-layout-flex"
-msgstr "添加/删除弹性布局"
+msgstr "添加/移除弹性布局"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:194
 msgid "shortcuts.toggle-layout-grid"
@@ -4054,7 +4056,7 @@ msgstr "添加/移除网格布局"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:195
 msgid "shortcuts.toggle-lock"
-msgstr "锁定所选"
+msgstr "锁定/解锁"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:196
 msgid "shortcuts.toggle-lock-size"
@@ -4082,7 +4084,7 @@ msgstr "更改主题"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:202
 msgid "shortcuts.toggle-visibility"
-msgstr "切换可见度"
+msgstr "显示/隐藏"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:203
 msgid "shortcuts.toggle-zoom-style"
@@ -4094,7 +4096,7 @@ msgstr "切换下划线"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:205
 msgid "shortcuts.undo"
-msgstr "回退"
+msgstr "撤销"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:206
 msgid "shortcuts.ungroup"
@@ -4110,27 +4112,27 @@ msgstr "垂直分布"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:209
 msgid "shortcuts.zoom-lense-decrease"
-msgstr "变焦镜头缩小"
+msgstr "降低缩放镜倍率"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:210
 msgid "shortcuts.zoom-lense-increase"
-msgstr "变焦镜头放大"
+msgstr "提高缩放镜倍率"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:211
 msgid "shortcuts.zoom-selected"
-msgstr "缩放到选定对象"
+msgstr "缩放至所选对象"
 
 #: src/app/main/ui/dashboard/subscription.cljs:118, src/app/main/ui/dashboard/subscription.cljs:299
 msgid "subscription.dashboard.power-up.enterprise-plan"
-msgstr "企业计划"
+msgstr "Enterprise 方案"
 
 #: src/app/main/ui/dashboard/subscription.cljs:113
 msgid "subscription.dashboard.power-up.enterprise-trial.top-title"
-msgstr "企业计划（实验）"
+msgstr "Enterprise 方案（试用版）"
 
 #: src/app/main/ui/dashboard/subscription.cljs:86
 msgid "subscription.dashboard.power-up.professional.top-title"
-msgstr "专业计划"
+msgstr "Professional 方案"
 
 #: src/app/main/ui/dashboard/subscription.cljs:64, src/app/main/ui/settings/subscription.cljs:107, src/app/main/ui/settings/subscription.cljs:131
 #, unused
@@ -4140,20 +4142,22 @@ msgstr "订阅"
 #: src/app/main/ui/dashboard/subscription.cljs:98
 #, markdown
 msgid "subscription.dashboard.power-up.trial.bottom-description"
-msgstr "试用体验良好？永久解锁完整访问权限。[订阅|target:self](%s)"
+msgstr "喜欢试用版吗？永久解锁全部功能。[订阅|target:self](%s)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:97
 msgid "subscription.dashboard.power-up.trial.top-title"
-msgstr "无限计划（试验）"
+msgstr "Unlimited 方案（试用版）"
 
 #: src/app/main/ui/dashboard/subscription.cljs:104, src/app/main/ui/dashboard/subscription.cljs:298
 msgid "subscription.dashboard.power-up.unlimited-plan"
-msgstr "无限计划"
+msgstr "Unlimited 方案"
 
 #: src/app/main/ui/dashboard/subscription.cljs:105
 #, markdown
 msgid "subscription.dashboard.power-up.unlimited.bottom-text"
-msgstr "以固定价格为您的所有团队提供无限存储空间、扩展文件恢复能力和无限编辑器。[查看企业版。|target:self](%s)"
+msgstr ""
+"以固定价格为你拥有的所有团队提供无限存储空间、更长的文件恢复期限和不限数量的"
+"编辑者。[查看 Enterprise 方案。|target:self](%s)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:70
 #, unused
@@ -4163,41 +4167,47 @@ msgstr "看一看"
 #: src/app/main/ui/dashboard/subscription.cljs:68
 #, unused
 msgid "subscription.dashboard.power-up.unlimited.top-description"
-msgstr "额外的编辑器、存储和自动保存的版本、文件备份等等。"
+msgstr "获得更多编辑席位和存储空间，以及更长的自动保存版本和文件恢复期限等。"
 
 #: src/app/main/ui/dashboard/subscription.cljs:85, src/app/main/ui/dashboard/subscription.cljs:96, src/app/main/ui/dashboard/subscription.cljs:103, src/app/main/ui/dashboard/subscription.cljs:112, src/app/main/ui/dashboard/subscription.cljs:117
 msgid "subscription.dashboard.power-up.your-subscription"
-msgstr "您的订阅："
+msgstr "你的订阅："
 
 #: src/app/main/ui/dashboard/subscription.cljs:333
 msgid "subscription.dashboard.professional-dashboard-cta-title"
-msgstr "您所拥有的团队共有 %s 名编辑，而您的专业计划最多可拥有 8 名编辑。"
+msgstr "你拥有的团队共有 %s 名编辑者，而 Professional 方案最多包含 8 个编辑席位。"
 
 #: src/app/main/ui/dashboard/subscription.cljs:341
 #, markdown
 msgid "subscription.dashboard.professional-dashboard-cta-upgrade-owner"
-msgstr "请升级到无限版或企业版，以解锁更多编辑席位、存储空间和文件恢复功能。[立即订阅。|target:self](%s)"
+msgstr ""
+"请立即升级到 Unlimited 或 Enterprise，以获得更多编辑席位和存储空间，并延长文"
+"件恢复期限。[立即订阅。|target:self](%s)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:274
 msgid "subscription.dashboard.team-plan"
-msgstr "团队计划"
+msgstr "团队方案"
 
 #: src/app/main/ui/dashboard/subscription.cljs:336
 msgid "subscription.dashboard.unlimited-dashboard-cta-title"
-msgstr "您的团队不断壮大！您的无限套餐最多可容纳 %s 位编辑，但现在您有 %s 位。"
+msgstr ""
+"你的团队还在不断壮大！Unlimited 方案最多包含 %s 个编辑席位，但你目前有 %s 名"
+"编辑者。"
 
 #: src/app/main/ui/dashboard/subscription.cljs:344
 #, markdown
 msgid "subscription.dashboard.unlimited-dashboard-cta-upgrade-owner"
-msgstr "请升级以匹配您当前的编辑数量。[立即订阅。|target:self](%s)"
+msgstr "请立即升级，使方案包含的编辑席位符合当前人数。[立即订阅。|target:self](%s)"
 
 #: src/app/main/ui/dashboard/subscription.cljs:321
 msgid "subscription.dashboard.unlimited-members-extra-editors-cta-text"
-msgstr "只有您自有团队中的新编辑人员才会被计入未来账单。25 名及以上编辑人员仍需支付每月 175 美元的固定费用。"
+msgstr ""
+"只有你拥有的团队中新增的编辑者才会计入后续账单。编辑者达到 25 名后，每月仍按"
+"固定价格 175 美元收费。"
 
 #: src/app/main/ui/dashboard/subscription.cljs:317
 msgid "subscription.dashboard.unlimited-members-extra-editors-cta-title"
-msgstr "在无限套餐期间邀请他人"
+msgstr "使用 Unlimited 方案时邀请成员"
 
 #: src/app/main/ui/dashboard/sidebar.cljs:1330
 msgid "subscription.dashboard.upgrade-plan.power-up"
@@ -4213,23 +4223,23 @@ msgstr "添加付款方式以便在试用后继续"
 
 #: src/app/main/ui/settings/subscription.cljs:606, src/app/main/ui/settings/subscription.cljs:693
 msgid "subscription.settings.benefits.all-professional-benefits"
-msgstr "所有专业计划权益以及："
+msgstr "包含 Professional 方案的所有权益，此外还有："
 
 #: src/app/main/ui/settings/subscription.cljs:618, src/app/main/ui/settings/subscription.cljs:630, src/app/main/ui/settings/subscription.cljs:640, src/app/main/ui/settings/subscription.cljs:709, src/app/main/ui/settings/subscription.cljs:725
 msgid "subscription.settings.benefits.all-unlimited-benefits"
-msgstr "所有无限计划权益以及："
+msgstr "包含 Unlimited 方案的所有权益，此外还有："
 
 #: src/app/main/ui/settings/subscription.cljs:62
 msgid "subscription.settings.editors"
-msgstr "（x %s 位编辑）"
+msgstr "（%s 名编辑者）"
 
 #: src/app/main/ui/dashboard/subscription.cljs:282, src/app/main/ui/settings/subscription.cljs:116, src/app/main/ui/settings/subscription.cljs:560, src/app/main/ui/settings/subscription.cljs:638, src/app/main/ui/settings/subscription.cljs:705
 msgid "subscription.settings.enterprise"
-msgstr "企业"
+msgstr "Enterprise"
 
 #: src/app/main/ui/settings/subscription.cljs:112, src/app/main/ui/settings/subscription.cljs:559, src/app/main/ui/settings/subscription.cljs:628
 msgid "subscription.settings.enterprise-trial"
-msgstr "企业（实验）"
+msgstr "Enterprise（试用版）"
 
 #: src/app/main/ui/settings/subscription.cljs:632, src/app/main/ui/settings/subscription.cljs:642, src/app/main/ui/settings/subscription.cljs:711
 msgid "subscription.settings.enterprise.autosave"
@@ -4245,17 +4255,19 @@ msgstr "无限存储空间"
 
 #: src/app/main/ui/dashboard/subscription.cljs:287, src/app/main/ui/settings/subscription.cljs:583, src/app/main/ui/settings/subscription.cljs:610, src/app/main/ui/settings/subscription.cljs:622, src/app/main/ui/settings/subscription.cljs:634, src/app/main/ui/settings/subscription.cljs:644
 msgid "subscription.settings.manage-your-subscription"
-msgstr "管理您的订阅"
+msgstr "管理你的订阅"
 
 #: src/app/main/ui/settings/subscription.cljs:128
 msgid "subscription.settings.management.dialog.currently-editors-title"
 msgid_plural "subscription.settings.management.dialog.currently-editors-title"
-msgstr[0] "目前，您的团队中有 %s 人可以编辑。"
-msgstr[1] "目前，您的团队中有 %s 人可以编辑。"
+msgstr[0] "目前，你的各团队中共有 %s 人可以编辑。"
+msgstr[1] "目前，你的各团队中共有 %s 人可以编辑。"
 
 #: src/app/main/ui/settings/subscription.cljs:260
 msgid "subscription.settings.management.dialog.downgrade"
-msgstr "注意：切换到较低的计划意味着更少的存储空间和更短的备份和版本历史记录。"
+msgstr ""
+"请注意：切换到较低级别的方案后，存储空间会减少，文件备份和版本历史记录的保留"
+"期限也会缩短。"
 
 #: src/app/main/ui/settings/subscription.cljs:282, src/app/main/ui/settings/subscription.cljs:286
 #, markdown
@@ -4264,11 +4276,11 @@ msgstr "每月 **$%s**"
 
 #: src/app/main/ui/settings/subscription.cljs:247
 msgid "subscription.settings.management.dialog.title"
-msgstr "应用 %s 到您的团队"
+msgstr "将 %s 应用于你的团队"
 
 #: src/app/main/ui/settings/subscription.cljs:662
 msgid "subscription.settings.member-since"
-msgstr "Penpot 成员，自从： %s"
+msgstr "加入 Penpot 的时间：%s"
 
 #: src/app/main/ui/settings/subscription.cljs:685, src/app/main/ui/settings/subscription.cljs:699, src/app/main/ui/settings/subscription.cljs:715, src/app/main/ui/settings/subscription.cljs:731
 msgid "subscription.settings.more-information"
@@ -4276,15 +4288,15 @@ msgstr "更多信息"
 
 #: src/app/main/ui/settings/subscription.cljs:665
 msgid "subscription.settings.other-plans"
-msgstr "其它 penpot 计划"
+msgstr "Penpot 的其他方案"
 
 #: src/app/main/ui/dashboard/subscription.cljs:277, src/app/main/ui/settings/subscription.cljs:114, src/app/main/ui/settings/subscription.cljs:591, src/app/main/ui/settings/subscription.cljs:667
 msgid "subscription.settings.professional"
-msgstr "专业"
+msgstr "Professional"
 
 #: src/app/main/ui/settings/subscription.cljs:569
 msgid "subscription.settings.section-plan"
-msgstr "您的订阅"
+msgstr "你的订阅"
 
 #: src/app/main/ui/settings/subscription.cljs:308, src/app/main/ui/settings/subscription.cljs:679, src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713, src/app/main/ui/settings/subscription.cljs:729, src/app/main/ui/settings/subscription.cljs:782
 msgid "subscription.settings.subscribe"
@@ -4292,36 +4304,31 @@ msgstr "订阅"
 
 #: src/app/main/ui/settings/subscription.cljs:377
 msgid "subscription.settings.success.dialog.footer"
-msgstr "享受您的计划！"
+msgstr "尽情使用你的方案吧！"
 
 #: src/app/main/ui/settings/subscription.cljs:370
 msgid "subscription.settings.success.dialog.title"
-msgstr "你是 %s！"
-
-#: src/app/main/ui/settings/subscription.cljs:655
-#, fuzzy
-msgid "subscription.settings.support-us-since"
-msgstr "您自从 %s 一直支持我们的这个计划"
+msgstr "你已开通 %s！"
 
 #: src/app/main/ui/settings/subscription.cljs:697, src/app/main/ui/settings/subscription.cljs:713
 msgid "subscription.settings.try-it-free"
-msgstr "免费试用14天"
+msgstr "免费试用 14 天"
 
 #: src/app/main/ui/dashboard/subscription.cljs:280, src/app/main/ui/settings/subscription.cljs:115, src/app/main/ui/settings/subscription.cljs:557, src/app/main/ui/settings/subscription.cljs:616, src/app/main/ui/settings/subscription.cljs:689
 msgid "subscription.settings.unlimited"
-msgstr "无限"
+msgstr "Unlimited"
 
 #: src/app/main/ui/dashboard/subscription.cljs:279, src/app/main/ui/settings/subscription.cljs:111, src/app/main/ui/settings/subscription.cljs:556, src/app/main/ui/settings/subscription.cljs:604
 msgid "subscription.settings.unlimited-trial"
-msgstr "无限（实验）"
+msgstr "Unlimited（试用版）"
 
 #: src/app/main/ui/settings/subscription.cljs:609, src/app/main/ui/settings/subscription.cljs:621, src/app/main/ui/settings/subscription.cljs:696
 msgid "subscription.settings.unlimited.bill"
-msgstr "月度账单上限"
+msgstr "每月账单上限为 175 美元"
 
 #: src/app/main/ui/dashboard/subscription.cljs:312, src/app/main/ui/workspace/main_menu.cljs:1137
 msgid "subscription.workspace.header.menu.option.power-up"
-msgstr "升级您的计划"
+msgstr "升级你的方案"
 
 #: src/app/main/ui/dashboard/files.cljs:179
 msgid "title.dashboard.files"
@@ -4385,11 +4392,11 @@ msgstr "设置 - %s - Penpot"
 
 #: src/app/main/ui/dashboard/team.cljs:1469
 msgid "title.team-webhooks"
-msgstr "Webhooks - %s - Penpot"
+msgstr "Webhook - %s - Penpot"
 
 #: src/app/main/ui/viewer.cljs:422
 msgid "title.viewer"
-msgstr "%s - 预览模式）- Penpot"
+msgstr "%s - 预览模式 - Penpot"
 
 #: src/app/main/ui/workspace.cljs:239
 msgid "title.workspace"
@@ -4397,7 +4404,7 @@ msgstr "%s - Penpot"
 
 #: src/app/main/ui/ds/controls/utilities/token_field.cljs:106, src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:67, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:141
 msgid "token-actions.detach-token"
-msgstr "分离token"
+msgstr "分离令牌"
 
 #: src/app/main/ui.cljs:138
 #, unused
@@ -4411,15 +4418,15 @@ msgstr "对不起！"
 
 #: src/app/main/ui/viewer.cljs:572
 msgid "viewer.empty-state"
-msgstr "该页面上未找到任何画框。"
+msgstr "此页面上未找到画板。"
 
 #: src/app/main/ui/viewer.cljs:577
 msgid "viewer.frame-not-found"
-msgstr "画框未找到。"
+msgstr "未找到画板。"
 
 #: src/app/main/ui/viewer/header.cljs:341
 msgid "viewer.header.comments-section"
-msgstr "注释 （%s）"
+msgstr "评论（%s）"
 
 #: src/app/main/ui/viewer/interactions.cljs:268
 msgid "viewer.header.dont-show-interactions"
@@ -4431,7 +4438,7 @@ msgstr "全屏"
 
 #: src/app/main/ui/viewer/header.cljs:350
 msgid "viewer.header.inspect-section"
-msgstr "检查 （%s）"
+msgstr "检查（%s）"
 
 #: src/app/main/ui/viewer/interactions.cljs:258
 msgid "viewer.header.interactions"
@@ -4439,7 +4446,7 @@ msgstr "交互"
 
 #: src/app/main/ui/viewer/header.cljs:332
 msgid "viewer.header.interactions-section"
-msgstr "交互 （%s）"
+msgstr "交互（%s）"
 
 #: src/app/main/ui/viewer/share_link.cljs:188
 msgid "viewer.header.share.copy-link"
@@ -4463,35 +4470,35 @@ msgstr "上次交付成功。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:56
 msgid "workspace.align.hcenter"
-msgstr "水平居中对齐 (%s)"
+msgstr "水平居中对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:72
 msgid "workspace.align.hdistribute"
-msgstr "水平均匀分布 (%s)"
+msgstr "水平等距分布（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:48
 msgid "workspace.align.hleft"
-msgstr "靠左对齐 (%s)"
+msgstr "左对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:64
 msgid "workspace.align.hright"
-msgstr "靠右对齐 (%s)"
+msgstr "右对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:97
 msgid "workspace.align.vbottom"
-msgstr "底部对齐 (%s)"
+msgstr "底部对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:89
 msgid "workspace.align.vcenter"
-msgstr "垂直居中对齐 (%s)"
+msgstr "垂直居中对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:102
 msgid "workspace.align.vdistribute"
-msgstr "垂直均匀分布 (%s)"
+msgstr "垂直等距分布（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/align.cljs:81
 msgid "workspace.align.vtop"
-msgstr "顶部对齐 (%s)"
+msgstr "顶部对齐（%s）"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs:181
 msgid "workspace.assets.add-library"
@@ -4532,7 +4539,7 @@ msgstr "创建组"
 
 #: src/app/main/ui/workspace/sidebar/assets/groups.cljs:171
 msgid "workspace.assets.create-group-hint"
-msgstr "这些物件将按照“组名/物件名”的格式自动命名"
+msgstr "这些项目将自动命名为“组名/项目名”"
 
 #: src/app/main/ui/workspace/context_menu.cljs:716, src/app/main/ui/workspace/sidebar/assets/colors.cljs:265, src/app/main/ui/workspace/sidebar/assets/components.cljs:670, src/app/main/ui/workspace/sidebar/assets/typographies.cljs:475, src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:541
 msgid "workspace.assets.delete"
@@ -4544,7 +4551,7 @@ msgstr "创建副本"
 
 #: src/app/main/ui/workspace/sidebar/assets/components.cljs:649
 msgid "workspace.assets.duplicate-main"
-msgstr "重复主体"
+msgstr "复制主组件"
 
 #: src/app/main/ui/workspace/sidebar/assets/colors.cljs:258, src/app/main/ui/workspace/sidebar/assets/typographies.cljs:466
 msgid "workspace.assets.edit"
@@ -4552,7 +4559,7 @@ msgstr "编辑"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs:195
 msgid "workspace.assets.filter"
-msgstr "过滤器"
+msgstr "筛选"
 
 #: src/app/main/ui/workspace/sidebar/assets/graphics.cljs:386, src/app/main/ui/workspace/sidebar/assets.cljs:152
 #, unused
@@ -4589,7 +4596,7 @@ msgstr "未找到素材"
 
 #: src/app/main/ui/workspace/sidebar/assets/file_library.cljs:111
 msgid "workspace.assets.open-library"
-msgstr "打开库文档"
+msgstr "打开库文件"
 
 #: src/app/main/ui/workspace/context_menu.cljs:719, src/app/main/ui/workspace/sidebar/assets/colors.cljs:254, src/app/main/ui/workspace/sidebar/assets/components.cljs:645, src/app/main/ui/workspace/sidebar/assets/groups.cljs:66, src/app/main/ui/workspace/sidebar/assets/typographies.cljs:461
 msgid "workspace.assets.rename"
@@ -4607,8 +4614,8 @@ msgstr "搜索素材"
 #, unused
 msgid "workspace.assets.selected-count"
 msgid_plural "workspace.assets.selected-count"
-msgstr[0] "已选中%s个物件"
-msgstr[1] "已选中%s个物件"
+msgstr[0] "已选中 %s 个项目"
+msgstr[1] "已选中 %s 个项目"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs
 #, unused
@@ -4618,8 +4625,8 @@ msgstr "共享库"
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:263
 msgid "workspace.assets.sidebar.components"
 msgid_plural "workspace.assets.sidebar.components"
-msgstr[0] "1个组件"
-msgstr[1] "%s个组件"
+msgstr[0] "1 个组件"
+msgstr[1] "%s 个组件"
 
 #: src/app/main/ui/workspace/sidebar/assets.cljs:213
 msgid "workspace.assets.sort"
@@ -4640,11 +4647,11 @@ msgstr "字体"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:577
 msgid "workspace.assets.typography.font-size"
-msgstr "尺寸"
+msgstr "字号"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:573
 msgid "workspace.assets.typography.font-style"
-msgstr "文字风格"
+msgstr "字体样式"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:595
 msgid "workspace.assets.typography.go-to-edit"
@@ -4652,7 +4659,7 @@ msgstr "前往样式库文件进行编辑"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:585
 msgid "workspace.assets.typography.letter-spacing"
-msgstr "字距"
+msgstr "字间距"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:581
 msgid "workspace.assets.typography.line-height"
@@ -4684,7 +4691,7 @@ msgstr "新建画板"
 
 #: src/app/main/ui/workspace/context_menu.cljs:857
 msgid "workspace.context-menu.grid-cells.merge"
-msgstr "合并网格"
+msgstr "合并单元格"
 
 #: src/app/main/ui/workspace/context_menu.cljs:784
 msgid "workspace.context-menu.grid-track.column.add-after"
@@ -4728,15 +4735,15 @@ msgstr "复制此行"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:841
 msgid "workspace.focus.focus-mode"
-msgstr "禅模式"
+msgstr "专注模式"
 
 #: src/app/main/ui/workspace/context_menu.cljs:398, src/app/main/ui/workspace/context_menu.cljs:742
 msgid "workspace.focus.focus-off"
-msgstr "退出禅模式"
+msgstr "退出专注模式"
 
 #: src/app/main/ui/workspace/context_menu.cljs:397
 msgid "workspace.focus.focus-on"
-msgstr "关注"
+msgstr "进入专注模式"
 
 #, unused
 msgid "workspace.focus.selection"
@@ -4748,7 +4755,7 @@ msgstr "线性渐变"
 
 #: src/app/util/color.cljs:35
 msgid "workspace.gradients.radial"
-msgstr "放射渐变"
+msgstr "径向渐变"
 
 #: src/app/main/ui/workspace/main_menu.cljs:288
 msgid "workspace.header.menu.disable-dynamic-alignment"
@@ -4756,7 +4763,7 @@ msgstr "禁用动态对齐"
 
 #: src/app/main/ui/workspace/main_menu.cljs:249
 msgid "workspace.header.menu.disable-scale-content"
-msgstr "禁用比例尺"
+msgstr "禁用比例缩放"
 
 #: src/app/main/ui/workspace/header.cljs
 #, unused
@@ -4781,7 +4788,7 @@ msgstr "启用动态对齐"
 
 #: src/app/main/ui/workspace/main_menu.cljs:250
 msgid "workspace.header.menu.enable-scale-content"
-msgstr "启用比例尺"
+msgstr "启用比例缩放"
 
 #: src/app/main/ui/workspace/header.cljs
 #, unused
@@ -4810,7 +4817,7 @@ msgstr "隐藏参考线"
 
 #: src/app/main/ui/workspace/main_menu.cljs:435
 msgid "workspace.header.menu.hide-palette"
-msgstr "隐藏调色盘"
+msgstr "隐藏调色板"
 
 #: src/app/main/ui/workspace/main_menu.cljs:472
 msgid "workspace.header.menu.hide-pixel-grid"
@@ -4834,16 +4841,16 @@ msgstr "文件"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1119
 msgid "workspace.header.menu.option.help-info"
-msgstr "帮助和信息"
+msgstr "帮助与信息"
 
 #: src/app/main/ui/workspace/main_menu.cljs:916
 #, unused
 msgid "workspace.header.menu.option.power-up"
-msgstr "升级您的计划"
+msgstr "升级你的方案"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1061
 msgid "workspace.header.menu.option.preferences"
-msgstr "首选项"
+msgstr "偏好设置"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1048
 msgid "workspace.header.menu.option.view"
@@ -4867,7 +4874,7 @@ msgstr "显示参考线"
 
 #: src/app/main/ui/workspace/main_menu.cljs:436
 msgid "workspace.header.menu.show-palette"
-msgstr "显示调色盘"
+msgstr "显示调色板"
 
 #: src/app/main/ui/workspace/main_menu.cljs:473
 msgid "workspace.header.menu.show-pixel-grid"
@@ -4915,12 +4922,12 @@ msgstr "正在保存"
 
 #: src/app/main/ui/workspace/right_header.cljs:237
 msgid "workspace.header.share"
-msgstr "共享"
+msgstr "分享"
 
 #: src/app/main/ui/workspace/right_header.cljs:48, src/app/main/ui/workspace/right_header.cljs:53
 #, unused
 msgid "workspace.header.unsaved"
-msgstr "未保存的修改"
+msgstr "未保存的更改"
 
 #: src/app/main/ui/workspace/right_header.cljs:242
 msgid "workspace.header.viewer"
@@ -4932,15 +4939,15 @@ msgstr "缩放"
 
 #: src/app/main/ui/viewer/header.cljs:109
 msgid "workspace.header.zoom-fill"
-msgstr "填充 - 填充比例"
+msgstr "填充 - 缩放以填满"
 
 #: src/app/main/ui/viewer/header.cljs:102
 msgid "workspace.header.zoom-fit"
-msgstr "适合 - 缩小以适合"
+msgstr "适合 - 缩小以适应"
 
 #: src/app/main/ui/workspace/right_header.cljs:98
 msgid "workspace.header.zoom-fit-all"
-msgstr "缩放以适应所有"
+msgstr "缩放以显示全部"
 
 #: src/app/main/ui/viewer/header.cljs:116
 msgid "workspace.header.zoom-full-screen"
@@ -4948,7 +4955,7 @@ msgstr "全屏"
 
 #: src/app/main/ui/workspace/right_header.cljs:105
 msgid "workspace.header.zoom-selected"
-msgstr "缩放到选定的位置"
+msgstr "缩放至所选对象"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:294, src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:296, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:854
 msgid "workspace.layout-grid.editor.options.edit-grid"
@@ -4964,7 +4971,7 @@ msgstr "下内边距"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:668, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:669
 msgid "workspace.layout-grid.editor.padding.expand"
-msgstr "显示4边内距选项"
+msgstr "显示四边内边距选项"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:419, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:430, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:436
 msgid "workspace.layout-grid.editor.padding.horizontal"
@@ -5009,15 +5016,15 @@ msgstr "添加"
 
 #: src/app/main/ui/workspace/color_palette.cljs:203, src/app/main/ui/workspace/colorpicker/libraries.cljs:372, src/app/main/ui/workspace/colorpicker/libraries.cljs:403
 msgid "workspace.libraries.colors.empty-palette"
-msgstr "你的库中还没有颜色风格"
+msgstr "你的库中还没有颜色样式"
 
 #: src/app/main/ui/workspace/text_palette.cljs:158
 msgid "workspace.libraries.colors.empty-typography-palette"
-msgstr "你的库中还没有排版风格"
+msgstr "你的库中还没有排版样式"
 
 #: src/app/main/ui/workspace/color_palette_ctx_menu.cljs:97, src/app/main/ui/workspace/colorpicker/libraries.cljs:220, src/app/main/ui/workspace/text_palette_ctx_menu.cljs:49
 msgid "workspace.libraries.colors.file-library"
-msgstr "文档库"
+msgstr "文件库"
 
 #: src/app/main/ui/workspace/colorpicker.cljs
 #, unused
@@ -5031,7 +5038,7 @@ msgstr "最近使用的颜色"
 #: src/app/main/ui/workspace/colorpicker.cljs
 #, unused
 msgid "workspace.libraries.colors.rgb-complementary"
-msgstr "RGB互补"
+msgstr "RGB 互补色"
 
 #: src/app/main/ui/workspace/colorpicker.cljs:364
 msgid "workspace.libraries.colors.rgba"
@@ -5039,23 +5046,23 @@ msgstr "RGBA"
 
 #: src/app/main/ui/workspace/colorpicker.cljs:562
 msgid "workspace.libraries.colors.save-color"
-msgstr "保存颜色风格"
+msgstr "保存颜色样式"
 
 #: src/app/main/ui/workspace/libraries.cljs:432
 msgid "workspace.libraries.empty.add-some"
-msgstr "或者添加一些这样的来试试："
+msgstr "也可以添加以下内容试用："
 
 #: src/app/main/ui/workspace/libraries.cljs:426
 msgid "workspace.libraries.empty.no-libraries"
-msgstr "您的团队中没有共享库，您可以查找"
+msgstr "你的团队中没有共享库，你可以查找"
 
 #: src/app/main/ui/workspace/libraries.cljs:430
 msgid "workspace.libraries.empty.some-templates"
-msgstr "这里有些模版"
+msgstr "这里的一些模板"
 
 #: src/app/main/ui/workspace/libraries.cljs:336
 msgid "workspace.libraries.file-library"
-msgstr "文档库"
+msgstr "文件库"
 
 #: src/app/main/ui/workspace/libraries.cljs:330
 msgid "workspace.libraries.in-this-file"
@@ -5081,7 +5088,7 @@ msgstr "加载中…"
 #: src/app/main/ui/workspace/libraries.cljs:387
 #, unused
 msgid "workspace.libraries.more-templates"
-msgstr "您可以搜索 "
+msgstr "你可以查找 "
 
 #: src/app/main/ui/workspace/libraries.cljs:526
 msgid "workspace.libraries.no-libraries-need-sync"
@@ -5089,7 +5096,7 @@ msgstr "没有需要更新的共享库"
 
 #: src/app/main/ui/workspace/libraries.cljs:440
 msgid "workspace.libraries.no-matches-for"
-msgstr "没有找到“%s”的匹配项"
+msgstr "未找到与“%s”匹配的结果"
 
 #: src/app/main/ui/workspace/libraries.cljs:394
 msgid "workspace.libraries.search-shared-libraries"
@@ -5101,21 +5108,21 @@ msgstr "共享库"
 
 #: src/app/main/ui/workspace/libraries.cljs:414
 msgid "workspace.libraries.shared-library-btn"
-msgstr "连接共享库"
+msgstr "连接库"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:332
 #, unused
 msgid "workspace.libraries.text.multiple-typography"
-msgstr "复合排版"
+msgstr "多种排版"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:335
 #, unused
 msgid "workspace.libraries.text.multiple-typography-tooltip"
-msgstr "断开所有排版的链接"
+msgstr "取消链接所有排版"
 
 #: src/app/main/ui/workspace/libraries.cljs:381
 msgid "workspace.libraries.unlink-library-btn"
-msgstr "断开共享库"
+msgstr "断开库连接"
 
 #: src/app/main/ui/workspace/libraries.cljs:548
 msgid "workspace.libraries.update"
@@ -5123,7 +5130,7 @@ msgstr "更新"
 
 #: src/app/main/ui/workspace/libraries.cljs:624
 msgid "workspace.libraries.update.see-all-changes"
-msgstr "查看所有修改"
+msgstr "查看所有更改"
 
 #: src/app/main/ui/workspace/libraries.cljs:671
 msgid "workspace.libraries.updates"
@@ -5131,7 +5138,7 @@ msgstr "更新"
 
 #: src/app/main/ui/ds/notifications/shared/notification_pill.cljs:61
 msgid "workspace.notification-pill.detail"
-msgstr "细节"
+msgstr "详细信息"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:784
 msgid "workspace.options.add-interaction"
@@ -5156,7 +5163,7 @@ msgstr "编组模糊"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:276
 msgid "workspace.options.blur-options.title.multiple"
-msgstr "选项模糊"
+msgstr "所选对象的模糊"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:160
 msgid "workspace.options.blur-options.toggle-blur"
@@ -5168,7 +5175,7 @@ msgstr "画布背景"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:692
 msgid "workspace.options.clip-content"
-msgstr "剪辑内容"
+msgstr "裁剪内容"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1023, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1029, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1278
 msgid "workspace.options.component"
@@ -5192,11 +5199,11 @@ msgstr "编辑注释"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1036, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1282
 msgid "workspace.options.component.main"
-msgstr "主要"
+msgstr "主组件"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:781
 msgid "workspace.options.component.swap"
-msgstr "交换组件"
+msgstr "替换组件"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:818
 msgid "workspace.options.component.swap.empty"
@@ -5208,31 +5215,31 @@ msgstr "未链接"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:570
 msgid "workspace.options.component.variant.duplicated.copy.locate"
-msgstr "转到主组件"
+msgstr "定位冲突的变体"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1337
 msgid "workspace.options.component.variant.duplicated.group.locate"
-msgstr "定位到复制的变体"
+msgstr "定位重复的变体"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1327
 msgid "workspace.options.component.variant.malformed.group.locate"
-msgstr "定位无效的变体"
+msgstr "定位无效变体"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1324
 msgid "workspace.options.component.variant.malformed.group.title"
-msgstr "一些变体的名字无效"
+msgstr "部分变体的名称无效"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:251
 msgid "workspace.options.component.variant.malformed.single.all"
-msgstr "这些变体的名字无效。"
+msgstr "这些变体的名称无效。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:248
 msgid "workspace.options.component.variant.malformed.single.one"
-msgstr "这个变体的名字无效。"
+msgstr "此变体的名称无效。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:254
 msgid "workspace.options.component.variant.malformed.single.some"
-msgstr "其中一些变体的名字无效。"
+msgstr "其中部分变体的名称无效。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:433
 msgid "workspace.options.component.variant.malformed.structure.example"
@@ -5244,15 +5251,15 @@ msgstr "尝试使用下面的结构："
 
 #: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:67
 msgid "workspace.options.component.variants-help-modal.rule1"
-msgstr "共享相同的名字。"
+msgstr "名称相同。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:76
 msgid "workspace.options.component.variants-help-modal.rule2"
-msgstr "是相同的类型。"
+msgstr "类型相同。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:87
 msgid "workspace.options.component.variants-help-modal.rule3"
-msgstr "存在相同的层级。"
+msgstr "位于同一层级。"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1041, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1285, src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:47
 msgid "workspace.options.component.variants-help-modal.title"
@@ -5309,13 +5316,13 @@ msgstr "导出"
 #: src/app/main/ui/workspace/sidebar/options/menus/exports.cljs, src/app/main/ui/inspect/exports.cljs
 #, unused
 msgid "workspace.options.export-multiple"
-msgstr "导出已选择"
+msgstr "导出所选对象"
 
 #: src/app/main/ui/inspect/exports.cljs:217, src/app/main/ui/workspace/sidebar/options/menus/exports.cljs:274
 msgid "workspace.options.export-object"
 msgid_plural "workspace.options.export-object"
-msgstr[0] "输出1个元素"
-msgstr[1] "输出%s元素"
+msgstr[0] "导出 1 个元素"
+msgstr[1] "导出 %s 个元素"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/exports.cljs:213
 msgid "workspace.options.export.add-export"
@@ -5363,7 +5370,7 @@ msgstr "调整画板适应内容大小"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:704
 msgid "workspace.options.flows.add-flow-start"
-msgstr "增加流程起点"
+msgstr "添加流程起点"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:700
 msgid "workspace.options.flows.flow"
@@ -5380,7 +5387,7 @@ msgstr "所有流程起点"
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:155
 #, unused
 msgid "workspace.options.flows.remove-flow"
-msgstr "移除流"
+msgstr "移除流程"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:32
 msgid "workspace.options.grid.auto"
@@ -5406,7 +5413,7 @@ msgstr "列"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:266
 msgid "workspace.options.grid.params.gutter"
-msgstr "栅格间隔"
+msgstr "间距"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:253
 msgid "workspace.options.grid.params.height"
@@ -5481,15 +5488,15 @@ msgstr "编组填充"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:69
 msgid "workspace.options.group-stroke"
-msgstr "编组边框"
+msgstr "组描边"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:337
 msgid "workspace.options.guides.add-guide"
-msgstr "新增辅助线"
+msgstr "添加参考线"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:188
 msgid "workspace.options.guides.remove-guide"
-msgstr "移除辅助线"
+msgstr "移除参考线"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:334
 msgid "workspace.options.guides.title"
@@ -5497,7 +5504,7 @@ msgstr "参考线"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs:184
 msgid "workspace.options.guides.toggle-guide"
-msgstr "切换辅助线"
+msgstr "切换参考线"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:553, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:572
 msgid "workspace.options.height"
@@ -5509,7 +5516,7 @@ msgstr "检查"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:438
 msgid "workspace.options.interaction-action"
-msgstr "执行"
+msgstr "操作"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:43, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:344
 msgid "workspace.options.interaction-after-delay"
@@ -5521,7 +5528,7 @@ msgstr "动画"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:383
 msgid "workspace.options.interaction-animation-dissolve"
-msgstr "解散"
+msgstr "淡化"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:382
 msgid "workspace.options.interaction-animation-none"
@@ -5529,7 +5536,7 @@ msgstr "无"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:389
 msgid "workspace.options.interaction-animation-push"
-msgstr "推送"
+msgstr "推入"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:384
 msgid "workspace.options.interaction-animation-slide"
@@ -5541,7 +5548,7 @@ msgstr "自动"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:570
 msgid "workspace.options.interaction-background"
-msgstr "添加背景覆盖"
+msgstr "添加背景叠加层"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:563
 msgid "workspace.options.interaction-close-outside"
@@ -5549,11 +5556,11 @@ msgstr "点击外部时关闭"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:349
 msgid "workspace.options.interaction-close-overlay"
-msgstr "关闭覆盖"
+msgstr "关闭叠加层"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:58
 msgid "workspace.options.interaction-close-overlay-dest"
-msgstr "关闭遮罩层: %s"
+msgstr "关闭叠加层：%s"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:426
 msgid "workspace.options.interaction-delay"
@@ -5561,7 +5568,7 @@ msgstr "延迟"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:449, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:455
 msgid "workspace.options.interaction-destination"
-msgstr "目的地"
+msgstr "目标"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:628
 msgid "workspace.options.interaction-duration"
@@ -5569,11 +5576,11 @@ msgstr "持续时间"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:641
 msgid "workspace.options.interaction-easing"
-msgstr "平滑"
+msgstr "缓动"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:393
 msgid "workspace.options.interaction-easing-ease"
-msgstr "缓解"
+msgstr "缓动"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:394
 msgid "workspace.options.interaction-easing-ease-in"
@@ -5581,7 +5588,7 @@ msgstr "缓入"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:396
 msgid "workspace.options.interaction-easing-ease-in-out"
-msgstr "缓进缓出"
+msgstr "缓入缓出"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:395
 msgid "workspace.options.interaction-easing-ease-out"
@@ -5594,7 +5601,7 @@ msgstr "线性"
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs
 #, unused
 msgid "workspace.options.interaction-in"
-msgstr "在"
+msgstr "进入"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:41, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:341
 msgid "workspace.options.interaction-mouse-enter"
@@ -5614,11 +5621,11 @@ msgstr "导航至"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:52
 msgid "workspace.options.interaction-navigate-to-dest"
-msgstr "导航到： %s"
+msgstr "导航至：%s"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:53, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:55, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:57, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:357
 msgid "workspace.options.interaction-none"
-msgstr "(未设定)"
+msgstr "（未设置）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:654
 msgid "workspace.options.interaction-offset-effect"
@@ -5634,16 +5641,16 @@ msgstr "打开叠加层"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:54
 msgid "workspace.options.interaction-open-overlay-dest"
-msgstr "打开覆盖：%s"
+msgstr "打开叠加层：%s"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:61, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:351
 msgid "workspace.options.interaction-open-url"
-msgstr "打开网址"
+msgstr "打开 URL"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs
 #, unused
 msgid "workspace.options.interaction-out"
-msgstr "外"
+msgstr "退出"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:380, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:556
 msgid "workspace.options.interaction-pos-bottom-center"
@@ -5663,7 +5670,7 @@ msgstr "居中"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:373
 msgid "workspace.options.interaction-pos-manual"
-msgstr "手册"
+msgstr "手动"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:377, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:532
 msgid "workspace.options.interaction-pos-top-center"
@@ -5687,7 +5694,7 @@ msgstr "保留滚动位置"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:60, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:350
 msgid "workspace.options.interaction-prev-screen"
-msgstr "上一个屏幕"
+msgstr "上一画面"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:494
 msgid "workspace.options.interaction-relative-to"
@@ -5695,15 +5702,15 @@ msgstr "相对于"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:59, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:356, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:370, src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:371
 msgid "workspace.options.interaction-self"
-msgstr "自己"
+msgstr "自身"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:348
 msgid "workspace.options.interaction-toggle-overlay"
-msgstr "切换覆盖层"
+msgstr "切换叠加层"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:56
 msgid "workspace.options.interaction-toggle-overlay-dest"
-msgstr "切换覆盖：%s"
+msgstr "切换叠加层：%s"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs:415
 msgid "workspace.options.interaction-trigger"
@@ -5886,7 +5893,7 @@ msgstr "反向行"
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
 msgid "workspace.options.layout.gap"
-msgstr "差距"
+msgstr "间距"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
@@ -5911,7 +5918,7 @@ msgstr "简易外边距"
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
 msgid "workspace.options.layout.packed"
-msgstr "收起"
+msgstr "紧凑"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
@@ -5936,12 +5943,12 @@ msgstr "右"
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
 msgid "workspace.options.layout.space-around"
-msgstr "周围留空"
+msgstr "两侧留白"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
 msgid "workspace.options.layout.space-between"
-msgstr "间隔留空"
+msgstr "两端对齐"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layout.cljs
 #, unused
@@ -5954,7 +5961,7 @@ msgstr "更多颜色"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs:227
 msgid "workspace.options.more-lib-colors"
-msgstr "更多共享库颜色"
+msgstr "更多库颜色"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:240, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:297
 msgid "workspace.options.opacity"
@@ -6019,11 +6026,11 @@ msgstr "已选颜色"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/fill.cljs:104
 msgid "workspace.options.selection-fill"
-msgstr "选项填充"
+msgstr "所选对象的填充"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:68
 msgid "workspace.options.selection-stroke"
-msgstr "选项边框"
+msgstr "所选对象的描边"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs:154
 msgid "workspace.options.shadow-options.add-shadow"
@@ -6059,7 +6066,7 @@ msgstr "移除阴影"
 
 #: src/app/main/ui/inspect/attributes/shadow.cljs:48, src/app/main/ui/workspace/sidebar/options/rows/shadow_row.cljs:190, src/app/main/ui/workspace/sidebar/options/rows/shadow_row.cljs:192
 msgid "workspace.options.shadow-options.spread"
-msgstr "展开"
+msgstr "扩散"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs:149
 msgid "workspace.options.shadow-options.title"
@@ -6071,7 +6078,7 @@ msgstr "编组阴影"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs:147
 msgid "workspace.options.shadow-options.title.multiple"
-msgstr "选项阴影"
+msgstr "所选对象的阴影"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/shadow_row.cljs:156
 msgid "workspace.options.shadow-options.toggle-shadow"
@@ -6095,16 +6102,16 @@ msgstr "尺寸预设"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:587
 msgid "workspace.options.size.lock"
-msgstr "锁定比率"
+msgstr "锁定比例"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:587
 msgid "workspace.options.size.unlock"
-msgstr "解锁比率"
+msgstr "解锁比例"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:44
 #, unused
 msgid "workspace.options.stroke"
-msgstr "边框"
+msgstr "描边"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
 #, unused
@@ -6118,11 +6125,11 @@ msgstr "圆形"
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
 #, unused
 msgid "workspace.options.stroke-cap.diamond-marker"
-msgstr "钻石标记"
+msgstr "菱形标记"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:200
 msgid "workspace.options.stroke-cap.diamond-marker-short"
-msgstr "钻石"
+msgstr "菱形"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs
 #, unused
@@ -6135,7 +6142,7 @@ msgstr "箭头"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:194
 msgid "workspace.options.stroke-cap.none"
-msgstr "无边框"
+msgstr "无"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:202
 msgid "workspace.options.stroke-cap.round"
@@ -6165,11 +6172,11 @@ msgstr "三角形"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:233
 msgid "workspace.options.stroke-color"
-msgstr "线条颜色"
+msgstr "描边颜色"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:268, src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:291
 msgid "workspace.options.stroke-width"
-msgstr "线宽"
+msgstr "描边宽度"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:209
 msgid "workspace.options.stroke.add-stroke"
@@ -6181,15 +6188,15 @@ msgstr "居中"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:163
 msgid "workspace.options.stroke.dashed"
-msgstr "长虚线"
+msgstr "虚线"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:162
 msgid "workspace.options.stroke.dotted"
-msgstr "虚线"
+msgstr "点线"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:136
 msgid "workspace.options.stroke.inner"
-msgstr "内部"
+msgstr "内侧"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:164
 msgid "workspace.options.stroke.mixed"
@@ -6197,7 +6204,7 @@ msgstr "混合"
 
 #: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:137
 msgid "workspace.options.stroke.outer"
-msgstr "外部"
+msgstr "外侧"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:224, src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:253
 msgid "workspace.options.stroke.remove-stroke"
@@ -6259,7 +6266,7 @@ msgstr "无"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:211
 msgid "workspace.options.text-options.strikethrough"
-msgstr "删除线 (%s)"
+msgstr "删除线（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:68
 msgid "workspace.options.text-options.text-align-center"
@@ -6287,7 +6294,7 @@ msgstr "编组文本"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:372
 msgid "workspace.options.text-options.title-selection"
-msgstr "选项文本"
+msgstr "所选对象的文本"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
 #, unused
@@ -6296,7 +6303,7 @@ msgstr "首字母大写"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:206
 msgid "workspace.options.text-options.underline"
-msgstr "下划线 (%s)"
+msgstr "下划线（%s）"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
 #, unused
@@ -6313,11 +6320,11 @@ msgstr "宽度"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:600, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:623
 msgid "workspace.options.x"
-msgstr "X轴"
+msgstr "X 轴"
 
 #: src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:613, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:634
 msgid "workspace.options.y"
-msgstr "Y轴"
+msgstr "Y 轴"
 
 #: src/app/main/ui/workspace/viewport/path_actions.cljs:166
 msgid "workspace.path.actions.add-node"
@@ -6337,11 +6344,11 @@ msgstr "连接节点（%s）"
 
 #: src/app/main/ui/workspace/viewport/path_actions.cljs:203
 msgid "workspace.path.actions.make-corner"
-msgstr "转锐角 (%s)"
+msgstr "转换为角点（%s）"
 
 #: src/app/main/ui/workspace/viewport/path_actions.cljs:210
 msgid "workspace.path.actions.make-curve"
-msgstr "转圆角 (%s)"
+msgstr "转换为曲线（%s）"
 
 #: src/app/main/ui/workspace/viewport/path_actions.cljs:181
 msgid "workspace.path.actions.merge-nodes"
@@ -6357,7 +6364,7 @@ msgstr "拆分节点（%s）"
 
 #: src/app/main/ui/workspace/viewport/path_actions.cljs:217
 msgid "workspace.path.actions.snap-nodes"
-msgstr "对接节点 (%s)"
+msgstr "吸附节点（%s）"
 
 #: src/app/main/ui/workspace/plugins.cljs:98
 msgid "workspace.plugins.button-open"
@@ -6366,7 +6373,7 @@ msgstr "打开"
 #: src/app/main/ui/workspace/plugins.cljs:215
 #, markdown
 msgid "workspace.plugins.discover"
-msgstr "发现 [more plugins](%s)"
+msgstr "发现[更多插件](%s)"
 
 #: src/app/main/ui/workspace/plugins.cljs:222
 msgid "workspace.plugins.empty-plugins"
@@ -6406,19 +6413,19 @@ msgstr "保存数据至浏览器。"
 
 #: src/app/main/ui/workspace/plugins.cljs:290
 msgid "workspace.plugins.permissions.comment-read"
-msgstr "阅读您的评论和回复。"
+msgstr "读取你的评论和回复。"
 
 #: src/app/main/ui/workspace/plugins.cljs:277
 msgid "workspace.plugins.permissions.library-read"
-msgstr "阅读您的库和资源。"
+msgstr "读取你的库和素材。"
 
 #: src/app/main/ui/workspace/plugins.cljs:271
 msgid "workspace.plugins.permissions.library-write"
-msgstr "阅读和修改您的库和资源。"
+msgstr "读取和修改你的库和素材。"
 
 #: src/app/main/ui/workspace/plugins.cljs:359
 msgid "workspace.plugins.permissions.title"
-msgstr "'%s' 插件需要访问："
+msgstr "“%s”插件需要访问："
 
 #: src/app/main/ui/workspace/plugins.cljs:227
 msgid "workspace.plugins.plugin-list-link"
@@ -6430,11 +6437,11 @@ msgstr "移除插件"
 
 #: src/app/main/ui/workspace/plugins.cljs:195
 msgid "workspace.plugins.search-placeholder"
-msgstr "写入插件 URL"
+msgstr "输入插件 URL"
 
 #, unused
 msgid "workspace.plugins.success"
-msgstr "插件已正确载入。"
+msgstr "插件已成功加载。"
 
 #: src/app/main/ui/workspace/plugins.cljs:188
 msgid "workspace.plugins.title"
@@ -6442,11 +6449,11 @@ msgstr "插件"
 
 #: src/app/main/ui/workspace/plugins.cljs:494
 msgid "workspace.plugins.try-out.cancel"
-msgstr "不是现在"
+msgstr "暂不"
 
 #: src/app/main/ui/workspace/plugins.cljs:483
 msgid "workspace.plugins.try-out.title"
-msgstr "'%s' 插件已为您的使用者安装！"
+msgstr "“%s”插件已为你的账号安装！"
 
 #: src/app/main/ui/workspace/plugins.cljs:500
 msgid "workspace.plugins.try-out.try"
@@ -6454,7 +6461,7 @@ msgstr "尝试插件"
 
 #: src/app/main/ui/workspace/context_menu.cljs:572
 msgid "workspace.shape.menu.add-flex"
-msgstr "添加弹性布局"
+msgstr "添加 Flex 布局"
 
 #: src/app/main/ui/workspace/context_menu.cljs:576
 msgid "workspace.shape.menu.add-grid"
@@ -6470,7 +6477,7 @@ msgstr "创建变体"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:590, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1069, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1217, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1303
 msgid "workspace.shape.menu.add-variant-property"
-msgstr "新增新属性"
+msgstr "添加新属性"
 
 #: src/app/main/ui/workspace/context_menu.cljs:289
 msgid "workspace.shape.menu.back"
@@ -6498,7 +6505,7 @@ msgstr "复制为 CSS"
 
 #: src/app/main/ui/workspace/context_menu.cljs:223
 msgid "workspace.shape.menu.copy-css-nested"
-msgstr "复制为 CSS （嵌套层）"
+msgstr "复制为 CSS（嵌套图层）"
 
 #: src/app/main/ui/workspace/context_menu.cljs:206
 msgid "workspace.shape.menu.copy-link"
@@ -6506,7 +6513,7 @@ msgstr "复制链接"
 
 #: src/app/main/ui/workspace/context_menu.cljs:219
 msgid "workspace.shape.menu.copy-paste-as"
-msgstr "复制/粘贴为..."
+msgstr "复制/粘贴为…"
 
 #: src/app/main/ui/workspace/context_menu.cljs:238
 msgid "workspace.shape.menu.copy-props"
@@ -6570,7 +6577,7 @@ msgstr "编辑"
 
 #: src/app/main/ui/workspace/context_menu.cljs:469, src/app/main/ui/workspace/sidebar/options/menus/bool.cljs:100
 msgid "workspace.shape.menu.exclude"
-msgstr "相减"
+msgstr "排除重叠"
 
 #: src/app/main/ui/workspace/context_menu.cljs:447, src/app/main/ui/workspace/context_menu.cljs:476, src/app/main/ui/workspace/sidebar/options/menus/bool.cljs:104
 msgid "workspace.shape.menu.flatten"
@@ -6599,7 +6606,7 @@ msgstr "移至顶层"
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs, src/app/main/ui/workspace/context_menu.cljs
 #, unused
 msgid "workspace.shape.menu.go-main"
-msgstr "前往主组件文档"
+msgstr "前往主组件文件"
 
 #: src/app/main/ui/workspace/context_menu.cljs:371
 msgid "workspace.shape.menu.group"
@@ -6623,7 +6630,7 @@ msgstr "锁定"
 
 #: src/app/main/ui/workspace/context_menu.cljs:376
 msgid "workspace.shape.menu.mask"
-msgstr "蒙板"
+msgstr "蒙版"
 
 #: src/app/main/ui/workspace/context_menu.cljs:212, src/app/main/ui/workspace/context_menu.cljs:734
 msgid "workspace.shape.menu.paste"
@@ -6639,7 +6646,7 @@ msgstr "路径"
 
 #: src/app/main/ui/workspace/context_menu.cljs:562
 msgid "workspace.shape.menu.remove-flex"
-msgstr "删除弹性布局"
+msgstr "移除 Flex 布局"
 
 #: src/app/main/ui/workspace/context_menu.cljs:565
 msgid "workspace.shape.menu.remove-grid"
@@ -6663,11 +6670,11 @@ msgstr "重命名"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:571
 msgid "workspace.shape.menu.reset-overrides"
-msgstr "还原自定义选项"
+msgstr "重置覆盖项"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:577
 msgid "workspace.shape.menu.restore-main"
-msgstr "恢复主要组件"
+msgstr "恢复主组件"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:576
 msgid "workspace.shape.menu.restore-variant"
@@ -6708,7 +6715,7 @@ msgstr "取消编组"
 
 #: src/app/main/ui/workspace/context_menu.cljs:460, src/app/main/ui/workspace/sidebar/options/menus/bool.cljs:85
 msgid "workspace.shape.menu.union"
-msgstr "相加"
+msgstr "并集"
 
 #: src/app/main/ui/workspace/context_menu.cljs:497, src/app/main/ui/workspace/sidebar/layer_item.cljs:197, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:278, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:330
 msgid "workspace.shape.menu.unlock"
@@ -6721,7 +6728,7 @@ msgstr "取消蒙版"
 #: src/app/main/ui/workspace/sidebar/options/menus/component.cljs, src/app/main/ui/workspace/sidebar/options/menus/component.cljs, src/app/main/ui/workspace/context_menu.cljs, src/app/main/ui/workspace/context_menu.cljs
 #, unused
 msgid "workspace.shape.menu.update-components-in-bulk"
-msgstr "更新主要组件"
+msgstr "更新主组件"
 
 #: src/app/main/ui/workspace/sidebar/assets/common.cljs:583
 msgid "workspace.shape.menu.update-main"
@@ -6761,11 +6768,11 @@ msgstr "图片"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:635, src/app/main/ui/workspace/sidebar/layers.cljs:685
 msgid "workspace.sidebar.layers.masks"
-msgstr "遮罩"
+msgstr "蒙版"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:566
 msgid "workspace.sidebar.layers.search"
-msgstr "搜索图层"
+msgstr "搜索…"
 
 #: src/app/main/ui/workspace/sidebar/layers.cljs:639, src/app/main/ui/workspace/sidebar/layers.cljs:733
 msgid "workspace.sidebar.layers.shapes"
@@ -6777,7 +6784,7 @@ msgstr "文本"
 
 #: src/app/main/ui/inspect/attributes/svg.cljs:56, src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs:113
 msgid "workspace.sidebar.options.svg-attrs.title"
-msgstr "已导入SVG属性"
+msgstr "已导入的 SVG 属性"
 
 #: src/app/main/ui/workspace/sidebar/sitemap.cljs:291
 msgid "workspace.sidebar.sitemap"
@@ -6785,7 +6792,7 @@ msgstr "页面"
 
 #: src/app/main/ui/workspace/sidebar/sitemap.cljs:301
 msgid "workspace.sidebar.sitemap.add-page"
-msgstr "新增页"
+msgstr "添加页面"
 
 #: src/app/main/ui/workspace/left_header.cljs:93
 msgid "workspace.sitemap"
@@ -6793,24 +6800,24 @@ msgstr "站点地图"
 
 #: src/app/main/ui/workspace/tokens/themes/theme_selector.cljs:87
 msgid "workspace.tokens.active-themes"
-msgstr "%s 个活动的主题"
+msgstr "%s 个已启用的令牌主题"
 
 #: src/app/main/ui/workspace/tokens/sidebar.cljs
 #, unused
 msgid "workspace.tokens.add set"
-msgstr "新增集"
+msgstr "添加令牌集"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:65, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:148, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:344
 msgid "workspace.tokens.add-new-theme"
-msgstr "新增新主题"
+msgstr "添加令牌主题"
 
 #: src/app/main/ui/workspace/tokens/sets/context_menu.cljs:62
 msgid "workspace.tokens.add-set-to-group"
-msgstr "新增集至此编组"
+msgstr "向此组添加令牌集"
 
 #: src/app/main/ui/workspace/colorpicker/color_tokens.cljs:199, src/app/main/ui/workspace/tokens/management/group.cljs:183
 msgid "workspace.tokens.add-token"
-msgstr "新增令牌：%s"
+msgstr "添加令牌：%s"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:141
 msgid "workspace.tokens.applied-to"
@@ -6822,11 +6829,11 @@ msgstr "轴"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:353
 msgid "workspace.tokens.back-to-themes"
-msgstr "返回到主题列表"
+msgstr "返回令牌主题列表"
 
 #: src/app/main/ui/workspace/tokens/settings/menu.cljs:88
 msgid "workspace.tokens.base-font-size"
-msgstr "基本字体大小"
+msgstr "基准字号"
 
 #: src/app/main/ui/workspace/tokens/modals/import.cljs:127
 #, unused
@@ -6844,7 +6851,7 @@ msgstr "颜色"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:56
 msgid "workspace.tokens.create-new-theme"
-msgstr "现在创建您的第一个主题。"
+msgstr "立即创建你的第一个令牌主题。"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:96, src/app/main/ui/workspace/tokens/themes.cljs:44
 msgid "workspace.tokens.create-one"
@@ -6852,15 +6859,15 @@ msgstr "创建一个。"
 
 #: src/app/main/ui/workspace/tokens/management/context_menu.cljs:360
 msgid "workspace.tokens.delete"
-msgstr "删除 token"
+msgstr "删除令牌"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:137
 msgid "workspace.tokens.delete-theme-title"
-msgstr "删除主题"
+msgstr "删除令牌主题"
 
 #: src/app/main/ui/workspace/tokens/management/context_menu.cljs:354
 msgid "workspace.tokens.duplicate"
-msgstr "复制 token"
+msgstr "复制令牌"
 
 #: src/app/main/data/workspace/tokens/library_edit.cljs:352
 msgid "workspace.tokens.duplicate-suffix"
@@ -6868,15 +6875,15 @@ msgstr "复制"
 
 #: src/app/main/ui/workspace/tokens/management/context_menu.cljs:340
 msgid "workspace.tokens.edit"
-msgstr "编辑 token"
+msgstr "编辑令牌"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:343
 msgid "workspace.tokens.edit-theme-title"
-msgstr "编辑主题"
+msgstr "编辑令牌主题"
 
 #: src/app/main/ui/workspace/tokens/themes/theme_selector.cljs:75
 msgid "workspace.tokens.edit-themes"
-msgstr "编辑主题"
+msgstr "编辑令牌主题"
 
 #: src/app/main/ui/workspace/tokens/export/modal.cljs:48
 msgid "workspace.tokens.export"
@@ -6884,7 +6891,7 @@ msgstr "导出"
 
 #: src/app/main/ui/workspace/tokens/export/modal.cljs:124
 msgid "workspace.tokens.export-tokens"
-msgstr "导出 tokens"
+msgstr "导出令牌"
 
 #: src/app/main/ui/workspace/tokens/export/modal.cljs:34
 msgid "workspace.tokens.export.preview"
@@ -6905,7 +6912,7 @@ msgstr "错误： "
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:92
 msgid "workspace.tokens.group-name"
-msgstr "编组名称"
+msgstr "令牌组名称"
 
 #: src/app/main/ui/workspace/tokens/import/modal.cljs:232
 msgid "workspace.tokens.import-button-prefix"
@@ -6926,35 +6933,35 @@ msgstr "ZIP 文件"
 #: src/app/main/ui/workspace/tokens/sidebar.cljs:414, src/app/main/ui/workspace/tokens/sidebar.cljs:415
 #, unused
 msgid "workspace.tokens.import-tooltip"
-msgstr "导入 JSON 文件将覆盖所有当前令牌、集合和主题"
+msgstr "导入 JSON 文件将覆盖当前所有令牌、令牌集和令牌主题"
 
 #: src/app/main/ui/workspace/tokens/import/modal.cljs:246, src/app/main/ui/workspace/tokens/import_from_library.cljs:81
 msgid "workspace.tokens.import-warning"
-msgstr "导入 token 将覆盖您当前的所有令牌、集合和主题。"
+msgstr "导入令牌将覆盖你当前的所有令牌、令牌集和令牌主题。"
 
 #: src/app/main/ui/workspace/tokens/management.cljs:83
 msgid "workspace.tokens.inactive-set"
-msgstr "不激活"
+msgstr "未启用"
 
 #: src/app/main/ui/workspace/tokens/management.cljs:75
 msgid "workspace.tokens.inactive-set-description"
-msgstr "此设置未启用。请更改主题或启用此设置以在视口中查看更改"
+msgstr "此令牌集未启用。请更改令牌主题或启用此令牌集，以在视口中查看更改"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:202
 msgid "workspace.tokens.label.group"
-msgstr "编组"
+msgstr "令牌组"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:204
 msgid "workspace.tokens.label.group-placeholder"
-msgstr "新增编组 (如模式)"
+msgstr "添加令牌组（例如模式）"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:211
 msgid "workspace.tokens.label.theme"
-msgstr "主题"
+msgstr "令牌主题"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:212
 msgid "workspace.tokens.label.theme-placeholder"
-msgstr "新增一个主题（如浅色）"
+msgstr "添加令牌主题（例如浅色）"
 
 #: src/app/main/ui/workspace/tokens/management/context_menu.cljs:234
 msgid "workspace.tokens.margins"
@@ -6974,42 +6981,41 @@ msgstr "右键单击查看选项"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:132
 msgid "workspace.tokens.no-active-sets"
-msgstr "没有活动集"
+msgstr "没有已启用的令牌集"
 
 #: src/app/main/ui/workspace/tokens/themes/theme_selector.cljs:92
 msgid "workspace.tokens.no-active-theme"
-msgstr "主题未启用"
+msgstr "没有已启用的令牌主题"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:72
 msgid "workspace.tokens.no-permisions-set"
-msgstr "您需要成为编辑才能激活/停用集合"
+msgstr "你需要拥有编辑权限才能启用或停用令牌集"
 
 #: src/app/main/ui/workspace/tokens/themes.cljs:54
 msgid "workspace.tokens.no-permission-themes"
-msgstr "您需要成为一名编辑才能使用主题"
+msgstr "你需要拥有编辑权限才能使用令牌主题"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:485
 msgid "workspace.tokens.no-sets-create"
-msgstr "尚未定义任何集合。请先创建一个。"
+msgstr "尚未定义任何令牌集。请先创建一个。"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:93, src/app/main/ui/workspace/tokens/sets/lists.cljs:99
 msgid "workspace.tokens.no-sets-yet"
-msgstr "尚不存在任何集。"
+msgstr "尚无令牌集。"
 
 #: src/app/main/ui/workspace/tokens/themes.cljs:40
 msgid "workspace.tokens.no-themes"
-msgstr "目前没有主题。"
+msgstr "尚无令牌主题。"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:52
 msgid "workspace.tokens.no-themes-currently"
-msgstr "您目前没有主题。"
+msgstr "你目前没有令牌主题。"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:131
 msgid "workspace.tokens.num-active-sets"
-msgstr "%s 个活跃集"
+msgstr "%s 个已启用的令牌集"
 
 #: src/app/main/ui/workspace/tokens/management/token_pill.cljs:122
-#, fuzzy
 msgid "workspace.tokens.original-value"
 msgstr "原始值：%s"
 
@@ -7021,23 +7027,27 @@ msgstr "内边距"
 msgid "workspace.tokens.radius"
 msgstr "圆角半径"
 
+#: src/app/main/ui/ds/controls/utilities/token_field.cljs:47, src/app/main/ui/workspace/tokens/management/token_pill.cljs:130
+#, fuzzy
+msgid "workspace.tokens.ref-not-valid"
+msgstr "{%s} 中的引用无效，或不属于任何活动令牌集"
+
 #: src/app/main/ui/workspace/tokens/style_dictionary.cljs
 #, unused
 msgid "workspace.tokens.reference-error"
-msgstr "参考错误： "
+msgstr "引用错误： "
 
 #: src/app/main/data/workspace/tokens/warnings.cljs:15, src/app/main/data/workspace/tokens/warnings.cljs:19, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:59, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:87, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:105, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:296, src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:489, src/app/main/ui/workspace/tokens/management/forms/controls/combobox.cljs:298, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:189, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:324, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:259, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:381, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:505, src/app/main/ui/workspace/tokens/management/token_pill.cljs:123
-#, fuzzy
 msgid "workspace.tokens.resolved-value"
-msgstr "解析的值：%s"
+msgstr "解析值：%s"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:248
 msgid "workspace.tokens.save-theme"
-msgstr "保存主题"
+msgstr "保存令牌主题"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:204, src/app/main/ui/workspace/tokens/sets/lists.cljs:309
 msgid "workspace.tokens.select-set"
-msgstr "选择集。"
+msgstr "选择令牌集。"
 
 #: src/app/main/ui/workspace/tokens/sets/lists.cljs:60
 msgid "workspace.tokens.set-edit-placeholder"
@@ -7045,12 +7055,12 @@ msgstr "输入名称（组名使用“/”）"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:358
 msgid "workspace.tokens.set-selection-theme"
-msgstr "定义应使用哪些 token 集作为此主题选项的一部分："
+msgstr "定义此令牌主题应使用哪些令牌集："
 
 #: src/app/main/ui/workspace/tokens/token_pill.cljs:47
 #, unused
 msgid "workspace.tokens.set.not-active"
-msgstr "Token 集未激活"
+msgstr "令牌集未启用"
 
 #: src/app/main/ui/workspace/tokens/management/context_menu.cljs:258
 msgid "workspace.tokens.size"
@@ -7059,14 +7069,13 @@ msgstr "大小"
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:154
 #, unused
 msgid "workspace.tokens.theme-name"
-msgstr "主题 %s"
+msgstr "令牌主题 %s"
 
 #: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:48, src/app/main/ui/workspace/tokens/themes/create_modal.cljs:82
 msgid "workspace.tokens.themes-list"
-msgstr "主题列表"
+msgstr "令牌主题列表"
 
 #: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:334, src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:335
-#, fuzzy
 msgid "workspace.tokens.token-description"
 msgstr "描述"
 
@@ -7108,7 +7117,7 @@ msgstr "图片（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:199, src/app/main/ui/workspace/top_toolbar.cljs:200
 msgid "workspace.toolbar.move"
-msgstr "移动 (%s)"
+msgstr "移动（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:256, src/app/main/ui/workspace/top_toolbar.cljs:257
 msgid "workspace.toolbar.path"
@@ -7116,7 +7125,7 @@ msgstr "路径（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:267, src/app/main/ui/workspace/top_toolbar.cljs:268
 msgid "workspace.toolbar.plugins"
-msgstr "插件 (%s)"
+msgstr "插件（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:218, src/app/main/ui/workspace/top_toolbar.cljs:219
 msgid "workspace.toolbar.rect"
@@ -7125,7 +7134,7 @@ msgstr "矩形（%s）"
 #: src/app/main/ui/workspace/left_toolbar.cljs
 #, unused
 msgid "workspace.toolbar.shortcuts"
-msgstr "快捷键 （%s）"
+msgstr "快捷键（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:236, src/app/main/ui/workspace/top_toolbar.cljs:237
 msgid "workspace.toolbar.text"
@@ -7133,7 +7142,7 @@ msgstr "文本（%s）"
 
 #: src/app/main/ui/workspace/palette.cljs:190, src/app/main/ui/workspace/palette.cljs:191
 msgid "workspace.toolbar.text-palette"
-msgstr "排字式样 (%s)"
+msgstr "排版（%s）"
 
 #: src/app/main/ui/workspace/top_toolbar.cljs:289, src/app/main/ui/workspace/top_toolbar.cljs:290
 msgid "workspace.toolbar.toggle-toolbar"
@@ -7146,7 +7155,7 @@ msgstr "完成"
 #: src/app/main/ui/workspace/viewport/top_bar.cljs:37
 #, markdown, unused
 msgid "workspace.top-bar.view-only"
-msgstr "**检查代码**(仅查看)"
+msgstr "**检查代码**（仅查看）"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:378
 msgid "workspace.undo.empty"
@@ -7154,11 +7163,11 @@ msgstr "目前没有历史修改"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:148
 msgid "workspace.undo.entry.delete"
-msgstr "%s已删除"
+msgstr "删除了 %s"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:147
 msgid "workspace.undo.entry.modify"
-msgstr "%s已修改"
+msgstr "修改了 %s"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:149
 msgid "workspace.undo.entry.move"
@@ -7222,7 +7231,7 @@ msgstr "排版素材"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:146
 msgid "workspace.undo.entry.new"
-msgstr "新建%s"
+msgstr "新建了 %s"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:126
 msgid "workspace.undo.entry.single.circle"
@@ -7286,7 +7295,7 @@ msgstr "排版素材"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:150
 msgid "workspace.undo.entry.unknown"
-msgstr "操作覆盖%s"
+msgstr "对 %s 执行操作"
 
 #: src/app/main/ui/workspace/sidebar/history.cljs:335
 #, unused
@@ -7355,15 +7364,15 @@ msgstr "%s 的版本"
 
 #: src/app/main/ui/workspace/sidebar/versions.cljs:421
 msgid "workspace.versions.loading"
-msgstr "截入中..."
+msgstr "加载中…"
 
 #, unused
 msgid "workspace.versions.locked-by-you"
-msgstr "此版本已被您锁定"
+msgstr "此版本已被你锁定"
 
 #: src/app/main/data/workspace/versions.cljs:230
 msgid "workspace.versions.restore-warning"
-msgstr "你想要恢复此版本吗？"
+msgstr "要恢复此版本吗？"
 
 #, unused
 msgid "workspace.versions.snapshot-menu"
@@ -7380,3 +7389,2221 @@ msgstr "打开版本菜单"
 #, unused
 msgid "workspace.viewport.click-to-close-path"
 msgstr "单击以闭合路径"
+
+#: src/app/main/ui/auth/recovery_request.cljs:113, src/app/main/ui/auth/register.cljs:237
+msgid "auth.check-email"
+msgstr "请检查你的邮箱！"
+
+#: src/app/main/ui/auth/register.cljs:238
+msgid "auth.verification-sent-email"
+msgstr "我们已将验证邮件发送至："
+
+#: src/app/main/ui/workspace/colorpicker/color_tokens.cljs:35
+msgid "color-token.empty-state"
+msgstr "没有可用的颜色令牌。请检查已启用的令牌集或主题，或添加新的颜色令牌。"
+
+#: src/app/main/ui/dashboard/file_menu.cljs:209
+msgid "dashboard-restore-file-confirmation.description"
+msgstr "你将要恢复 %s。"
+
+#: src/app/main/ui/dashboard/file_menu.cljs:208
+msgid "dashboard-restore-file-confirmation.title"
+msgstr "恢复文件"
+
+#: src/app/main/ui/dashboard/deleted.cljs:316
+msgid "dashboard.clear-trash-button"
+msgstr "清空回收站"
+
+#: src/app/main/ui/dashboard/deleted.cljs:265
+msgid "dashboard.delete-all-forever-confirmation.description"
+msgstr "确定要永久删除回收站中的所有项目和文件吗？此操作无法撤销。"
+
+#: src/app/main/ui/dashboard/file_menu.cljs:222
+msgid "dashboard.delete-file-forever-confirmation.description"
+msgstr "确定要永久删除 %s 吗？此操作无法撤销。"
+
+#: src/app/main/data/dashboard.cljs:861
+msgid "dashboard.delete-files-success-notification"
+msgstr "已成功删除 %s 个文件。"
+
+#: src/app/main/ui/dashboard/deleted.cljs:53, src/app/main/ui/dashboard/deleted.cljs:55, src/app/main/ui/dashboard/deleted.cljs:264, src/app/main/ui/dashboard/deleted.cljs:266, src/app/main/ui/dashboard/file_menu.cljs:221, src/app/main/ui/dashboard/file_menu.cljs:223
+msgid "dashboard.delete-forever-confirmation.title"
+msgstr "永久删除"
+
+#: src/app/main/ui/dashboard/deleted.cljs:86
+msgid "dashboard.delete-project-button"
+msgstr "删除项目"
+
+#: src/app/main/ui/dashboard/deleted.cljs:54
+msgid "dashboard.delete-project-forever-confirmation.description"
+msgstr ""
+"确定要永久删除项目 %s 吗？该项目及其包含的所有文件都将被永久删除。此操作无法"
+"撤销。"
+
+#: src/app/main/data/dashboard.cljs:860, src/app/main/data/dashboard.cljs:894
+msgid "dashboard.delete-success-notification"
+msgstr "已成功删除 %s。"
+
+#: src/app/main/ui/workspace/colorpicker.cljs:431, src/app/main/ui/workspace/colorpicker.cljs:443
+msgid "workspace.colorpicker.color-tokens"
+msgstr "颜色令牌"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs:268
+msgid "workspace.options.more-token-colors"
+msgstr "更多颜色令牌"
+
+#: src/app/main/ui/ds/controls/utilities/token_field.cljs:48
+#, fuzzy
+msgid "ds.inputs.token-field.no-active-token-option"
+msgstr "{%s} 令牌不属于任何已启用的令牌集，或其值无效。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:302, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:232
+msgid "errors.field-max-length"
+msgstr "最多可包含 %s 个字符。"
+
+#: src/app/main/data/common.cljs:82
+msgid "notifications.by-code.upgrade-version"
+msgstr "有新版本可用。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:292
+msgid "workspace.tokens.edit-token"
+msgstr "编辑 %s 令牌"
+
+#: src/app/main/ui/dashboard/deleted.cljs:330
+msgid "dashboard.deleted.empty-state-description"
+msgstr "回收站为空。删除的文件和项目会显示在这里。"
+
+#: src/app/main/ui/dashboard/grid.cljs:247
+msgid "dashboard.deleted.will-be-deleted-at"
+msgstr "将于 %s 删除"
+
+#, unused
+msgid "dashboard.errors.error-on-delete-file"
+msgstr "删除文件 %s 时出错。"
+
+#: src/app/main/data/dashboard.cljs:864
+msgid "dashboard.errors.error-on-delete-files"
+msgstr "删除文件时出错。"
+
+#: src/app/main/data/dashboard.cljs:897
+msgid "dashboard.errors.error-on-delete-project"
+msgstr "删除项目 %s 时出错。"
+
+#: src/app/main/data/dashboard.cljs:992, src/app/main/ui/dashboard/file_menu.cljs:202
+msgid "dashboard.errors.error-on-restore-file"
+msgstr "恢复文件 %s 时出错。"
+
+#: src/app/main/data/dashboard.cljs:993
+msgid "dashboard.errors.error-on-restore-files"
+msgstr "恢复文件时出错。"
+
+#: src/app/main/data/dashboard.cljs:1025
+msgid "dashboard.errors.error-on-restoring-project"
+msgstr "恢复项目 %s 及其文件时出错。"
+
+#: src/app/main/ui/dashboard/file_menu.cljs:267
+msgid "dashboard.file-menu.delete-files-permanently-option"
+msgid_plural "dashboard.file-menu.delete-files-permanently-option"
+msgstr[0] "删除文件"
+msgstr[1] "删除文件"
+
+#: src/app/main/ui/dashboard/file_menu.cljs:264
+msgid "dashboard.file-menu.restore-files-option"
+msgid_plural "dashboard.file-menu.restore-files-option"
+msgstr[0] "恢复文件"
+msgstr[1] "恢复文件"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:376
+msgid "dashboard.go-to-admin-console"
+msgstr "前往管理控制台"
+
+#: src/app/main/ui/dashboard/import.cljs:505
+msgid "dashboard.import.import-error.check-error"
+msgstr "无法验证此文件。"
+
+#: src/app/main/ui/dashboard/import.cljs:509
+msgid "dashboard.import.import-error.corrupt-file"
+msgstr "这个文件似乎已损坏。"
+
+#: src/app/main/ui/dashboard/import.cljs:512
+msgid "dashboard.import.import-error.unknown-error"
+msgstr "处理该文件的时候出错了。"
+
+#: src/app/main/ui/dashboard/team.cljs:851
+msgid "dashboard.invitation-modal.delete"
+msgstr "你将删除发送给以下人员的邀请："
+
+#: src/app/main/ui/dashboard/team.cljs:852
+msgid "dashboard.invitation-modal.resend"
+msgstr "你将向以下人员重新发送邀请："
+
+#: src/app/main/ui/dashboard/team.cljs:842
+msgid "dashboard.invitation-modal.title.delete-invitations"
+msgstr "删除邀请"
+
+#: src/app/main/ui/dashboard/team.cljs:843
+msgid "dashboard.invitation-modal.title.resend-invitations"
+msgstr "重新发送邀请"
+
+#: src/app/main/ui/dashboard/team.cljs:831, src/app/main/ui/dashboard/team.cljs:1136
+msgid "dashboard.invitations.no-permission"
+msgstr "你没有权限邀请他人加入此团队，也没有权限编辑或删除邀请。"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:348, src/app/main/ui/dashboard/sidebar.cljs:349, src/app/main/ui/dashboard/sidebar.cljs:761
+#, fuzzy
+msgid "dashboard.my-teams"
+msgstr "我的团队"
+
+#: src/app/main/ui/dashboard/team_form.cljs:152
+msgid "dashboard.no-permission-create-team.message"
+msgstr "你无权在 %s 组织内创建团队。如需更多信息，请联系该组织的负责人。"
+
+#: src/app/main/ui/dashboard/team_form.cljs:154
+msgid "dashboard.no-permission-delete-team.message"
+msgstr "你无权在 %s 组织内删除团队。如需更多信息，请联系该组织的负责人。"
+
+#: src/app/main/ui/dashboard/team_form.cljs:158
+msgid "dashboard.no-permission-move-team.message"
+msgstr "你无权在 %s 组织内移动团队。如需更多信息，请联系该组织的负责人。"
+
+#: src/app/main/ui/dashboard/team.cljs:1158
+msgid "dashboard.order-invitations-by-role"
+msgstr "按角色排序"
+
+#: src/app/main/ui/dashboard/team.cljs:1167
+msgid "dashboard.order-invitations-by-status"
+msgstr "按状态排序"
+
+#: src/app/main/data/dashboard.cljs:805
+msgid "dashboard.progress-notification.deleting-files"
+msgstr "删除文件中…"
+
+#: src/app/main/data/dashboard.cljs:926
+msgid "dashboard.progress-notification.restoring-files"
+msgstr "恢复文件中…"
+
+#: src/app/main/data/dashboard.cljs:806
+msgid "dashboard.progress-notification.slow-delete"
+msgstr "删除速度出乎意料地慢"
+
+#: src/app/main/data/dashboard.cljs:927
+msgid "dashboard.progress-notification.slow-restore"
+msgstr "恢复速度出乎意料地慢"
+
+#: src/app/main/ui/dashboard/deleted.cljs:277
+msgid "dashboard.restore-all-confirmation.description"
+msgstr "你将恢复所有项目和文件。这可能需要一些时间。"
+
+#: src/app/main/ui/dashboard/deleted.cljs:276
+msgid "dashboard.restore-all-confirmation.title"
+msgstr "恢复所有的项目及其文件"
+
+#: src/app/main/ui/dashboard/deleted.cljs:311
+msgid "dashboard.restore-all-deleted-button"
+msgstr "恢复所有"
+
+#: src/app/main/data/dashboard.cljs:986
+msgid "dashboard.restore-files-success-notification"
+msgstr "已成功恢复 %s 个文件。"
+
+#: src/app/main/ui/dashboard/deleted.cljs:83
+msgid "dashboard.restore-project-button"
+msgstr "恢复项目"
+
+#: src/app/main/ui/dashboard/deleted.cljs:43
+msgid "dashboard.restore-project-confirmation.description"
+msgstr "你将恢复项目 %s 及其中的所有文件。"
+
+#: src/app/main/ui/dashboard/deleted.cljs:42
+msgid "dashboard.restore-project-confirmation.title"
+msgstr "恢复项目"
+
+#: src/app/main/data/dashboard.cljs:958, src/app/main/data/dashboard.cljs:985, src/app/main/data/dashboard.cljs:1022, src/app/main/ui/dashboard/file_menu.cljs:199
+msgid "dashboard.restore-success-notification"
+msgstr "已成功恢复 %s。"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:354
+msgid "dashboard.section.organizations"
+msgstr "组织"
+
+#: src/app/main/ui/dashboard/team.cljs:1609
+msgid "dashboard.team-organization"
+msgstr "团队组织"
+
+#: src/app/main/ui/dashboard/team.cljs:1643
+msgid "dashboard.team-organization.add"
+msgstr "添加到组织"
+
+#: src/app/main/ui/dashboard/team.cljs:1632
+msgid "dashboard.team-organization.change"
+msgstr "更改团队所属组织"
+
+#: src/app/main/ui/dashboard/team.cljs:1639
+msgid "dashboard.team-organization.none"
+msgstr "这个团队不属于任何组织"
+
+#: src/app/main/ui/dashboard/team.cljs:1635
+msgid "dashboard.team-organization.remove"
+msgstr "从组织中移除团队"
+
+#: src/app/main/ui/dashboard/deleted.cljs:301
+msgid "dashboard.trash-info-text-part1"
+msgstr "删除的文件会在回收站中保留"
+
+#: src/app/main/ui/dashboard/deleted.cljs:303
+msgid "dashboard.trash-info-text-part2"
+msgstr " %s 天。 "
+
+#: src/app/main/ui/dashboard/deleted.cljs:304
+msgid "dashboard.trash-info-text-part3"
+msgstr "之后，它们将被永久删除。"
+
+#: src/app/main/ui/dashboard/deleted.cljs:306
+msgid "dashboard.trash-info-text-part4"
+msgstr "如果你改变主意，可以在每个文件的菜单中恢复或永久删除它们。"
+
+#: src/app/main/ui/settings/subscription.cljs:600, src/app/main/ui/settings/subscription.cljs:678
+msgid "subscription.settings.professional.selfhost.community-support"
+msgstr "所有设计和原型功能，以及社区支持。"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs
+#, unused
+msgid "workspace.tokens.no-remap-needed"
+msgstr "该令牌目前未用于你的设计，因此无需重新映射。"
+
+#: src/app/main/ui/settings/options.cljs:109
+msgid "dashboard.webgl-switch.beta"
+msgstr "测试版"
+
+#: src/app/main/ui/settings/options.cljs:110
+msgid "dashboard.webgl-switch.description"
+msgstr ""
+"WebGL 渲染可以提升性能，但目前仍处于测试阶段，稳定性可能较低。画布、导出内容"
+"（SVG/PDF）和查看模式之间可能存在一些视觉差异。"
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.disabled"
+msgstr "已关闭"
+
+#: src/app/main/ui/settings/options.cljs:113
+msgid "dashboard.webgl-switch.enabled"
+msgstr "已开启"
+
+#: src/app/main/ui/settings/options.cljs:116
+msgid "dashboard.webgl-switch.feedback"
+msgstr "提供反馈"
+
+#: src/app/main/ui/settings/options.cljs:112
+msgid "dashboard.webgl-switch.status"
+msgstr "状态"
+
+#: src/app/main/ui/settings/options.cljs:108
+msgid "dashboard.webgl-switch.title"
+msgstr "WebGL 渲染"
+
+#: src/app/main/data/workspace/clipboard.cljs:327, src/app/main/data/workspace/clipboard.cljs:535
+msgid "errors.clipboard-api-unavailable"
+msgstr "剪贴板 API 不可用。请通过 HTTPS 提供 Penpot 服务以启用剪贴板访问"
+
+#: src/app/main/data/workspace/clipboard.cljs:321, src/app/main/data/workspace/clipboard.cljs:529
+msgid "errors.clipboard-permission-denied"
+msgstr "剪贴板访问遭拒。请在浏览器中授予剪贴板权限以粘贴内容"
+
+#: src/app/main/ui/dashboard/fonts.cljs:341
+msgid "errors.font-family-invalid-chars"
+msgstr "字体家族名称只能包含字母、数字、空格、连字符、下划线和句点。"
+
+#: src/app/main/ui/static.cljs:89
+msgid "errors.invite-email-mismatch"
+msgstr ""
+"此邀请对应的是另一个电子邮箱地址。请退出登录，然后使用受邀账号登录；或者请团"
+"队所有者重新发送邀请。"
+
+#: src/app/main/ui/static.cljs:93
+msgid "errors.invite-expired"
+msgstr "此邀请已过期。请让团队所有者重新发送邀请。"
+
+#: src/app/main/ui/dashboard/team.cljs:1057
+msgid "errors.max-quote-reached"
+msgstr "已达到配额上限"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:466
+msgid "errors.team-leave.only-owner-can-delete"
+msgstr "只有团队所有者可以删除团队。"
+
+#: common/src/app/common/types/team.cljc:26
+#, unused
+msgid "errors.team-name-invalid-chars"
+msgstr "团队名称不能包含以下字符：'.'、':' 或 '/'"
+
+#: src/app/main/data/media.cljs:74
+#, unused
+msgid "errors.token-theme-not-existing-sets"
+msgstr "此主题引用了不存在的令牌集：%s"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:49
+msgid "errors.tokens.circular-reference"
+msgstr "令牌存在循环引用"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:115, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:243
+msgid "errors.tokens.composite-line-height-needs-font-size"
+msgstr "行高依赖字号。请添加字号以获取解析值。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs:350, src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs:436
+msgid "errors.tokens.empty-field"
+msgstr "此字段不能为空"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:41
+msgid "errors.tokens.empty-input"
+msgstr "令牌值不能为空"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:107
+msgid "errors.tokens.invalid-font-family-token-value"
+msgstr "令牌值无效：只能引用字体家族令牌"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:119
+msgid "errors.tokens.invalid-shadow-type-token-value"
+msgstr "阴影类型无效：仅接受 'innerShadow' 或 'dropShadow'"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:131
+msgid "errors.tokens.invalid-token-value-shadow"
+msgstr "值无效：必须引用复合阴影令牌。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:111
+msgid "errors.tokens.invalid-token-value-typography"
+msgstr "值无效：必须引用复合排版令牌。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:67, src/app/main/ui/workspace/tokens/management/forms/controls/utils.cljs:126
+msgid "errors.tokens.name-collision"
+msgstr "%s 的组名与另一个已启用令牌集中的同名令牌冲突。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:57
+msgid "errors.tokens.number-too-large"
+msgstr "令牌值无效。解析值过大：%s"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:87, src/app/main/data/workspace/tokens/warnings.cljs:15
+msgid "errors.tokens.opacity-range"
+msgstr "不透明度必须介于 0 和 100% 之间或介于 0 和 1 之间（例如 50% 或 0.5）。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:123
+msgid "errors.tokens.shadow-blur-range"
+msgstr "阴影模糊值必须大于或等于 0。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:127
+msgid "errors.tokens.shadow-spread-range"
+msgstr "阴影扩展值必须大于或等于 0。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:91, src/app/main/data/workspace/tokens/warnings.cljs:19
+msgid "errors.tokens.stroke-width-range"
+msgstr "描边宽度必须大于或等于 0。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:83
+msgid "errors.tokens.value-with-percent"
+msgstr "值无效：不允许使用 %。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:79
+msgid "errors.tokens.value-with-units"
+msgstr "值无效：不允许使用单位。"
+
+#: src/app/main/errors.cljs:105
+#, unused
+msgid "errors.unexpected-exception"
+msgstr "意外错误：%s"
+
+#: src/app/main/ui/static.cljs:346
+msgid "errors.webgl-context-lost.desc-message"
+msgstr "WebGL 已停止工作。请重新加载页面以将其重置"
+
+#: src/app/main/ui/static.cljs:345
+msgid "errors.webgl-context-lost.main-message"
+msgstr "糟糕！画布上下文已丢失"
+
+#: src/app/main/ui/settings/feedback.cljs:122
+msgid "feedback.description-placeholder"
+msgstr "请说明反馈原因"
+
+#: src/app/main/ui/settings/feedback.cljs:143
+msgid "feedback.other-ways-contact"
+msgstr "其他联系方式"
+
+#: src/app/main/ui/settings/feedback.cljs:126
+msgid "feedback.penpot.link"
+msgstr "如果反馈与某个文件或项目有关，请在此添加 Penpot 链接："
+
+#: src/app/main/ui/settings/feedback.cljs:101
+msgid "feedback.title-contact-us"
+msgstr "联系我们"
+
+#: src/app/main/ui/settings/feedback.cljs:110, src/app/main/ui/settings/feedback.cljs:111
+msgid "feedback.type"
+msgstr "类型"
+
+#: src/app/main/ui/settings/feedback.cljs:115
+msgid "feedback.type.doubt"
+msgstr "疑问"
+
+#: src/app/main/ui/settings/feedback.cljs:113
+msgid "feedback.type.idea"
+msgstr "建议"
+
+#: src/app/main/ui/settings/feedback.cljs:114
+msgid "feedback.type.issue"
+msgstr "问题"
+
+#: src/app/main/ui/exports/files.cljs:131
+#, fuzzy
+msgid "files-download-modal.description-1"
+msgstr "你要下载的一个或多个文件使用了共享库。要如何处理其中的素材*？"
+
+#: src/app/main/ui/exports/files.cljs:123
+msgid "files-download-modal.title"
+msgstr "下载文件"
+
+#: src/app/main/ui/inspect/styles/rows/color_properties_row.cljs:123
+msgid "inspect.attributes.image.preview"
+msgstr "形状填充图像的预览"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:322
+msgid "inspect.attributes.typography.mixed-font-family"
+msgstr "混合字体家族"
+
+#: src/app/main/ui/inspect/attributes/text.cljs:112
+msgid "inspect.attributes.typography.text-decoration.strikethrough"
+msgstr "删除线"
+
+#: src/app/main/ui/inspect/right_sidebar.cljs:169
+msgid "inspect.color-space-label"
+msgstr "选择颜色空间"
+
+#: src/app/main/ui/inspect/right_sidebar.cljs:239
+msgid "inspect.empty.more"
+msgstr "更多信息"
+
+#: src/app/main/ui/inspect/right_sidebar.cljs:176
+msgid "inspect.tabs-switcher-label"
+msgstr "检查面板选项卡"
+
+#: src/app/main/ui/inspect/styles/panels/tokens_panel.cljs:26
+msgid "inspect.tabs.styles.active-sets"
+msgstr "已启用的令牌集"
+
+#: src/app/main/ui/inspect/styles/panels/tokens_panel.cljs:21
+msgid "inspect.tabs.styles.active-themes"
+msgstr "已启用的主题"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:75
+msgid "inspect.tabs.styles.copy-shorthand"
+msgstr "将 CSS 简写复制到剪贴板"
+
+#: src/app/main/ui/inspect/styles/property_detail_copiable.cljs:52
+msgid "inspect.tabs.styles.copy-to-clipboard"
+msgstr "复制到剪贴板"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:22
+#, unused
+msgid "inspect.tabs.styles.geometry-panel"
+msgstr "尺寸和位置"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:67, src/app/main/ui/workspace/colorpicker/color_tokens.cljs:181
+msgid "inspect.tabs.styles.toggle-style"
+msgstr "切换面板 %s"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:26
+msgid "inspect.tabs.styles.token-panel"
+msgstr "令牌集和主题"
+
+#: src/app/main/ui/ds/controls/shared/token_option.cljs:46, src/app/main/ui/inspect/styles/rows/color_properties_row.cljs:104, src/app/main/ui/inspect/styles/rows/properties_row.cljs:62
+msgid "inspect.tabs.styles.token-resolved-value"
+msgstr "解析值："
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:25
+msgid "inspect.tabs.styles.variants-panel"
+msgstr "变体属性"
+
+#: src/app/main/ui/settings/integrations.cljs:629
+msgid "integrations.access-tokens.create"
+msgstr "创建新访问令牌"
+
+#: src/app/main/ui/settings/integrations.cljs:645
+msgid "integrations.access-tokens.empty.add-one"
+msgstr "点击“创建新访问令牌”按钮即可生成令牌。"
+
+#: src/app/main/ui/settings/integrations.cljs:644
+msgid "integrations.access-tokens.empty.no-access-tokens"
+msgstr "你还没有访问令牌。"
+
+#: src/app/main/ui/settings/integrations.cljs:619
+msgid "integrations.access-tokens.personal"
+msgstr "个人访问令牌"
+
+#: src/app/main/ui/settings/integrations.cljs:624
+msgid "integrations.access-tokens.personal.description"
+msgstr "个人访问令牌可替代账号密码认证，让应用访问 Penpot 内部 API"
+
+#: src/app/main/ui/settings/integrations.cljs:68
+msgid "integrations.copy-to-clipboard"
+msgstr "复制到剪贴板"
+
+#: src/app/main/ui/settings/integrations.cljs:266
+msgid "integrations.create-access-token.title"
+msgstr "创建访问令牌"
+
+#: src/app/main/ui/settings/integrations.cljs:265
+msgid "integrations.create-access-token.title.created"
+msgstr "访问令牌已创建"
+
+#: src/app/main/ui/settings/integrations.cljs:384
+msgid "integrations.delete-token.accept"
+msgstr "删除令牌"
+
+#: src/app/main/ui/settings/integrations.cljs:383
+msgid "integrations.delete-token.message"
+msgstr "确定要删除此令牌吗？"
+
+#: src/app/main/ui/settings/integrations.cljs:382
+msgid "integrations.delete-token.title"
+msgstr "删除令牌"
+
+#: src/app/main/ui/settings/integrations.cljs:226
+msgid "integrations.expiration-180-days"
+msgstr "180 天"
+
+#: src/app/main/ui/settings/integrations.cljs:223
+msgid "integrations.expiration-30-days"
+msgstr "30 天"
+
+#: src/app/main/ui/settings/integrations.cljs:224
+msgid "integrations.expiration-60-days"
+msgstr "60 天"
+
+#: src/app/main/ui/settings/integrations.cljs:225
+msgid "integrations.expiration-90-days"
+msgstr "90 天"
+
+#: src/app/main/ui/settings/integrations.cljs:221
+msgid "integrations.expiration-date.label"
+msgstr "到期日期"
+
+#: src/app/main/ui/settings/integrations.cljs:222
+msgid "integrations.expiration-never"
+msgstr "永不过期"
+
+#: src/app/main/ui/settings/integrations.cljs:406
+msgid "integrations.expired-on"
+msgstr "已于 %s 过期"
+
+#: src/app/main/ui/settings/integrations.cljs:407
+msgid "integrations.expires-on"
+msgstr "将于 %s 过期"
+
+#: src/app/main/ui/settings/integrations.cljs:307
+msgid "integrations.generate-mcp-key.title"
+msgstr "生成 MCP 密钥"
+
+#: src/app/main/ui/settings/integrations.cljs:305
+msgid "integrations.generate-mcp-key.title.created"
+msgstr "MCP 密钥已生成"
+
+#: src/app/main/ui/settings/integrations.cljs:124
+msgid "integrations.info.mcp-client-config"
+msgstr "将此配置添加到你的 MCP 客户端（例如 ~/.mcp.json）。"
+
+#: src/app/main/ui/settings/integrations.cljs:206
+msgid "integrations.info.mcp-server"
+msgstr "Penpot MCP 服务器让 MCP 客户端能够直接与 Penpot 设计文件交互。"
+
+#: src/app/main/ui/settings/integrations.cljs:113
+msgid "integrations.mcp-key.will-expire"
+msgstr "MCP 密钥将于 %s 过期"
+
+#: src/app/main/ui/settings/integrations.cljs:116
+msgid "integrations.mcp-key.will-not-expire"
+msgstr "MCP 密钥没有到期日期"
+
+#: src/app/main/ui/settings/integrations.cljs:511
+msgid "integrations.mcp-server.description"
+msgstr "Penpot MCP 服务器让 MCP 客户端能够直接与 Penpot 设计文件交互。"
+
+#: src/app/main/ui/settings/integrations.cljs:415
+#, unused
+msgid "integrations.mcp-server.mcp-keys.copy"
+msgstr "复制链接"
+
+#: src/app/main/ui/settings/integrations.cljs:594
+msgid "integrations.mcp-server.mcp-keys.help"
+msgstr "如何配置 MCP 客户端"
+
+#: src/app/main/ui/settings/integrations.cljs:581
+msgid "integrations.mcp-server.mcp-keys.info"
+msgstr "你需要使用此服务器 URL 配置 MCP 客户端，以连接到 Penpot MCP 服务器。"
+
+#: src/app/main/ui/settings/integrations.cljs:561
+msgid "integrations.mcp-server.mcp-keys.regenerate"
+msgstr "重新生成 MCP 密钥"
+
+#: src/app/main/ui/settings/integrations.cljs:554
+msgid "integrations.mcp-server.mcp-keys.title"
+msgstr "MCP 密钥"
+
+#: src/app/main/ui/settings/integrations.cljs:562
+msgid "integrations.mcp-server.mcp-keys.tootip"
+msgstr "配置 MCP 客户端时需要 MCP 密钥"
+
+#: src/app/main/ui/settings/integrations.cljs:517
+msgid "integrations.mcp-server.status"
+msgstr "状态"
+
+#: src/app/main/ui/settings/integrations.cljs:537
+msgid "integrations.mcp-server.status.disabled"
+msgstr "已停用"
+
+#: src/app/main/ui/settings/integrations.cljs:536
+msgid "integrations.mcp-server.status.enabled"
+msgstr "已启用"
+
+#: src/app/main/ui/settings/integrations.cljs:527
+msgid "integrations.mcp-server.status.expired.0"
+msgstr "用于连接 MCP 服务器的 MCP 密钥已过期，因此无法建立连接。"
+
+#: src/app/main/ui/settings/integrations.cljs:532
+msgid "integrations.mcp-server.status.expired.1"
+msgstr "请重新生成 MCP 密钥，并在客户端配置中更新为新密钥。"
+
+#: src/app/main/ui/settings/integrations.cljs:502
+msgid "integrations.mcp-server.title"
+msgstr "MCP 服务器"
+
+#: src/app/main/ui/settings/integrations.cljs:506
+msgid "integrations.mcp-server.title.beta"
+msgstr "测试版"
+
+#: src/app/main/ui/settings/integrations.cljs:213
+msgid "integrations.name.label"
+msgstr "名称"
+
+#: src/app/main/ui/settings/integrations.cljs:214
+msgid "integrations.name.placeholder"
+msgstr "名称可帮助你了解令牌的用途"
+
+#: src/app/main/ui/settings/integrations.cljs:405
+msgid "integrations.no-expiration"
+msgstr "无到期日期"
+
+#: src/app/main/ui/settings/integrations.cljs:491
+msgid "integrations.notification.success.copied-link"
+msgstr "链接已复制到剪贴板"
+
+#: src/app/main/ui/settings/integrations.cljs:254, src/app/main/ui/settings/integrations.cljs:287, src/app/main/ui/settings/integrations.cljs:332
+msgid "integrations.notification.success.created"
+msgstr "令牌创建成功"
+
+#: src/app/main/ui/settings/integrations.cljs:86
+msgid "integrations.notification.success.mcp-key-copied"
+msgstr "MCP 密钥已复制"
+
+#: src/app/main/ui/settings/integrations.cljs:457
+msgid "integrations.notification.success.mcp-server-disabled"
+msgstr "MCP 服务器已停用"
+
+#: src/app/main/ui/settings/integrations.cljs:456
+msgid "integrations.notification.success.mcp-server-enabled"
+msgstr "MCP 服务器已启用"
+
+#: src/app/main/ui/settings/integrations.cljs:87
+msgid "integrations.notification.success.token-copied"
+msgstr "令牌已复制"
+
+#: src/app/main/ui/settings/integrations.cljs:350
+msgid "integrations.regenerate-mcp-key.info"
+msgstr "重新生成 MCP 密钥会立即撤销当前密钥，所有使用该密钥的应用都将停止工作。"
+
+#: src/app/main/ui/settings/integrations.cljs:349
+msgid "integrations.regenerate-mcp-key.title"
+msgstr "重新生成 MCP 密钥"
+
+#: src/app/main/ui/settings/integrations.cljs:347
+msgid "integrations.regenerate-mcp-key.title.created"
+msgstr "MCP 密钥已重新生成"
+
+#: src/app/main/ui/settings/integrations.cljs:666
+msgid "integrations.title"
+msgstr "集成"
+
+#: src/app/main/ui/settings/integrations.cljs:102
+msgid "integrations.token.info.non-recuperable"
+msgstr "此唯一令牌无法恢复。如果丢失，你需要创建一个新令牌。"
+
+#: src/app/main/ui/settings/integrations.cljs:114
+msgid "integrations.token.will-expire"
+msgstr "令牌将于 %s 过期"
+
+#: src/app/main/ui/settings/integrations.cljs:117
+msgid "integrations.token.will-not-expire"
+msgstr "令牌没有到期日期"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1395
+msgid "labels.about-penpot"
+msgstr "关于 Penpot"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:31, src/app/main/ui/inspect/styles/style_box.cljs:33, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:115, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:263, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:278
+msgid "labels.blur"
+msgstr "模糊"
+
+#: src/app/main/ui/inspect/attributes/blur.cljs:30, src/app/main/ui/inspect/styles/style_box.cljs:32, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:262, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:274
+msgid "labels.blur-effects"
+msgstr "模糊效果"
+
+#: src/app/main/ui/workspace/colorpicker.cljs:427
+msgid "labels.color"
+msgstr "颜色"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1382
+msgid "labels.community-contributions"
+msgstr "社区与贡献"
+
+#: src/app/main/ui/static.cljs:446
+msgid "labels.contact-support"
+msgstr "联系支持团队"
+
+#: src/app/main/ui/settings/sidebar.cljs:135
+msgid "labels.contact-us"
+msgstr "联系我们"
+
+#: src/app/main/ui/static.cljs:73, src/app/main/ui/static.cljs:339
+msgid "labels.copyright-period"
+msgstr "Kaleidos © 2019 - 至今"
+
+#: src/app/main/ui/settings/profile.cljs:116
+msgid "labels.delete-profile-photo.message"
+msgstr "确定要删除你的头像吗？"
+
+#: src/app/main/ui/settings/profile.cljs:115
+msgid "labels.delete-profile-photo.title"
+msgstr "删除头像"
+
+#: src/app/main/ui/dashboard/deleted.cljs:216
+msgid "labels.deleted"
+msgstr "已删除"
+
+#: src/app/main/data/workspace/mcp.cljs:186
+#, unused
+msgid "labels.dismiss"
+msgstr "忽略"
+
+#: src/app/main/ui/settings/feedback.cljs:134, src/app/main/ui/static.cljs:440
+msgid "labels.download"
+msgstr "下载 %s"
+
+#: src/app/main/ui/dashboard/fonts.cljs:283
+msgid "labels.download-simple"
+msgstr "下载"
+
+#: src/app/main/ui/exports/files.cljs:186
+msgid "labels.downloading-file"
+msgstr "正在下载文件…"
+
+#: src/app/main/data/workspace/versions.cljs:305
+msgid "labels.exit"
+msgstr "退出"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:28
+msgid "labels.fill"
+msgstr "填充"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:1277
+msgid "labels.flex-layout"
+msgstr "Flex 布局"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:1281
+msgid "labels.grid-layout"
+msgstr "网格布局"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1371
+msgid "labels.help-learning"
+msgstr "帮助与学习"
+
+#: src/app/main/ui/settings/sidebar.cljs:122
+msgid "labels.integrations"
+msgstr "集成"
+
+#: src/app/main/ui/static.cljs:436
+msgid "labels.internal-error.desc-message-first"
+msgstr "出现了问题。"
+
+#: src/app/main/ui/static.cljs:437
+msgid "labels.internal-error.desc-message-second"
+msgstr "你可以重试此操作，或联系支持团队报告错误。"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:35, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:1289
+msgid "labels.layout"
+msgstr "布局"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1137
+msgid "labels.learning-center"
+msgstr "学习中心"
+
+#: src/app/main/ui/static.cljs:337
+msgid "labels.nitrate-unavailable.main-message"
+msgstr "由于系统问题，Penpot 暂时不可用。请稍后重试。"
+
+#: src/app/main/ui/components/select.cljs:256
+msgid "labels.no-matches"
+msgstr "没有匹配项"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/typography.cljs:705
+msgid "labels.open"
+msgstr "打开"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1215
+msgid "labels.penpot-changelog"
+msgstr "Penpot 更新日志"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1143
+msgid "labels.penpot-hub"
+msgstr "Penpot 中心"
+
+#: src/app/main/ui/dashboard/deleted.cljs:209
+msgid "labels.recent"
+msgstr "最近"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:209, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:177
+msgid "labels.reference"
+msgstr "参考"
+
+#: src/app/main/ui/static.cljs:349
+msgid "labels.reload-page"
+msgstr "重新加载页面"
+
+#: src/app/main/ui/dashboard/team.cljs:874
+msgid "labels.resend"
+msgstr "重新发送"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:34, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:233
+msgid "labels.shadow"
+msgstr "阴影"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:29, src/app/main/ui/workspace/sidebar/options/menus/stroke.cljs:70
+msgid "labels.stroke"
+msgstr "描边"
+
+#: src/app/main/ui/inspect/right_sidebar.cljs:107, src/app/main/ui/inspect/styles.cljs:149
+msgid "labels.styles"
+msgstr "样式"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:40
+msgid "labels.svg"
+msgstr "SVG"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:348
+msgid "labels.switch"
+msgstr "切换"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:30
+msgid "labels.text"
+msgstr "文本"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:187
+msgid "labels.typography"
+msgstr "排版"
+
+#: src/app/main/ui/dashboard/import.cljs:534
+msgid "labels.uploading-file"
+msgstr "正在上传文件…"
+
+#: src/app/main/ui/inspect/right_sidebar.cljs:65, src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1035
+msgid "labels.variant"
+msgstr "变体"
+
+#: src/app/main/ui/dashboard/sidebar.cljs:1209
+msgid "labels.version-notes"
+msgstr "版本 %s 说明"
+
+#: src/app/main/ui/inspect/styles/style_box.cljs:39
+msgid "labels.visibility"
+msgstr "可见性"
+
+#: src/app/main/ui/dashboard/import.cljs:297
+#, unused
+msgid "labels.warning-count"
+msgid_plural "labels.warning-count"
+msgstr[0] "%s 条警告"
+msgstr[1] "%s 条警告"
+
+#: src/app/main/ui/workspace/sidebar/assets/common.cljs:229
+msgid "modals.delete-asset-group.message"
+msgid_plural "modals.delete-asset-group.message"
+msgstr[0] "确定要删除这个素材吗？"
+msgstr[1] "确定要删除这 %s 个素材吗？"
+
+#: src/app/main/ui/workspace/sidebar/assets/common.cljs:228
+msgid "modals.delete-asset-group.title"
+msgstr "删除分组"
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:75
+msgid "modals.import-library-tokens.description"
+msgstr "此库包含可能已被其组件使用的令牌和主题。"
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:92
+msgid "modals.import-library-tokens.import"
+msgstr "导入令牌"
+
+#: src/app/main/ui/workspace/tokens/import_from_library.cljs:72
+msgid "modals.import-library-tokens.title"
+msgstr "从库中导入令牌？"
+
+#: src/app/main/data/team.cljs:583
+msgid "modals.invite-restricted-members.all-blocked"
+msgstr "只能邀请组织的现有成员。由于列表中的人员都不是组织成员，因此未发送任何邀请。"
+
+#: src/app/main/data/team.cljs:582
+msgid "modals.invite-restricted-members.all-blocked-title"
+msgstr "未发送任何邀请"
+
+#: src/app/main/ui/dashboard/team.cljs:308
+msgid "modals.invite-restricted-members.blocked-addresses"
+msgstr "不会收到邀请的地址"
+
+#: src/app/main/ui/dashboard/team.cljs:325
+msgid "modals.invite-restricted-members.cancel"
+msgstr "取消"
+
+#: src/app/main/ui/dashboard/team.cljs:298
+msgid "modals.invite-restricted-members.description"
+msgstr "只能邀请组织的现有成员。"
+
+#: src/app/main/ui/dashboard/team.cljs:333
+msgid "modals.invite-restricted-members.send"
+msgstr "发送邀请"
+
+#: src/app/main/ui/dashboard/team.cljs:293
+msgid "modals.invite-restricted-members.title"
+msgstr "部分邀请无法发送"
+
+#: src/app/main/ui/dashboard/team.cljs:299
+msgid "modals.invite-restricted-members.warning"
+msgstr "列表中的部分人员不会收到邀请。"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:58
+msgid "nitrate.activation-code.expired-error"
+msgstr "此激活码已过期。"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:59
+msgid "nitrate.activation-code.invalid-error"
+msgstr "激活码无效。"
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:57
+msgid "nitrate.activation-success.active-until"
+msgstr "你的方案有效期至 %s。"
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:63
+msgid "nitrate.activation-success.enjoy"
+msgstr "尽情使用你的方案吧！"
+
+#: src/app/main/ui/nitrate/nitrate_activation_success_modal.cljs:60
+#, fuzzy
+msgid "nitrate.activation-success.manage-info"
+msgstr "你可以随时在账号设置的“订阅”页面管理订阅。"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:86
+msgid "nitrate.code-activation.input-label"
+msgstr "输入激活码"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:90
+msgid "nitrate.code-activation.placeholder"
+msgstr "在此粘贴激活码"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:79
+msgid "nitrate.code-activation.renew-title"
+msgstr "续订 Nitrate"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:101
+msgid "nitrate.code-activation.submit"
+msgstr "激活"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:80
+msgid "nitrate.code-activation.title"
+msgstr "激活 Nitrate"
+
+#, unused
+msgid "nitrate.contact-sales.button"
+msgstr "联系销售团队"
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-contact-info"
+msgstr ""
+"如需切换到此方案，请联系我们的销售团队。我们会协助你更新订阅并确保一切设置妥"
+"当。"
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-storage-limited"
+msgstr "你的总存储空间、自动版本历史记录和文件恢复期限将受到限制。"
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-teams-available"
+msgstr "团队、项目和文件将不再属于任何组织，但仍可继续访问。"
+
+#, unused
+msgid "nitrate.contact-sales.downgrade-title"
+msgstr "降级后："
+
+#, unused
+msgid "nitrate.contact-sales.title"
+msgstr "要切换到 %s 方案吗？"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:77
+msgid "nitrate.form.cancel-anytime"
+msgstr "试用期结束后才会扣款，可随时取消。"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:92
+msgid "nitrate.form.contact-trial"
+msgstr "联系我们，免费试用 Enterprise 14 天："
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:91
+msgid "nitrate.form.contact-upgrade"
+msgstr "联系我们，升级到 Enterprise："
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:82, src/app/main/ui/nitrate/nitrate_form.cljs:102
+msgid "nitrate.form.enter-code"
+msgstr "输入激活码"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:57
+msgid "nitrate.form.enterprise-feature-1"
+msgstr "为团队和项目提供从全局到精细级别的权限控制"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:59
+msgid "nitrate.form.enterprise-feature-2"
+msgstr "通过专用管理控制台，集中管理人员在各处可执行的操作"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:61
+msgid "nitrate.form.enterprise-feature-3"
+msgstr "保留完整的开源自由，同时满足组织的治理需求"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:54
+#, fuzzy
+msgid "nitrate.form.enterprise-intro"
+msgstr "为团队安全地规模化协作提供所需的一切："
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:66, src/app/main/ui/settings/subscription.cljs:767
+msgid "nitrate.form.enterprise.price"
+msgstr "每位成员每月"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:86
+msgid "nitrate.form.see-plan"
+msgstr "查看当前方案"
+
+#, unused
+msgid "nitrate.form.start-enterprise"
+msgstr "开始使用 Enterprise"
+
+#: src/app/main/ui/nitrate/nitrate_form.cljs:51
+msgid "nitrate.form.title"
+msgstr "解锁 Enterprise 功能"
+
+#: src/app/main/ui/dashboard/subscription.cljs:209, src/app/main/ui/nitrate/nitrate_form.cljs:75
+msgid "nitrate.form.try-free"
+msgstr "免费试用 14 天"
+
+#: src/app/main/ui/settings/subscription.cljs:575
+msgid "nitrate.subscription.active-until"
+msgstr "有效期至 %s"
+
+#: src/app/main/ui/nitrate/nitrate_code_activation_modal.cljs:50
+msgid "nitrate.subscription.renew-success"
+msgstr "你的 Nitrate 订阅已续订。"
+
+#: src/app/main/ui/settings/subscription.cljs:584
+msgid "nitrate.subscription.settings.manual-cancel"
+msgstr "取消订阅"
+
+#: src/app/main/ui/settings/subscription.cljs:103
+msgid "nitrate.subscription.settings.renew-with-code"
+msgstr "使用激活码续订"
+
+#: src/app/main/ui/dashboard/team.cljs:1030
+msgid "notifications.invitation-deleted"
+msgstr "邀请已成功删除"
+
+#: src/app/main/data/workspace/mcp.cljs:185
+#, unused
+msgid "notifications.mcp.active-in-another-tab"
+msgstr "MCP 已在另一个标签页中启用。要切换到此处吗？"
+
+#, unused
+msgid "notifications.mcp.active-in-this-tab"
+msgstr "MCP 现已在此标签页中启用。"
+
+#: src/app/main/ui/onboarding/questions.cljs:226
+msgid "onboarding.questions.team-size.1001-5000"
+msgstr "1,001 - 5,000 人"
+
+#: src/app/main/ui/onboarding/questions.cljs:222
+msgid "onboarding.questions.team-size.101-500"
+msgstr "101 - 500 人"
+
+#: src/app/main/ui/onboarding/questions.cljs:220
+msgid "onboarding.questions.team-size.2-100"
+msgstr "2 - 100 人"
+
+#: src/app/main/ui/onboarding/questions.cljs:224
+msgid "onboarding.questions.team-size.501-1000"
+msgstr "501 - 1,000 人"
+
+#: src/app/main/ui/onboarding/questions.cljs:218
+msgid "onboarding.questions.team-size.just-me"
+msgstr "只有我"
+
+#: src/app/main/ui/onboarding/questions.cljs:228
+msgid "onboarding.questions.team-size.more-than-5001"
+msgstr "5,001 人以上"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/token_typography_row.cljs:42, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:101, src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:108
+#, fuzzy
+msgid "options.deleted-token"
+msgstr "此令牌不存在或已被删除。"
+
+#: src/app/plugins/utils.cljs:318
+msgid "plugins.validation.message"
+msgstr "字段 %s 无效：%s"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:97
+msgid "shortcuts.create-component-variant"
+msgstr "创建组件/变体"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:114
+msgid "shortcuts.find"
+msgstr "查找"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:115
+msgid "shortcuts.find-and-replace"
+msgstr "查找和替换"
+
+#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:165
+msgid "shortcuts.paste-replace"
+msgstr "粘贴并替换"
+
+#: src/app/main/ui/dashboard/subscription.cljs:189
+msgid "subscription.banner.see-enterprise"
+msgstr "查看 Enterprise 实际效果"
+
+#: src/app/main/ui/dashboard/subscription.cljs:253
+msgid "subscription.current-plan.enterprise"
+msgstr "Enterprise"
+
+#: src/app/main/ui/dashboard/subscription.cljs:252
+msgid "subscription.current-plan.nitrate"
+msgstr "Enterprise"
+
+#: src/app/main/ui/dashboard/subscription.cljs:251
+msgid "subscription.current-plan.nitrate-trial"
+msgstr "Enterprise 试用版"
+
+#: src/app/main/ui/dashboard/subscription.cljs:246
+msgid "subscription.current-plan.professional"
+msgstr "Professional"
+
+#: src/app/main/ui/dashboard/subscription.cljs:241
+msgid "subscription.current-plan.title"
+msgstr "你的订阅"
+
+#: src/app/main/ui/dashboard/subscription.cljs:249
+msgid "subscription.current-plan.unlimited"
+msgstr "Unlimited"
+
+#: src/app/main/ui/dashboard/subscription.cljs:248
+msgid "subscription.current-plan.unlimited-trial"
+msgstr "Unlimited 试用版"
+
+#: src/app/main/ui/dashboard/subscription.cljs:229
+msgid "subscription.dashboard.banner.renew"
+msgstr "续订"
+
+#: src/app/main/ui/dashboard/subscription.cljs:216
+msgid "subscription.dashboard.banner.renew-subscription"
+msgstr "续订你的订阅"
+
+#: src/app/main/ui/dashboard/subscription.cljs:222
+msgid "subscription.dashboard.banner.subscription-expire-days"
+msgstr "你的 Enterprise 订阅将在 %s 天后到期（%s）"
+
+#: src/app/main/ui/dashboard/subscription.cljs:220
+msgid "subscription.dashboard.banner.subscription-expired"
+msgstr "你的 Enterprise 订阅已到期。（%s）"
+
+#: src/app/main/ui/dashboard/subscription.cljs:201
+msgid "subscription.dashboard.banner.unlock-features"
+msgstr "解锁 Enterprise 功能"
+
+#: src/app/main/ui/dashboard/subscription.cljs:208
+msgid "subscription.dashboard.banner.upgrade-nitrate"
+msgstr "开始使用 Enterprise"
+
+#: src/app/main/ui/dashboard/subscription.cljs:88
+msgid "subscription.dashboard.power-up.professional.bottom-button"
+msgstr "立即升级！"
+
+#: src/app/main/ui/dashboard/subscription.cljs:87
+msgid "subscription.dashboard.power-up.professional.bottom-description"
+msgstr "为你的团队获得更多存储空间、文件恢复等功能。"
+
+#: src/app/main/ui/settings/subscription.cljs:408
+msgid "subscription.error.nitrate.checkout-cancelled"
+msgstr "付款尚未完成。准备好后可随时重试。"
+
+#: src/app/main/ui/settings/subscription.cljs:427
+#, fuzzy
+msgid "subscription.error.nitrate.checkout-failed"
+msgstr "无法开始结算流程，请重试。如果问题仍然存在，请联系我们：support@penpot.app。"
+
+#: src/app/main/ui/settings/subscription.cljs:407
+msgid "subscription.error.nitrate.checkout-finish-failed"
+msgstr "无法确认你的订阅。请在“订阅”页面检查订阅状态，如有需要可重试。"
+
+#: src/app/main/ui/settings/subscription.cljs:97
+msgid "subscription.settings.activate-by-code"
+msgstr "输入激活码"
+
+#: src/app/main/ui/settings/subscription.cljs:328
+msgid "subscription.settings.management-dialog.step-2-add-payment-button"
+msgstr "添加付款信息"
+
+#: src/app/main/ui/settings/subscription.cljs:315
+msgid "subscription.settings.management-dialog.step-2-description"
+msgstr ""
+"现在添加付款信息，即可在试用期结束后顺畅续订，并继续支持我们的开源项目。目前"
+"不会向你收费。"
+
+#: src/app/main/ui/settings/subscription.cljs:323
+msgid "subscription.settings.management-dialog.step-2-skip-button"
+msgstr "暂时跳过并开始试用"
+
+#: src/app/main/ui/settings/subscription.cljs:246
+msgid "subscription.settings.management-dialog.step-2-title"
+msgstr "助力我们成长，也让你的试用更轻松"
+
+#: src/app/main/ui/settings/subscription.cljs:130
+msgid "subscription.settings.management.dialog.editors"
+msgstr "编辑者"
+
+#: src/app/main/ui/settings/subscription.cljs:137
+msgid "subscription.settings.management.dialog.editors-explanation"
+msgstr "（包括所有者、管理员和编辑者，不包括查看者）"
+
+#: src/app/main/ui/settings/subscription.cljs:293
+msgid "subscription.settings.management.dialog.input-error"
+msgstr ""
+"设置的编辑者人数不能少于当前人数。请在团队设置中，将实际不编辑文件的人员角色"
+"从编辑者或管理员改为查看者。"
+
+#: src/app/main/ui/settings/subscription.cljs:289
+msgid "subscription.settings.management.dialog.payment-explanation"
+msgstr "试用期结束后收费，目前无需信用卡。"
+
+#: src/app/main/ui/settings/subscription.cljs:296
+msgid "subscription.settings.management.dialog.unlimited-capped-warning"
+msgstr ""
+"提示：你可以现在增加席位数，为后续邀请预留空间。当各团队共有 25 名或更多编辑"
+"者时，每月固定收费 175 美元。"
+
+#: src/app/main/ui/settings/subscription.cljs:724
+#, fuzzy
+msgid "subscription.settings.organization-member-month"
+msgstr "每名组织成员每月"
+
+#: src/app/main/ui/settings/subscription.cljs:708
+msgid "subscription.settings.price-organization-month"
+msgstr "每个组织每月"
+
+#: src/app/main/ui/settings/subscription.cljs:596, src/app/main/ui/settings/subscription.cljs:674
+msgid "subscription.settings.professional.autosave-benefit"
+msgstr "保留 7 天的自动保存版本和文件恢复"
+
+#: src/app/main/ui/settings/subscription.cljs:594, src/app/main/ui/settings/subscription.cljs:672
+msgid "subscription.settings.professional.selfhost.control-over-data"
+msgstr "完全掌控数据和基础设施。"
+
+#: src/app/main/ui/settings/subscription.cljs:597, src/app/main/ui/settings/subscription.cljs:675
+msgid "subscription.settings.professional.selfhost.unlimited-users"
+msgstr "用户、团队和文件数量不限。"
+
+#: src/app/main/ui/settings/subscription.cljs:593, src/app/main/ui/settings/subscription.cljs:671
+msgid "subscription.settings.professional.storage-benefit"
+msgstr "10GB 存储空间"
+
+#: src/app/main/ui/settings/subscription.cljs:599, src/app/main/ui/settings/subscription.cljs:677
+msgid "subscription.settings.professional.teams-editors-benefit"
+msgstr "团队数量不限。你拥有的团队中最多可有 8 名编辑者。"
+
+#: src/app/main/ui/settings/subscription.cljs:58
+msgid "subscription.settings.recommended"
+msgstr "推荐"
+
+#: src/app/main/ui/settings/subscription.cljs:343
+msgid "subscription.settings.start-trial"
+msgstr "开始免费试用"
+
+#: src/app/main/ui/settings/subscription.cljs:375
+msgid "subscription.settings.success.dialog.description"
+msgstr "你可以随时在账号详情的“订阅”页面编辑订阅。"
+
+#: src/app/main/ui/settings/subscription.cljs:373
+msgid "subscription.settings.success.dialog.thanks"
+msgstr "感谢你选择 Penpot %s 方案！"
+
+#: src/app/main/ui/settings/subscription.cljs:608, src/app/main/ui/settings/subscription.cljs:620, src/app/main/ui/settings/subscription.cljs:695
+msgid "subscription.settings.unlimited.autosave-benefit"
+msgstr "保留 30 天的自动保存版本和文件恢复"
+
+#: src/app/main/ui/settings/subscription.cljs:607, src/app/main/ui/settings/subscription.cljs:619, src/app/main/ui/settings/subscription.cljs:694
+msgid "subscription.settings.unlimited.storage-benefit"
+msgstr "25GB 存储空间"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:63
+#, markdown
+msgid "subscription.workspace.versions.warning.enterprise.subtext-owner"
+msgstr "如需提高此限额，请发送邮件至 [%s](mailto)"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:65
+#, markdown
+msgid "subscription.workspace.versions.warning.subtext-member"
+msgstr "如需提高此限额，请联系团队所有者：[%s](mailto)"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:64
+#, markdown
+msgid "subscription.workspace.versions.warning.subtext-owner"
+msgstr "如需提高此限额，请[升级你的方案|target:self](%s)"
+
+#: src/app/main/ui/dashboard/team.cljs:1142
+msgid "team.invitations-selected"
+msgid_plural "team.invitations-selected"
+msgstr[0] "已选中 1 个邀请"
+msgstr[1] "已选中 %s 个邀请"
+
+#: src/app/main/ui/settings/integrations.cljs:659
+msgid "title.settings.integrations"
+msgstr "集成 - Penpot"
+
+#: src/app/main/ui/viewer/header.cljs:187
+#, unused
+msgid "viewer.header.edit-in-workspace"
+msgstr "在工作区中编辑"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:76
+msgid "webgl.modals.webgl-unavailable.cta-dashboard"
+msgstr "前往仪表板"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:78
+msgid "webgl.modals.webgl-unavailable.cta-troubleshooting"
+msgstr "故障排除指南"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:62
+msgid "webgl.modals.webgl-unavailable.message"
+msgstr ""
+"你的浏览器无法使用 WebGL，而 Penpot 必须使用 WebGL 才能正常运行。请检查浏览器"
+"设置和/或关闭占用大量图形资源的标签页。"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:58
+msgid "webgl.modals.webgl-unavailable.title"
+msgstr "糟糕！WebGL 不可用"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:71
+msgid "webgl.modals.webgl-unavailable.troubleshooting.after"
+msgstr " ，了解如何检查浏览器设置、GPU 加速、驱动程序和常见系统问题。"
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:65
+msgid "webgl.modals.webgl-unavailable.troubleshooting.before"
+msgstr "请参阅我们的 "
+
+#: src/app/main/ui/workspace/webgl_unavailable_modal.cljs:70
+msgid "webgl.modals.webgl-unavailable.troubleshooting.link"
+msgstr "WebGL 故障排除指南"
+
+#, unused
+msgid "webgl.toast.webgl-render-disabled"
+msgstr "WebGL 渲染已禁用"
+
+#, unused
+msgid "webgl.toast.webgl-render-enabled"
+msgstr "WebGL 渲染已启用"
+
+#: src/app/render_wasm/api.cljs:2052
+msgid "webgl.webgl-context-lost.toast"
+msgstr "WebGL 上下文已丢失"
+
+#: src/app/render_wasm/api.cljs:2068
+msgid "webgl.webgl-context-recovered.toast"
+msgstr "WebGL 上下文已恢复"
+
+#: src/app/main/ui/workspace/sidebar/assets/groups.cljs:91
+msgid "workspace.assets.component-group-options"
+msgstr "组件组选项"
+
+#: src/app/main/ui/workspace/sidebar/assets/groups.cljs:74
+msgid "workspace.assets.delete-group"
+msgstr "删除组"
+
+#: src/app/main/data/workspace/clipboard.cljs:1172
+msgid "workspace.clipboard.copying"
+msgstr "正在复制图片…"
+
+#: src/app/main/data/workspace/clipboard.cljs:1195
+msgid "workspace.clipboard.image-copied"
+msgstr "图片已复制到剪贴板"
+
+#: src/app/main/data/workspace/clipboard.cljs:1201
+msgid "workspace.clipboard.image-copy-failed"
+msgstr "复制图片时出错"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:506
+msgid "workspace.component.swap.loop-error"
+msgstr "组件不能嵌套在自身内部。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:505
+msgid "workspace.component.switch.loop-error-multi"
+msgstr "部分组件实例无法切换。组件不能嵌套在自身内部。"
+
+#: src/app/main/ui/workspace/context_menu.cljs:873
+msgid "workspace.context-menu.grid-cells.copy-columns"
+msgstr "复制列"
+
+#: src/app/main/ui/workspace/context_menu.cljs:869
+msgid "workspace.context-menu.grid-cells.copy-rows"
+msgstr "复制行"
+
+#: src/app/main/ui/workspace/context_menu.cljs:877
+msgid "workspace.context-menu.grid-cells.paste-tracks"
+msgstr "粘贴"
+
+#: src/app/main/ui/workspace/context_menu.cljs:911
+msgid "workspace.context-menu.guides.change-color"
+msgstr "参考线颜色"
+
+#: src/app/main/ui/workspace/context_menu.cljs:923
+msgid "workspace.context-menu.guides.remove"
+msgstr "移除参考线"
+
+#: src/app/main/ui/workspace/sidebar/debug.cljs:38
+msgid "workspace.debug.title"
+msgstr "调试工具"
+
+#: src/app/main/ui/workspace/main_menu.cljs:336
+msgid "workspace.header.menu.disable-webgl"
+msgstr "禁用 WebGL 渲染（测试版）"
+
+#: src/app/main/ui/workspace/main_menu.cljs:337
+msgid "workspace.header.menu.enable-webgl"
+msgstr "启用 WebGL 渲染（测试版）"
+
+#: src/app/main/ui/workspace/main_menu.cljs:530
+msgid "workspace.header.menu.find"
+msgstr "查找"
+
+#: src/app/main/ui/workspace/main_menu.cljs:537
+msgid "workspace.header.menu.find-and-replace"
+msgstr "查找和替换"
+
+#: src/app/main/ui/workspace/main_menu.cljs:421
+msgid "workspace.header.menu.hide-comments"
+msgstr "隐藏评论"
+
+#: src/app/main/ui/workspace/main_menu.cljs:410
+msgid "workspace.header.menu.lock-guides"
+msgstr "锁定参考线"
+
+#: src/app/main/ui/workspace/main_menu.cljs:869
+msgid "workspace.header.menu.mcp.plugin.status.connect"
+msgstr "连接"
+
+#: src/app/main/ui/workspace/main_menu.cljs:868
+msgid "workspace.header.menu.mcp.plugin.status.disconnect"
+msgstr "断开连接"
+
+#: src/app/main/ui/workspace/main_menu.cljs:878
+msgid "workspace.header.menu.mcp.server.status.disabled"
+msgstr "管理（状态：已禁用）"
+
+#: src/app/main/ui/workspace/main_menu.cljs:877
+msgid "workspace.header.menu.mcp.server.status.enabled"
+msgstr "管理（状态：已启用）"
+
+#: src/app/main/ui/workspace/main_menu.cljs:1101
+msgid "workspace.header.menu.option.mcp"
+msgstr "MCP 服务器"
+
+#: src/app/main/ui/workspace/main_menu.cljs:422
+msgid "workspace.header.menu.show-comments"
+msgstr "显示评论"
+
+#: src/app/main/ui/workspace/main_menu.cljs:409
+msgid "workspace.header.menu.unlock-guides"
+msgstr "解锁参考线"
+
+#: src/app/main/ui/workspace/libraries.cljs:103, src/app/main/ui/workspace/libraries.cljs:128
+msgid "workspace.libraries.colors"
+msgid_plural "workspace.libraries.colors"
+msgstr[0] "1 种颜色"
+msgstr[1] "%s 种颜色"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:354
+msgid "workspace.libraries.colors.add-library-color"
+msgstr "将颜色添加到库"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:371, src/app/main/ui/workspace/colorpicker/libraries.cljs:387
+msgid "workspace.libraries.colors.empty-recent-colors"
+msgstr "还没有最近使用的颜色"
+
+#: src/app/main/ui/workspace/colorpicker/libraries.cljs:336
+msgid "workspace.libraries.colors.toggle-color-palette"
+msgstr "显示或隐藏调色板"
+
+#: src/app/main/ui/workspace/libraries.cljs:97, src/app/main/ui/workspace/libraries.cljs:120
+msgid "workspace.libraries.components"
+msgid_plural "workspace.libraries.components"
+msgstr[0] "1 个组件"
+msgstr[1] "%s 个组件"
+
+#: src/app/main/ui/workspace/libraries.cljs:367
+msgid "workspace.libraries.connected-to"
+msgstr "已连接到"
+
+#: src/app/main/ui/workspace/libraries.cljs:100, src/app/main/ui/workspace/libraries.cljs:124
+msgid "workspace.libraries.graphics"
+msgid_plural "workspace.libraries.graphics"
+msgstr[0] "1 个图形"
+msgstr[1] "%s 个图形"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:541
+msgid "workspace.libraries.text.mixed-tokens"
+msgstr "混合令牌"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:536
+msgid "workspace.libraries.text.mixed-tokens-and-assets"
+msgstr "混合素材和令牌"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:556
+msgid "workspace.libraries.text.mixed-typography"
+msgstr "混合素材"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:558
+msgid "workspace.libraries.text.multiple-assets-tooltip"
+msgstr "取消链接所有素材"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:335
+#, unused
+msgid "workspace.libraries.text.multiple-token-and-asset-tooltip"
+msgstr "分离所有令牌并取消链接所有排版素材"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:543
+msgid "workspace.libraries.text.multiple-token-tooltip"
+msgstr "分离所有令牌"
+
+#: src/app/main/ui/workspace/libraries.cljs:106, src/app/main/ui/workspace/libraries.cljs:132
+msgid "workspace.libraries.typography"
+msgid_plural "workspace.libraries.typography"
+msgstr[0] "1 个排版素材"
+msgstr[1] "%s 个排版素材"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs
+#, unused
+msgid "workspace.options.blur-effects-options.title"
+msgstr "模糊效果"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:273
+msgid "workspace.options.blur-effects-options.title.group"
+msgstr "组模糊效果"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:272
+msgid "workspace.options.blur-effects-options.title.multiple"
+msgstr "所选对象的模糊效果"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:99, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:109
+msgid "workspace.options.blur-options.background-blur"
+msgstr "背景模糊"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:144
+msgid "workspace.options.blur-options.blur-type-select"
+msgstr "选择模糊类型"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:153
+msgid "workspace.options.blur-options.disabled-blur-label"
+msgstr "背景模糊仅支持新版渲染器。请在“偏好设置”菜单中切换到新版渲染器以使用此效果"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:98, src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:112
+msgid "workspace.options.blur-options.layer-blur"
+msgstr "图层模糊"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/blur.cljs:138
+msgid "workspace.options.blur-options.toggle-more-options"
+msgstr "显示或隐藏更多选项"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:567
+msgid "workspace.options.component.variant.duplicated.copy.title"
+msgstr "此组件包含冲突的变体。请确保每个变体都有一组独一无二的属性值。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:1334
+msgid "workspace.options.component.variant.duplicated.group.title"
+msgstr "部分变体的属性和值完全相同"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:267
+msgid "workspace.options.component.variant.duplicated.single.all"
+msgstr "这些变体的属性和值完全相同。请调整属性值，以便正确检索这些变体。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:264
+msgid "workspace.options.component.variant.duplicated.single.one"
+msgstr "此变体与另一个变体的属性和值完全相同。请调整属性值，以便正确检索此变体。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:270
+msgid "workspace.options.component.variant.duplicated.single.some"
+msgstr "其中部分变体的属性和值完全相同。请调整属性值，以便正确检索这些变体。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:557
+msgid "workspace.options.component.variant.malformed.copy"
+msgstr "此组件包含名称无效的变体。请确保每个变体的名称都遵循正确的结构。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/component.cljs:560
+msgid "workspace.options.component.variant.malformed.locate"
+msgstr "定位无效变体"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:54
+msgid "workspace.options.component.variants-help-modal.intro"
+msgstr "为了在切换变体时保留更改，Penpot 会连接符合以下条件的图层："
+
+#: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:91
+msgid "workspace.options.component.variants-help-modal.outro"
+msgstr ""
+"更改上述任一项（例如重命名图层或将图层编组）都会断开连接，但还原更改即可恢复"
+"连接。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:77
+msgid "workspace.options.component.variants-help-modal.rule2.detail"
+msgstr "矩形、椭圆、路径和布尔运算视为同一类型。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/variants_help_modal.cljs:88
+msgid "workspace.options.component.variants-help-modal.rule3.detail"
+msgstr "组、画板和布局视为等效。"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:517
+msgid "workspace.options.convert-to-typography"
+msgstr "创建排版样式"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/fill.cljs:198
+msgid "workspace.options.fill.section"
+msgstr "填充区域"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:223, src/app/main/ui/workspace/sidebar/options/menus/layer.cljs:285
+msgid "workspace.options.layer-options.layer-section"
+msgstr "图层菜单区域"
+
+#: src/app/main/ui/workspace/sidebar/options/drawing/frame.cljs:117, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:488
+msgid "workspace.options.no-size-preset-results"
+msgstr "没有匹配的尺寸预设"
+
+#: src/app/main/ui/workspace/sidebar/options/page.cljs
+#, unused
+msgid "workspace.options.pixel grid-color"
+msgstr "像素网格颜色"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:205, src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:346
+msgid "workspace.options.radius.hide-all-corners"
+msgstr "收起独立圆角设置"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:169, src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs:287
+msgid "workspace.options.radius.radius-section"
+msgstr "圆角半径区域"
+
+#: src/app/main/ui/workspace/sidebar/options/drawing/frame.cljs:111, src/app/main/ui/workspace/sidebar/options/menus/measures.cljs:482
+msgid "workspace.options.search-size-preset"
+msgstr "搜索尺寸预设"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs:200
+msgid "workspace.options.selection-color.section"
+msgstr "颜色选择区域"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:327
+msgid "workspace.options.stroke-dash"
+msgstr "虚线长度"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:337
+msgid "workspace.options.stroke-gap"
+msgstr "间隙"
+
+#: src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs:248
+msgid "workspace.options.stroke.toggle-stroke"
+msgstr "启用或禁用描边"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/text.cljs:501
+msgid "workspace.options.text-options.text-section"
+msgstr "文本区域"
+
+#: src/app/main/data/plugins.cljs:128, src/app/main/ui/workspace/main_menu.cljs:806, src/app/main/ui/workspace/plugins.cljs:97
+msgid "workspace.plugins.error.need-editor"
+msgstr "你需要拥有编辑权限才能使用此插件"
+
+#: src/app/main/ui/workspace/plugins.cljs:205
+msgid "workspace.plugins.error.url"
+msgstr "插件不存在或 URL 不正确。"
+
+#: src/app/main/ui/workspace/plugins.cljs:428
+msgid "workspace.plugins.permissions-update.warning"
+msgstr "自你上次打开以来，此插件已被修改。它现在还希望访问："
+
+#: src/app/main/ui/workspace/plugins.cljs:317
+msgid "workspace.plugins.permissions.clipboard-read"
+msgstr "读取剪贴板中的内容。"
+
+#: src/app/main/ui/workspace/plugins.cljs:311
+msgid "workspace.plugins.permissions.clipboard-write"
+msgstr "读取和写入剪贴板内容。"
+
+#: src/app/main/ui/workspace/plugins.cljs:284
+msgid "workspace.plugins.permissions.comment-write"
+msgstr "读取和修改你的评论，并以你的名义回复。"
+
+#: src/app/main/ui/workspace/plugins.cljs:257
+msgid "workspace.plugins.permissions.content-read"
+msgstr "读取用户有权访问的文件内容。"
+
+#: src/app/main/ui/workspace/plugins.cljs:251
+msgid "workspace.plugins.permissions.content-write"
+msgstr "读取和修改用户有权访问的文件内容。"
+
+#: src/app/main/ui/workspace/plugins.cljs:366
+msgid "workspace.plugins.permissions.disclaimer"
+msgstr ""
+"请注意，此插件由第三方创建，因此请在授予访问权限前确认你信任它。你的数据隐私"
+"和安全对我们至关重要。如有任何疑虑，请联系支持团队。"
+
+#: src/app/main/ui/workspace/plugins.cljs:264
+msgid "workspace.plugins.permissions.user-read"
+msgstr "读取当前用户的个人资料信息。"
+
+#: src/app/main/ui/workspace/plugins.cljs:487
+msgid "workspace.plugins.try-out.message"
+msgstr ""
+"想看看吗？它将在当前团队的新草稿中打开。（如果不想，你之后也可以在任意文件的"
+"已安装插件中找到它。）"
+
+#: src/app/main/ui/workspace/context_menu.cljs:651
+msgid "workspace.shape.menu.clear-guides"
+msgstr "清除画板参考线"
+
+#: src/app/main/ui/workspace/context_menu.cljs:229
+msgid "workspace.shape.menu.copy-as-image"
+msgstr "复制为图片"
+
+#: src/app/main/ui/workspace/context_menu.cljs:453
+msgid "workspace.shape.menu.stroke-to-path"
+msgstr "将描边转换为路径"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:570
+msgid "workspace.sidebar.layers.filter"
+msgstr "筛选"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs
+#, unused
+msgid "workspace.sidebar.layers.match-count"
+msgstr "%s/%s"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:601
+msgid "workspace.sidebar.layers.no-matches"
+msgstr "无匹配结果"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:620
+msgid "workspace.sidebar.layers.replace"
+msgstr "替换"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:626
+msgid "workspace.sidebar.layers.replace-all"
+msgstr "全部替换"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:587
+msgid "workspace.sidebar.layers.replace-placeholder"
+msgstr "替换为…"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:575
+msgid "workspace.sidebar.layers.search-and-replace"
+msgstr "查找和替换"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:606
+msgid "workspace.sidebar.layers.search-scope-canvas"
+msgstr "文本内容"
+
+#: src/app/main/ui/workspace/sidebar/layers.cljs:610
+msgid "workspace.sidebar.layers.search-scope-layers"
+msgstr "图层名称"
+
+#, unused
+msgid "workspace.toast.comments-hidden"
+msgstr "评论已隐藏"
+
+#, unused
+msgid "workspace.toast.comments-visible"
+msgstr "评论已显示"
+
+#: src/app/main/ui/workspace/tokens/settings/menu.cljs:42
+msgid "workspace.tokens.base-font-size.error"
+msgstr "基准字号必须是像素值或无单位数值。"
+
+#: src/app/main/ui/workspace/tokens/management/context_menu.cljs:357
+msgid "workspace.tokens.copy-name"
+msgstr "复制令牌路径"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:293
+msgid "workspace.tokens.create-token"
+msgstr "创建新的 %s 令牌"
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:60
+msgid "workspace.tokens.duplicate-group"
+msgstr "复制令牌组"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:32
+#, unused
+msgid "workspace.tokens.duplicated-json-token-name"
+msgstr "导入错误：JSON 中存在重复的令牌名称。"
+
+#: src/app/main/data/workspace/tokens/errors.cljs:33
+#, unused
+msgid "workspace.tokens.duplicated-json-token-name-detail"
+msgstr "另一个令牌集中已存在路径为“%s”或以该路径为前缀的令牌。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:299
+msgid "workspace.tokens.enter-token-name"
+msgstr "输入 %s 令牌名称"
+
+#: src/app/main/data/workspace/tokens/application.cljs:730, src/app/main/ui/workspace/tokens/management/group.cljs:161
+msgid "workspace.tokens.error-text-edition"
+msgstr "编辑文本时无法应用令牌。请改为选择文本图层。"
+
+#: src/app/main/ui/workspace/tokens/export/modal.cljs:117
+msgid "workspace.tokens.export.multiple-files"
+msgstr "多个文件"
+
+#: src/app/main/ui/workspace/tokens/export/modal.cljs:37
+msgid "workspace.tokens.export.no-tokens-themes-sets"
+msgstr "没有可导出的令牌、令牌主题或令牌集。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:127
+msgid "workspace.tokens.font-size-value-enter"
+msgstr "字号或 {alias}"
+
+#: src/app/main/data/workspace/tokens/application.cljs:328
+msgid "workspace.tokens.font-variant-not-found"
+msgstr "设置字重/样式时出错。当前字体中不存在此字体样式"
+
+#: src/app/main/ui/workspace/tokens/management/forms/form_container.cljs:60, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:135
+msgid "workspace.tokens.font-weight-value-enter"
+msgstr "字重（300、Bold Italic...）或 {alias}"
+
+#: src/app/main/ui/workspace/tokens/sets.cljs
+#, unused
+msgid "workspace.tokens.grouping-set-alert"
+msgstr "暂不支持对令牌集进行分组。"
+
+#: src/app/main/ui/workspace/tokens/import/modal.cljs:240
+msgid "workspace.tokens.import-multiple-files"
+msgstr "导入多个文件时，文件名/路径将作为令牌集名称。"
+
+#: src/app/main/ui/workspace/tokens/import/modal.cljs:239
+msgid "workspace.tokens.import-single-file"
+msgstr "导入单个 JSON 文件时，一级键应为令牌集名称。"
+
+#: src/app/main/ui/workspace/libraries.cljs:374, src/app/main/ui/workspace/tokens/import/modal.cljs:236
+msgid "workspace.tokens.import-tokens"
+msgstr "导入令牌"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:245, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:194
+msgid "workspace.tokens.individual-tokens"
+msgstr "使用单独的令牌"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:151
+msgid "workspace.tokens.letter-spacing-value-enter-composite"
+msgstr "字间距或 {alias}"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:143
+msgid "workspace.tokens.line-height-value-enter"
+msgstr "行高（倍数、px、%）或 {alias}"
+
+#: src/app/main/ui/workspace/tokens/management/token_pill.cljs:316
+msgid "workspace.tokens.missing-reference"
+msgstr "缺少引用"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:87
+#, unused
+msgid "workspace.tokens.no-references-found"
+msgstr "未找到引用"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:113
+msgid "workspace.tokens.not-remap"
+msgstr "不重新映射"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:176
+msgid "workspace.tokens.reference-composite"
+msgstr "输入排版令牌别名"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:208
+msgid "workspace.tokens.reference-composite-shadow"
+msgstr "输入阴影令牌别名"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:117
+msgid "workspace.tokens.remap"
+msgstr "重新映射令牌"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:102
+msgid "workspace.tokens.remap-node-references-title"
+msgstr "要将“`%s`”重命名为“`%s`”，并重新映射此组中的所有令牌吗？"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:106
+msgid "workspace.tokens.remap-node-warning-effects"
+msgstr "这将更新所有使用旧令牌名称的令牌和引用。"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:101
+msgid "workspace.tokens.remap-token-references-title"
+msgstr "要将所有使用“`%s`”的令牌重新映射到“`%s`”吗？"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:105
+msgid "workspace.tokens.remap-token-warning-effects"
+msgstr "这将更改所有使用旧令牌名称的图层和引用。"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:107
+msgid "workspace.tokens.remap-warning-time"
+msgstr "此操作可能需要一些时间。"
+
+#: src/app/main/ui/workspace/tokens/remapping_modal.cljs:92
+#, unused
+msgid "workspace.tokens.remapping-in-progress"
+msgstr "正在重新映射令牌引用…"
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:59
+msgid "workspace.tokens.rename-group"
+msgstr "重命名令牌组"
+
+#: src/app/main/ui/workspace/tokens/management/forms/rename_node_modal.cljs:68
+msgid "workspace.tokens.rename-group-name-hint"
+msgstr "你的令牌将自动重命名为 %s.(suffix).(tokenName)"
+
+#: src/app/main/ui/workspace/colorpicker/color_tokens.cljs:297, src/app/main/ui/workspace/sidebar/options/menus/text.cljs:527
+msgid "workspace.tokens.search-by-token"
+msgstr "按令牌名称搜索"
+
+#: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:126
+msgid "workspace.tokens.sets-hint"
+msgstr "编辑令牌主题并管理令牌集"
+
+#: src/app/main/ui/workspace/tokens/settings/menu.cljs:90
+msgid "workspace.tokens.setting-description"
+msgstr "你可以在此配置基准字号，它定义了 1rem 的值："
+
+#: src/app/main/ui/workspace/tokens/settings/menu.cljs:83
+msgid "workspace.tokens.settings"
+msgstr "令牌设置"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:236
+msgid "workspace.tokens.shadow-add-shadow"
+msgstr "添加阴影"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:163, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:164, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:168
+msgid "workspace.tokens.shadow-blur"
+msgstr "模糊"
+
+#: src/app/main/ui/workspace/tokens/management/create/form.cljs:987, src/app/main/ui/workspace/tokens/management/create/form.cljs:988
+#, unused
+msgid "workspace.tokens.shadow-color"
+msgstr "颜色"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:116
+msgid "workspace.tokens.shadow-inset"
+msgstr "内阴影"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:125
+msgid "workspace.tokens.shadow-remove-shadow"
+msgstr "移除阴影"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:176, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:177, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:181
+msgid "workspace.tokens.shadow-spread"
+msgstr "扩散"
+
+#: src/app/main/ui/workspace/tokens/management/create/form.cljs:1215
+#, unused
+msgid "workspace.tokens.shadow-title"
+msgstr "阴影"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:287
+msgid "workspace.tokens.shadow-token-blur-value-error"
+msgstr "模糊值不能为负数"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:287
+#, unused
+msgid "workspace.tokens.shadow-token-spread-value-error"
+msgstr "扩散值不能为负数"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:141, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:143
+msgid "workspace.tokens.shadow-x"
+msgstr "X"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:152, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:154
+msgid "workspace.tokens.shadow-y"
+msgstr "Y"
+
+#: src/app/main/ui/workspace/tokens/management/forms/form_container.cljs:54, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:159
+msgid "workspace.tokens.text-case-value-enter"
+msgstr "none | uppercase | lowercase | capitalize 或 {alias}"
+
+#: src/app/main/ui/workspace/tokens/management/forms/form_container.cljs:57, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:167
+msgid "workspace.tokens.text-decoration-value-enter"
+msgstr "none | underline | strike-through 或 {alias}"
+
+#: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:51
+#, unused
+msgid "workspace.tokens.theme-name-already-exists"
+msgstr "已存在同名令牌主题"
+
+#: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:100
+#, unused
+msgid "workspace.tokens.theme.disable"
+msgstr "停用"
+
+#: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:96
+#, unused
+msgid "workspace.tokens.theme.enable"
+msgstr "启用"
+
+#: src/app/main/ui/workspace/tokens/themes/create_modal.cljs:84
+msgid "workspace.tokens.themes-description"
+msgstr "你可以在此管理令牌主题、启用或停用主题，以及配置主题的活动令牌集。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:133, src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs:258
+msgid "workspace.tokens.token-font-family-select"
+msgstr "选择字体家族"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:119
+msgid "workspace.tokens.token-font-family-value"
+msgstr "字体家族"
+
+#: src/app/main/ui/workspace/tokens/management/forms/typography.cljs:118
+msgid "workspace.tokens.token-font-family-value-enter"
+msgstr "字体家族，或以英文逗号（,）分隔的字体列表"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:273
+msgid "workspace.tokens.token-name-duplication-validation-error"
+msgstr "路径 %s 或其前缀处已存在令牌。"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:270
+msgid "workspace.tokens.token-name-length-validation-error"
+msgstr "名称至少应包含 1 个字符"
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:272
+msgid "workspace.tokens.token-name-validation-error"
+msgstr ""
+" 不是有效的令牌名称。\n"
+"令牌名称只能包含以英文句点（.）分隔的字母和数字，且不能以美元符号（$）开头。"
+
+#: src/app/main/ui/workspace/tokens/style_dictionary.cljs:259
+#, unused
+msgid "workspace.tokens.token-not-resolved"
+msgstr "无法解析名为 %s 的引用令牌"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:325
+msgid "workspace.tokens.token-value"
+msgstr "值"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs:324, src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:131
+msgid "workspace.tokens.token-value-enter"
+msgstr "输入值或使用 {alias} 输入别名"
+
+#: src/app/main/ui/workspace/tokens/management.cljs:72
+msgid "workspace.tokens.tokens-section-title"
+msgstr "令牌 - %s"
+
+#: src/app/main/data/workspace/tokens/import_export.cljs:50
+#, unused
+msgid "workspace.tokens.unknown-token-type-message"
+msgstr ""
+"导入成功，但部分令牌因使用不受支持的 $type 值而被跳过。展开详细信息可查看受影"
+"响的令牌。"
+
+#: src/app/main/data/workspace/tokens/import_export.cljs:52
+#, unused
+msgid "workspace.tokens.unknown-token-type-section"
+msgstr "不支持类型“%s”（%s）："
+
+#: src/app/main/ui/workspace/tokens/management/forms/shadow.cljs:249, src/app/main/ui/workspace/tokens/management/forms/typography.cljs:198
+msgid "workspace.tokens.use-reference"
+msgstr "使用引用"
+
+#: src/app/main/ui/workspace/tokens/management/token_pill.cljs:136
+msgid "workspace.tokens.value-not-valid"
+msgstr "值无效"
+
+#: src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
+#, unused
+msgid "workspace.tokens.warning-name-change"
+msgstr "重命名此令牌会导致对其旧名称的所有引用失效"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:231
+#, unused
+msgid "workspace.toolbar.debug"
+msgstr "调试工具"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:188
+msgid "workspace.toolbar.frame-first-time"
+msgstr "创建画板。单击并拖动以定义其大小。（%s）"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:65, src/app/main/ui/workspace/top_toolbar.cljs:66, src/app/main/ui/workspace/top_toolbar.cljs:77
+msgid "workspace.toolbar.mcp"
+msgstr "MCP"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:87
+msgid "workspace.toolbar.mcp-connect-here"
+msgstr "在此连接"
+
+#: src/app/main/ui/workspace/top_toolbar.cljs:84
+msgid "workspace.toolbar.mcp-connected"
+msgstr "MCP 已连接"
+
+#: src/app/main/ui/workspace/palette.cljs:166
+msgid "workspace.toolbar.palette-bar"
+msgstr "调色板栏"
+
+#, unused
+msgid "workspace.top-bar.webgl-context-lost"
+msgstr "无法渲染。刷新页面以恢复编辑。"
+
+#: src/app/main/ui/workspace/viewport/top_bar.cljs:43
+msgid "workspace.top-bar.webgl-context-lost.reload"
+msgstr "刷新"
+
+#: src/app/main/ui/workspace/sidebar/history.cljs:358
+msgid "workspace.undo.entry.by"
+msgstr "由 %s 操作"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:234, src/app/main/ui/workspace/sidebar/versions.cljs:314
+msgid "workspace.versions.button.preview"
+msgstr "预览版本"
+
+#, unused
+msgid "workspace.versions.locked-by-other"
+msgstr "此版本已被 %s 锁定，无法修改"
+
+#: src/app/main/data/workspace/versions.cljs:303
+msgid "workspace.versions.preview-banner-title"
+msgstr "正在预览版本：%s"
+
+#: src/app/main/data/workspace/versions.cljs:297
+msgid "workspace.versions.preview.unnamed"
+msgstr "未命名版本"
+
+#: src/app/main/ui/workspace/sidebar.cljs:256
+msgid "workspace.versions.tab.actions"
+msgstr "操作"
+
+#, unused
+msgid "workspace.versions.tooltip.locked-version"
+msgstr "版本已锁定，仅创建者可以修改"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:66
+#, markdown
+msgid "workspace.versions.warning.subtext"
+msgstr "如需提高此上限，请发送邮件至 [support@penpot.app](%s) 联系我们"
+
+#: src/app/main/ui/workspace/sidebar/versions.cljs:463
+msgid "workspace.versions.warning.text"
+msgstr "自动保存的版本将保留 %s 天。"
diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po
index 621f8b1398..c5362fa67f 100644
--- a/frontend/translations/zh_Hant.po
+++ b/frontend/translations/zh_Hant.po
@@ -2788,10 +2788,6 @@ msgstr "您可以以後邀請"
 msgid "onboarding.choice.team-up.create-team-desc"
 msgstr "命名您的團隊後，您就可以邀請人們加入。"
 
-#: src/app/main/ui/onboarding/team_choice.cljs:188
-msgid "onboarding.choice.team-up.create-team-placeholder"
-msgstr "輸入團隊名稱"
-
 #: src/app/main/ui/onboarding/team_choice.cljs:228
 msgid "onboarding.choice.team-up.create-team-without-invite"
 msgstr "建立團隊"
@@ -3081,11 +3077,7 @@ msgid "shortcut-subsection.edit"
 msgstr "編輯"
 
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:60
-msgid "shortcut-subsection.general-dashboard"
-msgstr "一般"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:61
-msgid "shortcut-subsection.general-viewer"
+msgid "shortcut-subsection.generic"
 msgstr "一般"
 
 #: src/app/main/ui/workspace/main_menu.cljs:1005, src/app/main/ui/workspace/sidebar/shortcuts.cljs:62
@@ -3560,14 +3552,6 @@ msgstr "對齊到像素網格"
 msgid "shortcuts.start-editing"
 msgstr "開始編輯"
 
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:182
-msgid "shortcuts.start-measure"
-msgstr "開始測量"
-
-#: src/app/main/ui/workspace/sidebar/shortcuts.cljs:183
-msgid "shortcuts.stop-measure"
-msgstr "停止測量"
-
 #: src/app/main/ui/workspace/sidebar/shortcuts.cljs:184
 msgid "shortcuts.thumbnail-set"
 msgstr "設定縮圖"
diff --git a/library/package.json b/library/package.json
index 17616cd7a8..06c0763609 100644
--- a/library/package.json
+++ b/library/package.json
@@ -3,7 +3,7 @@
   "version": "1.2.0-RC1",
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "type": "module",
   "repository": {
     "type": "git",
@@ -34,9 +34,9 @@
     "watch": "pnpm run clear:shadow-cache && clojure -M:dev:shadow-cljs watch library"
   },
   "devDependencies": {
-    "@types/node": "^26.0.1",
-    "@zip.js/zip.js": "2.8.26",
-    "concurrently": "^10.0.3",
+    "@types/node": "^26.1.2",
+    "@zip.js/zip.js": "2.8.34",
+    "concurrently": "^10.0.4",
     "date-fns": "^4.4.0",
     "nodemon": "^3.1.14",
     "source-map-support": "^0.5.21"
diff --git a/library/pnpm-lock.yaml b/library/pnpm-lock.yaml
index 9e978ca88f..9d0024fe7e 100644
--- a/library/pnpm-lock.yaml
+++ b/library/pnpm-lock.yaml
@@ -5,21 +5,21 @@ settings:
   excludeLinksFromLockfile: false
 
 patchedDependencies:
-  '@zip.js/zip.js@2.8.26': 7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95
+  '@zip.js/zip.js@2.8.34': 7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95
 
 importers:
 
   .:
     devDependencies:
       '@types/node':
-        specifier: ^26.0.1
-        version: 26.0.1
+        specifier: ^26.1.2
+        version: 26.1.2
       '@zip.js/zip.js':
-        specifier: 2.8.26
-        version: 2.8.26(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
+        specifier: 2.8.34
+        version: 2.8.34(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)
       concurrently:
-        specifier: ^10.0.3
-        version: 10.0.3
+        specifier: ^10.0.4
+        version: 10.0.4
       date-fns:
         specifier: ^4.4.0
         version: 4.4.0
@@ -32,11 +32,11 @@ importers:
 
 packages:
 
-  '@types/node@26.0.1':
-    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
-  '@zip.js/zip.js@2.8.26':
-    resolution: {integrity: sha512-RQ4h9F6DOiHxpdocUDrOl6xBM+yOtz+LkUol47AVWcfebGBDpZ7w7Xvz9PS24JgXvLGiXXzSAfdCdVy1tPlaFA==}
+  '@zip.js/zip.js@2.8.34':
+    resolution: {integrity: sha512-+6a3lyqq69rpseLbvDPiVIWsZ/HdTGAAD6afFtug6ECPDGttb2dHnPC6cJgdPofYkzL9OvXizegq+DQVfL2rnA==}
     engines: {bun: '>=0.7.0', deno: '>=1.0.0', node: '>=18.0.0'}
 
   ansi-regex@6.2.2:
@@ -59,9 +59,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  brace-expansion@5.0.7:
-    resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -82,8 +82,8 @@ packages:
     resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==}
     engines: {node: '>=20'}
 
-  concurrently@10.0.3:
-    resolution: {integrity: sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==}
+  concurrently@10.0.4:
+    resolution: {integrity: sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==}
     engines: {node: '>=22'}
     hasBin: true
 
@@ -185,8 +185,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  shell-quote@1.8.4:
-    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
+  shell-quote@1.9.0:
+    resolution: {integrity: sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==}
     engines: {node: '>= 0.4'}
 
   simple-update-notifier@2.0.0:
@@ -255,11 +255,11 @@ packages:
 
 snapshots:
 
-  '@types/node@26.0.1':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
-  '@zip.js/zip.js@2.8.26(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)': {}
+  '@zip.js/zip.js@2.8.34(patch_hash=7b556bbd426f152eb086f0126a53900e369a95cf64357c380b7c8d8e940c3d95)': {}
 
   ansi-regex@6.2.2: {}
 
@@ -274,7 +274,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  brace-expansion@5.0.7:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -304,11 +304,11 @@ snapshots:
       strip-ansi: 7.2.0
       wrap-ansi: 9.0.2
 
-  concurrently@10.0.3:
+  concurrently@10.0.4:
     dependencies:
       chalk: 5.6.2
       rxjs: 7.8.2
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       supports-color: 10.2.2
       tree-kill: 1.2.2
       yargs: 18.0.0
@@ -358,7 +358,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.7
+      brace-expansion: 5.0.9
 
   ms@2.1.3: {}
 
@@ -391,7 +391,7 @@ snapshots:
 
   semver@7.8.5: {}
 
-  shell-quote@1.8.4: {}
+  shell-quote@1.9.0: {}
 
   simple-update-notifier@2.0.0:
     dependencies:
diff --git a/library/pnpm-workspace.yaml b/library/pnpm-workspace.yaml
index fad1ba32af..b5e864413d 100644
--- a/library/pnpm-workspace.yaml
+++ b/library/pnpm-workspace.yaml
@@ -1,2 +1,4 @@
+minimumReleaseAgeExclude:
+  - brace-expansion@5.0.8 || 5.0.9
 patchedDependencies:
-  '@zip.js/zip.js@2.8.26': patches/@zip.js__zip.js@2.8.11.patch
+  '@zip.js/zip.js@2.8.34': patches/@zip.js__zip.js@2.8.11.patch
diff --git a/manage.sh b/manage.sh
index c4207718e6..be6cc078b1 100755
--- a/manage.sh
+++ b/manage.sh
@@ -5,6 +5,15 @@ export DEVENV_IMGNAME="$ORGANIZATION/devenv";
 export DEVENV_NETWORK="penpot_shared";
 export DEVENV_DEFAULTS_FILE="docker/devenv/defaults.env";
 
+# Tag used for the devenv image across pull/build/run/build-bundle. Defaults to
+# 'latest'; override by exporting DEVENV_TAG in the shell before invoking
+# manage.sh (e.g. `export DEVENV_TAG=mytest`), or per-call via
+# `build-devenv --tag mytest`. Note --tag only affects that one build-devenv
+# call -- for run-devenv/build/pull-devenv to pick up the same custom tag,
+# DEVENV_TAG must be exported in the shell for those invocations too, since
+# each `./manage.sh ...` is a separate process.
+export DEVENV_TAG="${DEVENV_TAG:-latest}";
+
 # Load instance configuration (project name, container names, ports, runtime
 # config). Single source of truth for the devenv; consumed by both docker
 # compose (via --env-file) and the shell logic below. Hard dependency — abort
@@ -60,7 +69,7 @@ PENPOT_PORT_BASE_STORYBOOK=${PENPOT_STORYBOOK_PORT:?missing in defaults.env}
 export CURRENT_USER_ID=$(id -u);
 export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
 
-export IMAGEMAGICK_VERSION=7.1.2-24
+export IMAGEMAGICK_VERSION=7.1.2-27
 
 # Safe directory to avoid ownership errors with Git
 git config --global --add safe.directory /home/penpot/penpot || true
@@ -138,21 +147,46 @@ function setup-buildx {
 function build-devenv {
     set +e;
 
+    local tag="$DEVENV_TAG"
+    local do_push=false
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --tag)
+                tag="$2"; shift 2;;
+            --push)
+                do_push=true; shift;;
+            --local)
+                # Kept for backward compatibility -- local-only is now the
+                # default behaviour, so this flag is a no-op.
+                shift;;
+            *)
+                echo "build-devenv: unknown argument '$1'" >&2
+                return 1;;
+        esac
+    done
+
+    # Propagate to the rest of this invocation (e.g. if build-devenv is
+    # called from another function later). Does NOT persist to a separate
+    # `./manage.sh run-devenv` call -- export DEVENV_TAG in the shell for that.
+    export DEVENV_TAG="$tag"
+
     pushd docker/devenv;
 
-    if [ "$1" = "--local" ]; then
-        echo "Build local only $DEVENV_IMGNAME:latest image";
-        docker build -t $DEVENV_IMGNAME:latest .;
-    else
-        echo "Build and push $DEVENV_IMGNAME:latest image";
+    if [[ "$do_push" == "true" ]]; then
+        echo "Build and push $DEVENV_IMGNAME:$tag image";
         setup-buildx;
 
         docker buildx build \
           --platform linux/amd64,linux/arm64 \
           --output type=registry \
-          -t $DEVENV_IMGNAME:latest .;
+          --provenance=mode=max --sbom=true \
+          -t "$DEVENV_IMGNAME:$tag" .;
 
-        docker pull $DEVENV_IMGNAME:latest;
+        docker pull "$DEVENV_IMGNAME:$tag";
+    else
+        echo "Build local only $DEVENV_IMGNAME:$tag image";
+        docker build -t "$DEVENV_IMGNAME:$tag" .;
     fi
 
     popd;
@@ -160,11 +194,11 @@ function build-devenv {
 
 function pull-devenv {
     set -ex
-    docker pull $DEVENV_IMGNAME:latest
+    docker pull "$DEVENV_IMGNAME:$DEVENV_TAG"
 }
 
 function pull-devenv-if-not-exists {
-    if [[ ! $(docker images $DEVENV_IMGNAME:latest -q) ]]; then
+    if [[ ! $(docker images "$DEVENV_IMGNAME:$DEVENV_TAG" -q) ]]; then
         pull-devenv $@
     fi
 }
@@ -214,6 +248,7 @@ function instance-compose {
     env -i HOME="$HOME" PATH="$PATH" PWD="$PWD" \
         CURRENT_USER_ID="${CURRENT_USER_ID:-$(id -u)}" \
         PENPOT_SOURCE_PATH="$source_path" \
+        DEVENV_TAG="$DEVENV_TAG" \
         "${overrides[@]}" \
         docker compose -p "penpotdev-${instance}" \
             --env-file "$DEVENV_DEFAULTS_FILE" \
@@ -476,11 +511,12 @@ function create-devenv {
     instance-compose ws0 create
 }
 
-# Stop instances. ws0 is the worker-bearer and must be the last one to stop;
-# shared infra is shut down together with ws0. Flags are mutually exclusive.
+# Stop instances. Each workspace is independent and can be stopped in any
+# order. Shared infra is shut down only when no instances remain running.
+# Flags are mutually exclusive.
 #
 #   --ws N (N>=1)  stop just that workspace. Leaves ws0 and infra alone.
-#   --ws 0 | (no flag)  stop ws0 + shared infra. Refused if any ws1+ is running.
+#   --ws 0 | (no flag)  stop ws0; shuts down shared infra only if no ws1+ is running.
 #   --all          stop every wsN highest-first, then ws0, then infra.
 function stop-devenv {
     local target=""
@@ -520,21 +556,19 @@ function stop-devenv {
     [[ -z "$target" ]] && target="ws0"
 
     if [[ "$target" == "ws0" ]]; then
-        local non_main=""
-        for ws in $running; do
-            [[ "$ws" != "ws0" ]] && non_main="$non_main $ws"
-        done
-        if [[ -n "$non_main" ]]; then
-            echo "stop-devenv: cannot stop ws0 while other instances are running:${non_main}." >&2
-            echo "Stop them first (--ws N) or use --all." >&2
-            return 1
-        fi
         if printf '%s\n' $running | grep -qx ws0; then
             stop-instance ws0
         else
             echo "[ws0] not running."
         fi
-        infra-compose down -t 2
+        # Only stop shared infra when no other instances are still running.
+        local remaining=""
+        for ws in $(list-running-instances); do
+            [[ "$ws" != "ws0" ]] && remaining="$remaining $ws"
+        done
+        if [[ -z "$remaining" ]]; then
+            infra-compose down -t 2
+        fi
         return 0
     fi
 
@@ -1022,16 +1056,54 @@ function start-coding-agent {
 
 function build-imagemagick-docker-image {
     set +e;
-    echo "Building image penpotapp/imagemagick:$IMAGEMAGICK_VERSION"
+
+    local custom_tag=""
+    local do_push=false
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --tag)
+                custom_tag="$2"; shift 2;;
+            --push)
+                do_push=true; shift;;
+            --local)
+                # Kept for backward compatibility -- local-only is now the
+                # default behaviour, so this flag is a no-op.
+                shift;;
+            *)
+                echo "build-imagemagick-docker-image: unknown argument '$1'" >&2
+                return 1;;
+        esac
+    done
 
     pushd docker/imagemagick;
 
-    output_option="type=registry";
-    platform="linux/amd64,linux/arm64";
+    # Without --tag, keep the historical behaviour of tagging both ':latest'
+    # and the pinned IMAGEMAGICK_VERSION. With --tag, tag ONLY the custom
+    # value -- it's meant to be an isolated/test tag, not a stand-in for latest.
+    local -a tag_args=()
+    if [[ -n "$custom_tag" ]]; then
+        tag_args=(-t "penpotapp/imagemagick:$custom_tag")
+        echo "Building image penpotapp/imagemagick:$custom_tag"
+    else
+        tag_args=(-t "penpotapp/imagemagick:latest" -t "penpotapp/imagemagick:$IMAGEMAGICK_VERSION")
+        echo "Building image penpotapp/imagemagick:$IMAGEMAGICK_VERSION"
+    fi
 
-    if [ "$1" = "--local" ]; then
-        output_option="type=docker";
-        platform="linux/$ARCH"
+    local output_option="type=docker";
+    local platform="linux/$ARCH";
+    local -a attestation_args=();
+
+    if [[ "$do_push" == "true" ]]; then
+        output_option="type=registry";
+        platform="linux/amd64,linux/arm64";
+        # Attestations (SBOM/provenance) only work when pushing to a
+        # registry -- the local image store doesn't support loading images
+        # with attestations, so these are only added on this branch.
+        attestation_args=(--provenance=mode=max --sbom=true);
+        echo "Will push to registry"
+    else
+        echo "Local build only (pass --push to publish to the registry)"
     fi
 
     setup-buildx;
@@ -1040,8 +1112,8 @@ function build-imagemagick-docker-image {
       --build-arg IMAGEMAGICK_VERSION=$IMAGEMAGICK_VERSION \
       --platform $platform \
       --output $output_option \
-      -t penpotapp/imagemagick:latest \
-      -t penpotapp/imagemagick:$IMAGEMAGICK_VERSION .;
+      "${attestation_args[@]}" \
+      "${tag_args[@]}" .;
 
     popd;
 }
@@ -1062,7 +1134,7 @@ function build {
            -e SHADOWCLJS_EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS \
            -e JAVA_OPTS="$JAVA_OPTS" \
            -w /home/penpot/penpot/$1 \
-           $DEVENV_IMGNAME:latest sudo -EH -u penpot ./scripts/$script $version
+           $DEVENV_IMGNAME:$DEVENV_TAG sudo -EH -u penpot ./scripts/$script $version
 
     echo ">> build end: $1"
 }
@@ -1175,54 +1247,59 @@ function build-docs-bundle {
     echo ">> bundle docs end";
 }
 
-function build-frontend-docker-image {
-    rsync -avr --delete ./bundles/frontend/ ./docker/images/bundle-frontend/;
+# Shared helper for the release-image builds below (frontend/backend/exporter/
+# mcp/storybook). Parses --tag; without it, tags with both $CURRENT_BRANCH and
+# 'latest' (historical default, unchanged). With --tag, tags ONLY that custom
+# value -- same convention as build-devenv/build-imagemagick-docker-image: a
+# custom tag is for an isolated/test build, not a stand-in for latest.
+function _build-release-docker-image {
+    local image="$1" bundle_dir="$2" dockerfile="$3"; shift 3
+    local custom_tag=""
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --tag)
+                custom_tag="$2"; shift 2;;
+            *)
+                echo "build-${image}-docker-image: unknown argument '$1'" >&2
+                return 1;;
+        esac
+    done
+
+    local -a tag_args=()
+    if [[ -n "$custom_tag" ]]; then
+        tag_args=(-t "penpotapp/${image}:$custom_tag")
+    else
+        tag_args=(-t "penpotapp/${image}:$CURRENT_BRANCH" -t "penpotapp/${image}:latest")
+    fi
+
+    rsync -avr --delete "./bundles/${image}/" "./docker/images/${bundle_dir}/";
     pushd ./docker/images;
     docker build \
-        -t penpotapp/frontend:$CURRENT_BRANCH -t penpotapp/frontend:latest \
-        --build-arg BUNDLE_PATH="./bundle-frontend/" \
-        -f Dockerfile.frontend .;
+        "${tag_args[@]}" \
+        --build-arg BUNDLE_PATH="./${bundle_dir}/" \
+        -f "$dockerfile" .;
     popd;
 }
 
+function build-frontend-docker-image {
+    _build-release-docker-image frontend bundle-frontend Dockerfile.frontend "$@"
+}
+
 function build-backend-docker-image {
-    rsync -avr --delete ./bundles/backend/ ./docker/images/bundle-backend/;
-    pushd ./docker/images;
-    docker build \
-        -t penpotapp/backend:$CURRENT_BRANCH -t penpotapp/backend:latest \
-        --build-arg BUNDLE_PATH="./bundle-backend/" \
-        -f Dockerfile.backend .;
-    popd;
+    _build-release-docker-image backend bundle-backend Dockerfile.backend "$@"
 }
 
 function build-exporter-docker-image {
-    rsync -avr --delete ./bundles/exporter/ ./docker/images/bundle-exporter/;
-    pushd ./docker/images;
-    docker build \
-        -t penpotapp/exporter:$CURRENT_BRANCH -t penpotapp/exporter:latest \
-        --build-arg BUNDLE_PATH="./bundle-exporter/" \
-        -f Dockerfile.exporter .;
-    popd;
+    _build-release-docker-image exporter bundle-exporter Dockerfile.exporter "$@"
 }
 
 function build-mcp-docker-image {
-    rsync -avr --delete ./bundles/mcp/ ./docker/images/bundle-mcp/;
-    pushd ./docker/images;
-    docker build \
-        -t penpotapp/mcp:$CURRENT_BRANCH -t penpotapp/mcp:latest \
-        --build-arg BUNDLE_PATH="./bundle-mcp/" \
-        -f Dockerfile.mcp .;
-    popd;
+    _build-release-docker-image mcp bundle-mcp Dockerfile.mcp "$@"
 }
 
 function build-storybook-docker-image {
-    rsync -avr --delete ./bundles/storybook/ ./docker/images/bundle-storybook/;
-    pushd ./docker/images;
-    docker build \
-        -t penpotapp/storybook:$CURRENT_BRANCH -t penpotapp/storybook:latest \
-        --build-arg BUNDLE_PATH="./bundle-storybook/" \
-        -f Dockerfile.storybook .;
-    popd;
+    _build-release-docker-image storybook bundle-storybook Dockerfile.storybook "$@"
 }
 
 function usage {
@@ -1236,9 +1313,18 @@ function usage {
     echo "clones). Use --ws N to target a specific workspace; the default is 0."
     echo "Full guide: docs/technical-guide/developer/{devenv,agentic-devenv}.md."
     echo ""
+    echo "Image tag: all devenv commands use \$DEVENV_TAG (default: latest). To work"
+    echo "against a custom tag end-to-end (build, then run), export it before both"
+    echo "calls: 'export DEVENV_TAG=mytest; ./manage.sh build-devenv; ./manage.sh run-devenv'."
+    echo "'build-devenv --tag mytest' only affects that single build call otherwise."
+    echo ""
     echo "Image lifecycle"
     echo "- pull-devenv                      Pull the devenv docker image from the registry."
-    echo "- build-devenv [--local]           Build the devenv docker image (--local skips the registry push)."
+    echo "- build-devenv [--tag TAG] [--push]"
+    echo "                                   Build the devenv docker image. Local-only by default (single-"
+    echo "                                   platform, 'docker build'); pass --push to build multi-platform"
+    echo "                                   (amd64+arm64) and push to the registry instead. --tag TAG overrides"
+    echo "                                   the image tag (default: latest)."
     echo ""
     echo "Bring a devenv up / down"
     echo "- run-devenv                       Bring one workspace up, start its tmux session in the background,"
@@ -1259,14 +1345,14 @@ function usage {
     echo "                                                           honouring per-repo local overrides; see"
     echo "                                                           devenv.md > 'Git identity inside the container')."
     echo "- create-devenv                    Create ws0 + shared-infra compose services without starting them."
-    echo "- stop-devenv                      Stop one or more workspaces. Shared infra stops with the last one."
-    echo "                                   Options: --ws N (stop wsN, N >= 1) | (no flag) (stop ws0 + infra;"
-    echo "                                            refused if any wsN is still running) | --all (stop every wsN"
-    echo "                                            highest first, then ws0 + infra)."
+    echo "- stop-devenv                      Stop one or more workspaces. Shared infra stops when no instances remain."
+    echo "                                   Options: --ws N (stop wsN) | (no flag) (stop ws0; shared infra only"
+    echo "                                            if no other ws is running) | --all (stop every wsN highest"
+    echo "                                            first, then ws0 + infra)."
     echo "- drop-devenv                      Same CLI and invariants as stop-devenv (see above), plus removal of"
     echo "                                   the shared devenv image on full teardowns (no flag, --ws 0, or --all)."
-    echo "                                   Refused if any wsN (N >= 1) is still running. A single --ws N (N >= 1)"
-    echo "                                   keeps the image since other workspaces still need it."
+    echo "                                   A single --ws N (N >= 1) keeps the image since other workspaces still"
+    echo "                                   need it."
     echo "- log-devenv                       Tail a workspace's compose logs."
     echo "                                   Options: --ws N (default: 0)."
     echo ""
@@ -1288,13 +1374,20 @@ function usage {
     echo "- build-storybook-bundle           Build storybook bundle."
     echo "- build-docs-bundle                Build docs bundle."
     echo ""
-    echo "- build-docker-images              Build all docker images (frontend, backend, exporter, mcp and storybook)."
-    echo "- build-frontend-docker-image      Build frontend docker images."
-    echo "- build-backend-docker-image       Build backend docker images."
-    echo "- build-exporter-docker-image      Build exporter docker images."
-    echo "- build-mcp-docker-image           Build exporter docker images."
-    echo "- build-storybook-docker-image     Build storybook docker images."
-    echo "- build-imagemagick-docker-image   Build imagemagic docker images."
+    echo "- build-docker-images [--tag TAG]  Build all docker images (frontend, backend, exporter, mcp and storybook)."
+    echo "                                   Without --tag, each image is tagged with both the current git branch"
+    echo "                                   and 'latest' (unchanged default). With --tag, ONLY that custom tag"
+    echo "                                   is applied, to all five images."
+    echo "- build-frontend-docker-image [--tag TAG]   Build frontend docker image."
+    echo "- build-backend-docker-image [--tag TAG]    Build backend docker image."
+    echo "- build-exporter-docker-image [--tag TAG]   Build exporter docker image."
+    echo "- build-mcp-docker-image [--tag TAG]         Build mcp docker image."
+    echo "- build-storybook-docker-image [--tag TAG]  Build storybook docker image."
+    echo "- build-imagemagick-docker-image [--tag TAG] [--push]"
+    echo "                                   Build the imagemagick docker image. Local-only by default (single-"
+    echo "                                   platform); pass --push to build multi-platform (amd64+arm64) and"
+    echo "                                   push to the registry instead. --tag TAG builds ONLY that tag"
+    echo "                                   (default without --tag: both 'latest' and \$IMAGEMAGICK_VERSION)."
     echo ""
     echo "- version                          Show penpot's version."
 }
@@ -1374,31 +1467,31 @@ case $1 in
         ;;
 
     build-docker-images)
-        build-frontend-docker-image
-        build-backend-docker-image
-        build-exporter-docker-image
-        build-mcp-docker-image
-        build-storybook-docker-image
+        build-frontend-docker-image "${@:2}"
+        build-backend-docker-image "${@:2}"
+        build-exporter-docker-image "${@:2}"
+        build-mcp-docker-image "${@:2}"
+        build-storybook-docker-image "${@:2}"
         ;;
 
     build-frontend-docker-image)
-        build-frontend-docker-image
+        build-frontend-docker-image "${@:2}"
         ;;
 
     build-backend-docker-image)
-        build-backend-docker-image
+        build-backend-docker-image "${@:2}"
         ;;
 
     build-exporter-docker-image)
-        build-exporter-docker-image
+        build-exporter-docker-image "${@:2}"
         ;;
 
     build-mcp-docker-image)
-        build-mcp-docker-image
+        build-mcp-docker-image "${@:2}"
         ;;
 
     build-storybook-docker-image)
-        build-storybook-docker-image
+        build-storybook-docker-image "${@:2}"
         ;;
 
     build-imagemagick-docker-image)
diff --git a/mcp/README.md b/mcp/README.md
index ac99679f28..9b4ac77038 100644
--- a/mcp/README.md
+++ b/mcp/README.md
@@ -267,6 +267,7 @@ The Penpot MCP server can be configured using environment variables.
 | `PENPOT_MCP_REPL_PORT`                           | Port for the REPL server (development/debugging)                           | `4403`         |
 | `PENPOT_MCP_REMOTE_MODE`                         | Enable remote mode (disables file system access). Set to `true` to enable. | `false`        |
 | `PENPOT_MCP_DEVENV`                              | Enable Penpot development environment tools. Set to `true` to enable.      | `false`        |
+| `PENPOT_MCP_TOOL_TIMEOUT_S`                      | Timeout, in seconds, for tool calls dispatched to the Penpot plugin        | `120`          |
 | `PENPOT_MCP_EXPORT_SHAPE_MAX_PARALLEL_REQUESTS`  | Maximum number of parallel export shape requests (multi-user mode only).   | `0` (no limit) |
 | `PENPOT_MCP_REDIS_URI`                           | Redis connection URI (e.g. `redis://host:6379`) enabling multi-instance horizontal scaling via Redis pub/sub task routing (multi-user mode only). When unset, the server runs in single-instance mode, requiring the plugin and MCP client to connect to the same instance. | (unset)        |
 
diff --git a/mcp/package.json b/mcp/package.json
index 6607dd11b2..f40e0e87ce 100644
--- a/mcp/package.json
+++ b/mcp/package.json
@@ -23,9 +23,9 @@
     "type": "git",
     "url": "https://github.com/penpot/penpot.git"
   },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "devDependencies": {
-    "concurrently": "^10.0.3",
-    "prettier": "^3.9.4"
+    "concurrently": "^10.0.4",
+    "prettier": "^3.9.6"
   }
 }
diff --git a/mcp/packages/common/package.json b/mcp/packages/common/package.json
index 01f7af6711..3af6239ff4 100644
--- a/mcp/packages/common/package.json
+++ b/mcp/packages/common/package.json
@@ -4,7 +4,7 @@
   "description": "Shared type definitions and interfaces for Penpot MCP",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "scripts": {
     "build": "tsc --build --clean && tsc --build",
     "watch": "tsc --watch",
diff --git a/mcp/packages/plugin/package.json b/mcp/packages/plugin/package.json
index a14df52313..5377e1bba7 100644
--- a/mcp/packages/plugin/package.json
+++ b/mcp/packages/plugin/package.json
@@ -12,13 +12,13 @@
     "clean": "rm -rf dist/"
   },
   "dependencies": {
-    "@penpot/plugin-styles": "1.4.2",
-    "@penpot/plugin-types": "1.4.2"
+    "@penpot/plugin-styles": "1.5.0",
+    "@penpot/plugin-types": "1.5.0"
   },
   "devDependencies": {
     "cross-env": "^10.1.0",
     "typescript": "^6.0.3",
-    "vite": "^8.1.1",
+    "vite": "^8.2.0",
     "vite-live-preview": "^0.4.0"
   }
 }
diff --git a/mcp/packages/plugin/src/PenpotUtils.ts b/mcp/packages/plugin/src/PenpotUtils.ts
index e5f4d525f0..f856f14cc4 100644
--- a/mcp/packages/plugin/src/PenpotUtils.ts
+++ b/mcp/packages/plugin/src/PenpotUtils.ts
@@ -214,8 +214,6 @@ export class PenpotUtils {
     public static getBounds(shape: Shape): Bounds {
         if (shape.type === "text") {
             const text = shape as Text;
-            // TODO: Remove ts-ignore once type definitions are updated
-            // @ts-ignore
             return text.textBounds;
         } else {
             return shape.bounds;
@@ -473,7 +471,6 @@ export class PenpotUtils {
      */
     public static findTokensByName(name: string): any[] {
         const tokens: any[] = [];
-        // @ts-ignore
         const tokenCatalog = penpot.library.local.tokens;
 
         for (const set of tokenCatalog.sets) {
@@ -494,7 +491,6 @@ export class PenpotUtils {
      * @returns The first matching token, or null if not found
      */
     public static findTokenByName(name: string): any | null {
-        // @ts-ignore
         const tokenCatalog = penpot.library.local.tokens;
 
         for (const set of tokenCatalog.sets) {
@@ -515,7 +511,6 @@ export class PenpotUtils {
      * @returns The TokenSet containing this token, or null if not found
      */
     public static getTokenSet(token: any): any | null {
-        // @ts-ignore
         const tokenCatalog = penpot.library.local.tokens;
 
         for (const set of tokenCatalog.sets) {
@@ -571,7 +566,6 @@ export class PenpotUtils {
         }
 
         // 1. Create the variant container
-        // @ts-ignore — createVariantFromComponents was added after plugin-types@1.4.1
         const container: VariantContainer = (penpot as any).createVariantFromComponents(components.map((c) => c.shape));
         const variants = container.variants;
         if (!variants) {
@@ -617,7 +611,6 @@ export class PenpotUtils {
      */
     public static tokenOverview(): Record<string, Record<string, string[]>> {
         const overview: Record<string, Record<string, string[]>> = {};
-        // @ts-ignore
         const tokenCatalog = penpot.library.local.tokens;
 
         for (const set of tokenCatalog.sets) {
diff --git a/mcp/packages/plugin/src/TaskHandler.ts b/mcp/packages/plugin/src/TaskHandler.ts
index a8f05a4229..7bc0aa3085 100644
--- a/mcp/packages/plugin/src/TaskHandler.ts
+++ b/mcp/packages/plugin/src/TaskHandler.ts
@@ -38,8 +38,6 @@ export class Task<TParams = any> {
 
         // Send to main.ts which will forward to MCP server via WebSocket
         try {
-            // TODO: Remove ts-ignore once Penpot types have been updated
-            // @ts-ignore
             penpot.ui.sendMessage(response, true);
         } catch (sendError) {
             console.error("Failed to transfer task response for transmission to MCP server", sendError);
diff --git a/mcp/packages/plugin/src/index.d.ts b/mcp/packages/plugin/src/index.d.ts
index 42587c8304..a0eda651e1 100644
--- a/mcp/packages/plugin/src/index.d.ts
+++ b/mcp/packages/plugin/src/index.d.ts
@@ -1,12 +1,3 @@
-import "@penpot/plugin-types";
-
-declare module "@penpot/plugin-types" {
-    interface Penpot {
-        /** The Penpot application version string. */
-        version: string;
-    }
-}
-
 interface McpOptions {
     getToken(): string;
     getServerUrl(): string;
diff --git a/mcp/packages/plugin/src/task-handlers/ExecuteCodeTaskHandler.ts b/mcp/packages/plugin/src/task-handlers/ExecuteCodeTaskHandler.ts
index b464c599ef..df2fb65832 100644
--- a/mcp/packages/plugin/src/task-handlers/ExecuteCodeTaskHandler.ts
+++ b/mcp/packages/plugin/src/task-handlers/ExecuteCodeTaskHandler.ts
@@ -196,20 +196,13 @@ export class ExecuteCodeTaskHandler extends TaskHandler<ExecuteCodeTaskParams> {
         const code = task.params.code;
 
         // set the flags naturalChildOrdering and throwValidationErrors to true during code execution.
-        // TODO: Remove all ts-ignore once Penpot types have been updated
         let originalNaturalChildOrdering: any, originalThrowValidationErrors: any;
-        // @ts-ignore
         if (penpot.flags) {
-            // @ts-ignore
             originalNaturalChildOrdering = penpot.flags.naturalChildOrdering;
-            // @ts-ignore
             penpot.flags.naturalChildOrdering = true;
-            // @ts-ignore
             originalThrowValidationErrors = penpot.flags.throwValidationErrors;
-            // @ts-ignore
             penpot.flags.throwValidationErrors = true;
         } else {
-            // TODO: This can be removed once `flags` has been merged to PROD
             throw new Error(
                 "You are using a version of the Penpot MCP server which is incompatible " +
                     "with the connected Penpot version. " +
@@ -228,9 +221,7 @@ export class ExecuteCodeTaskHandler extends TaskHandler<ExecuteCodeTaskParams> {
             })(context);
         } finally {
             // restore the original value of the flags
-            // @ts-ignore
             penpot.flags.naturalChildOrdering = originalNaturalChildOrdering;
-            // @ts-ignore
             penpot.flags.throwValidationErrors = originalThrowValidationErrors;
         }
 
diff --git a/mcp/packages/server/package.json b/mcp/packages/server/package.json
index 67f220c0a6..05f48fc974 100644
--- a/mcp/packages/server/package.json
+++ b/mcp/packages/server/package.json
@@ -24,34 +24,33 @@
   ],
   "author": "",
   "license": "MIT",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.15.1",
     "express": "^5.2.1",
-    "ioredis": "^5.11.1",
-    "js-yaml": "^5.2.0",
+    "ioredis": "^6.0.0",
+    "js-yaml": "^5.2.3",
     "nrepl-client": "^0.3.0",
-    "penpot-mcp": "file:..",
     "pino": "^10.3.1",
     "pino-loki": "^3.0.0",
     "pino-pretty": "^13.1.3",
     "reflect-metadata": "^0.2.2",
-    "sharp": "^0.35.2",
-    "ws": "^8.21.0",
+    "sharp": "^0.35.3",
+    "ws": "^8.21.1",
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@penpot/mcp-common": "workspace:../common",
     "@types/express": "^5.0.6",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.2",
     "@types/ws": "^8.18.1",
     "cross-env": "^10.1.0",
     "esbuild": "^0.28.1",
     "ts-node": "^10.9.2",
-    "tsx": "^4.22.4",
+    "tsx": "^4.23.5",
     "typescript": "^6.0.3"
   },
   "ts-node": {
diff --git a/mcp/packages/server/src/PenpotMcpServer.ts b/mcp/packages/server/src/PenpotMcpServer.ts
index 8a4ee30f25..bd992ec108 100644
--- a/mcp/packages/server/src/PenpotMcpServer.ts
+++ b/mcp/packages/server/src/PenpotMcpServer.ts
@@ -127,6 +127,7 @@ export class PenpotMcpServer {
         this.webSocketPort = parseInt(process.env.PENPOT_MCP_WEBSOCKET_PORT ?? "4402", 10);
         this.replPort = parseInt(process.env.PENPOT_MCP_REPL_PORT ?? "4403", 10);
         this.tenant = process.env.PENPOT_TENANT ?? "default";
+        const toolTimeoutSecs = parseInt(process.env.PENPOT_MCP_TOOL_TIMEOUT_S ?? "120", 10);
 
         this.configLoader = new ConfigurationLoader(process.cwd());
         this.apiDocs = new ApiDocs();
@@ -147,7 +148,7 @@ export class PenpotMcpServer {
             this.redisBridge = new RedisBridge(redisUri, this.tenant);
         }
 
-        this.pluginBridge = new PluginBridge(this, this.webSocketPort, this.redisBridge);
+        this.pluginBridge = new PluginBridge(this, this.webSocketPort, toolTimeoutSecs, this.redisBridge);
         this.replServer = new ReplServer(this.pluginBridge, this.replPort, this.host);
     }
 
diff --git a/mcp/packages/server/src/PluginBridge.ts b/mcp/packages/server/src/PluginBridge.ts
index 19a3a77545..a362faef36 100644
--- a/mcp/packages/server/src/PluginBridge.ts
+++ b/mcp/packages/server/src/PluginBridge.ts
@@ -66,8 +66,11 @@ export function assertPluginResponsive(
  * over these connections.
  */
 export class PluginBridge {
+    public static readonly MULTIUSER_CONNECTION_ERROR_MESSAGE = `No Penpot instance connected for user token. Please ensure that Penpot is connected and that the MCP client connection is using the correct token.`;
+
     private readonly logger = createLogger("PluginBridge");
     private readonly wsServer: WebSocketServer;
+
     private readonly connectedClients: Map<WebSocket, ClientConnection> = new Map();
     private readonly clientsByToken: Map<string, ClientConnection> = new Map();
     private readonly pendingTasks: Map<string, AbstractPluginTask<any, any>> = new Map();
@@ -83,12 +86,13 @@ export class PluginBridge {
      *   holding the relevant plugin's WebSocket connection (which may be this same
      *   instance) via Redis, rather than dispatched directly over a local socket.
      * @param taskTimeoutSecs - Timeout, in seconds, for plugin task execution
+     *   (defaults to {@link DEFAULT_TASK_TIMEOUT_SECS})
      */
     constructor(
         public readonly mcpServer: PenpotMcpServer,
         private port: number,
-        private readonly redisBridge?: RedisBridge,
-        private taskTimeoutSecs: number = 30
+        private readonly taskTimeoutSecs: number,
+        private readonly redisBridge?: RedisBridge
     ) {
         this.wsServer = new WebSocketServer({ port: port });
         this.setupWebSocketHandlers();
@@ -195,9 +199,10 @@ export class PluginBridge {
     /**
      * Removes a client connection and releases all resources associated with it.
      *
-     * Clears the per-connection keep-alive interval and removes the connection
-     * from both the socket-keyed and token-keyed indexes. Safe to call with a
-     * socket that is not (or no longer) registered.
+     * Clears the per-connection keep-alive interval and removes the connection from the
+     * socket-keyed index. The token-keyed index entry (and, in multi-instance mode, the
+     * token's Redis task subscription) is removed only if it is owned by the given
+     * connection. Safe to call with a socket that is not (or no longer) registered.
      *
      * @param ws - The WebSocket whose connection state should be removed
      */
@@ -209,12 +214,18 @@ export class PluginBridge {
         clearInterval(connection.pingInterval);
         this.connectedClients.delete(ws);
         if (connection.userToken) {
-            this.clientsByToken.delete(connection.userToken);
+            // Perform the token-keyed cleanup only if this connection owns the token registration.
+            // A connection rejected as a duplicate carries the same token but must not remove token associations.
+            if (this.clientsByToken.get(connection.userToken) !== connection) {
+                this.logger.debug("Removed connection does not own its token registration; skipping token cleanup");
+            } else {
+                this.clientsByToken.delete(connection.userToken);
 
-            if (this.redisBridge) {
-                this.redisBridge
-                    .unsubscribeFromTasks(connection.userToken)
-                    .catch((error) => this.logger.error(error, "Failed to unsubscribe from Redis task channel"));
+                if (this.redisBridge) {
+                    this.redisBridge
+                        .unsubscribeFromTasks(connection.userToken)
+                        .catch((error) => this.logger.error(error, "Failed to unsubscribe from Redis task channel"));
+                }
             }
         }
     }
@@ -253,6 +264,35 @@ export class PluginBridge {
         this.logger.info(`Task ${response.id} completed: success=${response.success}`);
     }
 
+    /**
+     * Rejects a still-pending task with the given error, releasing its correlation state.
+     *
+     * Clears the task's timeout (if armed) and removes the task from the pending-task
+     * index before rejecting its promise. Safe to call for a task that has already been
+     * settled (e.g. by a response or a timeout), in which case nothing happens.
+     *
+     * @param taskId - The ID of the task to reject
+     * @param error - The error with which to reject the task
+     * @returns Whether the task was still pending and has been rejected
+     */
+    private rejectPendingTask(taskId: string, error: Error): boolean {
+        const pendingTask = this.pendingTasks.get(taskId);
+        if (!pendingTask) {
+            return false;
+        }
+
+        const timeoutHandle = this.taskTimeouts.get(taskId);
+        if (timeoutHandle) {
+            clearTimeout(timeoutHandle);
+            this.taskTimeouts.delete(taskId);
+        }
+        this.pendingTasks.delete(taskId);
+
+        pendingTask.rejectWithError(error);
+        this.logger.info(`Task ${taskId} rejected: ${error.message}`);
+        return true;
+    }
+
     /**
      * Determines the client connection to use for executing a task.
      *
@@ -271,9 +311,7 @@ export class PluginBridge {
 
             const connection = this.clientsByToken.get(sessionContext.userToken);
             if (!connection) {
-                throw new Error(
-                    `No plugin instance connected for user token. Please ensure the plugin is running and connected with the correct token.`
-                );
+                throw new Error(PluginBridge.MULTIUSER_CONNECTION_ERROR_MESSAGE);
             }
 
             return connection;
@@ -321,6 +359,10 @@ export class PluginBridge {
      * `resolveWithResult`/`rejectWithError` methods. The same correlation and timeout
      * handling therefore applies regardless of the transport.
      *
+     * When routing via Redis, the task is rejected immediately (rather than timing out)
+     * if the published request reached no instance, i.e. if no instance holds a plugin
+     * connection for the session's user token, or if publishing fails outright.
+     *
      * @param task - The task to dispatch
      * @param useRedis - Whether to route the request via Redis (multi-instance) rather
      *   than directly over the local WebSocket connection
@@ -343,9 +385,17 @@ export class PluginBridge {
 
             // register the task for result correlation, then publish the request via Redis
             this.pendingTasks.set(task.id, task);
-            void redisBridge.sendTaskRequest(userToken, task.toRequest(), (response) =>
-                this.handlePluginTaskResponse(response)
-            );
+            void redisBridge
+                .sendTaskRequest(userToken, task.toRequest(), (response) => this.handlePluginTaskResponse(response))
+                .then((receiverCount) => {
+                    // fail fast when no instance received the request (no connection with matching user token in any instance)
+                    if (receiverCount === 0) {
+                        this.rejectPendingTask(task.id, new Error(PluginBridge.MULTIUSER_CONNECTION_ERROR_MESSAGE));
+                    }
+                })
+                .catch((error) => {
+                    this.rejectPendingTask(task.id, error instanceof Error ? error : new Error(String(error)));
+                });
 
             // on timeout, release the response-channel subscription, since no response
             // will arrive to trigger its self-unsubscribe.
@@ -367,14 +417,13 @@ export class PluginBridge {
 
         // Set up a timeout to reject the task if no response is received
         const timeoutHandle = setTimeout(() => {
-            const pendingTask = this.pendingTasks.get(task.id);
-            if (pendingTask) {
-                this.pendingTasks.delete(task.id);
-                this.taskTimeouts.delete(task.id);
-                onTimeout?.();
-                pendingTask.rejectWithError(
+            if (
+                this.rejectPendingTask(
+                    task.id,
                     new Error(`Task ${task.id} timed out after ${this.taskTimeoutSecs} seconds`)
-                );
+                )
+            ) {
+                onTimeout?.();
             }
         }, this.taskTimeoutSecs * 1000);
 
diff --git a/mcp/packages/server/src/RedisBridge.ts b/mcp/packages/server/src/RedisBridge.ts
index d8117d9242..89c01a4871 100644
--- a/mcp/packages/server/src/RedisBridge.ts
+++ b/mcp/packages/server/src/RedisBridge.ts
@@ -91,12 +91,16 @@ export class RedisBridge {
      * @param userToken - The user token identifying the target plugin's request channel
      * @param request - The serialized plugin task request, passed through verbatim
      * @param onResponse - Handler invoked with the response when it arrives
+     * @returns The number of instances that received the request. A count of 0 means no
+     *   instance is subscribed to the token's request channel (i.e. the plugin is not
+     *   connected anywhere); the request was dropped, no response will ever arrive, and
+     *   the response subscription has already been released.
      */
     async sendTaskRequest(
         userToken: string,
         request: PluginTaskRequest,
         onResponse: TaskResponseHandler
-    ): Promise<void> {
+    ): Promise<number> {
         const responseChannel = this.responseChannel(request.id);
         const requestChannel = this.requestChannel(userToken);
 
@@ -113,7 +117,19 @@ export class RedisBridge {
 
         await this.subscriber.subscribe(responseChannel);
         // publish only once the response subscription is confirmed
-        await this.publisher.publish(requestChannel, JSON.stringify(request));
+        let receiverCount: number;
+        try {
+            receiverCount = await this.publisher.publish(requestChannel, JSON.stringify(request));
+        } catch (error) {
+            // the request was never delivered, so no response can arrive
+            await this.unsubscribeFromResponse(request.id);
+            throw error;
+        }
+        if (receiverCount === 0) {
+            // no subscriber received the request, so no response can arrive
+            await this.unsubscribeFromResponse(request.id);
+        }
+        return receiverCount;
     }
 
     /**
diff --git a/mcp/pnpm-lock.yaml b/mcp/pnpm-lock.yaml
index f81ed1183d..4d49e451b3 100644
--- a/mcp/pnpm-lock.yaml
+++ b/mcp/pnpm-lock.yaml
@@ -4,16 +4,19 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  '@hono/node-server@<2.0.5': ^2.0.5
+
 importers:
 
   .:
     devDependencies:
       concurrently:
-        specifier: ^10.0.3
-        version: 10.0.3
+        specifier: ^10.0.4
+        version: 10.0.4
       prettier:
-        specifier: ^3.9.4
-        version: 3.9.4
+        specifier: ^3.9.6
+        version: 3.9.6
 
   packages/common:
     devDependencies:
@@ -24,11 +27,11 @@ importers:
   packages/plugin:
     dependencies:
       '@penpot/plugin-styles':
-        specifier: 1.4.2
-        version: 1.4.2
+        specifier: 1.5.0
+        version: 1.5.0
       '@penpot/plugin-types':
-        specifier: 1.4.2
-        version: 1.4.2
+        specifier: 1.5.0
+        version: 1.5.0
     devDependencies:
       cross-env:
         specifier: ^10.1.0
@@ -37,17 +40,17 @@ importers:
         specifier: ^6.0.3
         version: 6.0.3
       vite:
-        specifier: ^8.1.1
-        version: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(tsx@4.22.4)
+        specifier: ^8.2.0
+        version: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(tsx@4.23.5)
       vite-live-preview:
         specifier: ^0.4.0
-        version: 0.4.0(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(tsx@4.22.4))
+        version: 0.4.0(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(tsx@4.23.5))
 
   packages/server:
     dependencies:
       '@modelcontextprotocol/sdk':
         specifier: ^1.29.0
-        version: 1.29.0(zod@4.4.3)
+        version: 1.29.0(supports-color@10.2.2)(zod@4.4.3)
       class-transformer:
         specifier: ^0.5.1
         version: 0.5.1
@@ -56,19 +59,16 @@ importers:
         version: 0.15.1
       express:
         specifier: ^5.2.1
-        version: 5.2.1
+        version: 5.2.1(supports-color@10.2.2)
       ioredis:
-        specifier: ^5.11.1
-        version: 5.11.1
+        specifier: ^6.0.0
+        version: 6.0.0(supports-color@10.2.2)
       js-yaml:
-        specifier: ^5.2.0
-        version: 5.2.0
+        specifier: ^5.2.3
+        version: 5.2.3
       nrepl-client:
         specifier: ^0.3.0
         version: 0.3.0
-      penpot-mcp:
-        specifier: file:..
-        version: file:packages
       pino:
         specifier: ^10.3.1
         version: 10.3.1
@@ -82,11 +82,11 @@ importers:
         specifier: ^0.2.2
         version: 0.2.2
       sharp:
-        specifier: ^0.35.2
-        version: 0.35.2
+        specifier: ^0.35.3
+        version: 0.35.3(@types/node@26.1.2)
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.1
+        version: 8.21.1
       zod:
         specifier: ^4.4.3
         version: 4.4.3
@@ -101,8 +101,8 @@ importers:
         specifier: ^4.0.9
         version: 4.0.9
       '@types/node':
-        specifier: ^26.0.1
-        version: 26.0.1
+        specifier: ^26.1.2
+        version: 26.1.2
       '@types/ws':
         specifier: ^8.18.1
         version: 8.18.1
@@ -114,10 +114,10 @@ importers:
         version: 0.28.1
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@26.0.1)(typescript@6.0.3)
+        version: 10.9.2(@types/node@26.1.2)(typescript@6.0.3)
       tsx:
-        specifier: ^4.22.4
-        version: 4.22.4
+        specifier: ^4.23.5
+        version: 4.23.5
       typescript:
         specifier: ^6.0.3
         version: 6.0.3
@@ -128,14 +128,8 @@ packages:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
 
-  '@emnapi/core@1.11.1':
-    resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==}
-
-  '@emnapi/runtime@1.11.1':
-    resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==}
-
-  '@emnapi/wasi-threads@1.2.2':
-    resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==}
+  '@emnapi/runtime@1.11.3':
+    resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==}
 
   '@epic-web/invariant@1.0.0':
     resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==}
@@ -296,9 +290,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@hono/node-server@1.19.14':
-    resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
-    engines: {node: '>=18.14.1'}
+  '@hono/node-server@2.0.12':
+    resolution: {integrity: sha512-eWpQYr67tqJLeaSUl0Q+TquuYfUdTibpOJlUMV2FfUP7+KqCC5TufnwnlXL6mobZBJbGAYRd7ZvEBDCbLInjhg==}
+    engines: {node: '>=20'}
     peerDependencies:
       hono: ^4
 
@@ -306,166 +300,166 @@ packages:
     resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
     engines: {node: '>=18'}
 
-  '@img/sharp-darwin-arm64@0.35.2':
-    resolution: {integrity: sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg==}
+  '@img/sharp-darwin-arm64@0.35.3':
+    resolution: {integrity: sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-darwin-x64@0.35.2':
-    resolution: {integrity: sha512-BaktuGPCeHJMARpodR8jK4uKiZrPAy9WrfQW0sdI37clracq8Bp01AYS3SZgi5FS/y5twa9t4+LIuuxQjqRrWw==}
+  '@img/sharp-darwin-x64@0.35.3':
+    resolution: {integrity: sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-freebsd-wasm32@0.35.2':
-    resolution: {integrity: sha512-YoAxdnd8hPUkvLHd3bWY+YA8nw3xM/RyRopYucNsWHVSan8NLVM3X2volsfoRDcXdUJPg6tXahSd7HXPK7lRnw==}
+  '@img/sharp-freebsd-wasm32@0.35.3':
+    resolution: {integrity: sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==}
     engines: {node: '>=20.9.0'}
     os: [freebsd]
 
-  '@img/sharp-libvips-darwin-arm64@1.3.1':
-    resolution: {integrity: sha512-4V/M3roRMTYjiwZY9IOVQOE8OyeCxFAkYmyZDrZl51uOKjibm3oeEJ4WAmLxutAfzFbC9jqUiPs2gbnGflH+7g==}
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
+    resolution: {integrity: sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-x64@1.3.1':
-    resolution: {integrity: sha512-c0/DxItpJv2+dGhgycJBBgotdqruGYDvA79drdh0MD1dFpy7JzJ/PlXwi1H4rFf0eTy8tgbI91aHDnZIceY3jQ==}
+  '@img/sharp-libvips-darwin-x64@1.3.2':
+    resolution: {integrity: sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-libvips-linux-arm64@1.3.1':
-    resolution: {integrity: sha512-JznefmcK9j1JKPz8AkQDh89kjojubyfOasWBPKfzMIhPwsgDy9evpE/naJTXXXmghS1iFwR8u/kTwh/I2/+GCw==}
+  '@img/sharp-libvips-linux-arm64@1.3.2':
+    resolution: {integrity: sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-arm@1.3.1':
-    resolution: {integrity: sha512-aGGy9aWzXgHBG7HNyQPWorZthlp7+x6fDRoPAQbGO3ThcttuTyKIx3NuSHb6zb4gBNq6/yNn9f1cy9nFKS/Vmg==}
+  '@img/sharp-libvips-linux-arm@1.3.2':
+    resolution: {integrity: sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-ppc64@1.3.1':
-    resolution: {integrity: sha512-1EkwGNCZk6iWNCMWqrvdJ+r1j0PT1zIz60CNPhYnJlK/zyeWqlsPZIe+ocBVqPF8k/Ssee/NCk+tE9Ryrko6ng==}
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
+    resolution: {integrity: sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-riscv64@1.3.1':
-    resolution: {integrity: sha512-Ilays+w2bXdnxzxtQdmXR62u8o8GYa3eL4+Gr+1KiE4xperMZUslRaVPJwwPkzlHEjGfXAfRVAa/7CYCtSqsBw==}
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
+    resolution: {integrity: sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-s390x@1.3.1':
-    resolution: {integrity: sha512-VfBwVHQTbRoj4XlpA/KLZ7ltgMpz+4WSejFzQ+GnoImjo1PtEJ59QB2qR1xQEeRPYIkNrPIm2L4cICMvz4C2ew==}
+  '@img/sharp-libvips-linux-s390x@1.3.2':
+    resolution: {integrity: sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-x64@1.3.1':
-    resolution: {integrity: sha512-+c8ukgwU62DS54nCAjw7keOfHUkmr0B5QHEdcOqRnodF/MNXJbVI8Eopoj4B/0H8Asr65I+A4Amrn7a85/md6A==}
+  '@img/sharp-libvips-linux-x64@1.3.2':
+    resolution: {integrity: sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
-    resolution: {integrity: sha512-qlKb/pwbkAi1WMsJrYHk7CuDrd12s27U2QnRhFYUoJNrRCmkosMTttuRFat/DDB3IlDm5qE1TJgZ4JDnHX8Ldw==}
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
+    resolution: {integrity: sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
-    resolution: {integrity: sha512-yO21HwoUVLN8Qa+/SBjQLMYwBWAVJjeGPNe+hc0OUeMeifEtJqu5a1c4HayE1nNpDih9y3/KkoltfkDodmKAlg==}
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
+    resolution: {integrity: sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-linux-arm64@0.35.2':
-    resolution: {integrity: sha512-af12Pnd0ZGu2HfP8NayB0kk6eC/lrfbQE6HlR4jD+34wdJ1Vw9TF6TMn6ZvffT+WgqVsl0hRbmNvz2u/23VmwA==}
+  '@img/sharp-linux-arm64@0.35.3':
+    resolution: {integrity: sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-arm@0.35.2':
-    resolution: {integrity: sha512-SE4kzF2mepn6z+6E7L6lsV8FzuLL6IPQdyX8ZiwROAG/G8td+hP/m7FsFPwidtrF19gvajuC9l6TxAVcsA4S7A==}
+  '@img/sharp-linux-arm@0.35.3':
+    resolution: {integrity: sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==}
     engines: {node: '>=20.9.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-ppc64@0.35.2':
-    resolution: {integrity: sha512-hYSBm7zcNtDCozCxQHYZJiu63b/bXsgRZuOxCIBZsStMM9Vap47iFHdbX4kCvQsblPB/k+clhELpdQJHQLSHvg==}
+  '@img/sharp-linux-ppc64@0.35.3':
+    resolution: {integrity: sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==}
     engines: {node: '>=20.9.0'}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-riscv64@0.35.2':
-    resolution: {integrity: sha512-qQt0Kc13+Hoan/Awq/qMSQw3L+RI1NCRPgD5cUJ/1WSSmIoysLOc72jlRM3E0OHN9Yr313jgeQ2T+zW+F03QFA==}
+  '@img/sharp-linux-riscv64@0.35.3':
+    resolution: {integrity: sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==}
     engines: {node: '>=20.9.0'}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-s390x@0.35.2':
-    resolution: {integrity: sha512-E4fLLfRPzDLlEeDaTzI98OFLcv++WL5ChLLMwPoVd0CIoZQqupBSNbOisPL5am9XsbQ9T84+iiMpUvbFtkunbA==}
+  '@img/sharp-linux-s390x@0.35.3':
+    resolution: {integrity: sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==}
     engines: {node: '>=20.9.0'}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-x64@0.35.2':
-    resolution: {integrity: sha512-gi0zFJJRLswfCZmHtJdikXPOc5u7qamSOS3NHedLqLd4W8Q0NqjdBr6TTRIgsfFjqfTsHFgdfvJ9LwqSgcHiAA==}
+  '@img/sharp-linux-x64@0.35.3':
+    resolution: {integrity: sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linuxmusl-arm64@0.35.2':
-    resolution: {integrity: sha512-siWbOW1u6HFnFLrp0waKyW7VEf7jYvcDWdrXEFa8AkdAQgEvuu5Fz8/Y70w9EeqAdwDtfU012BhEHHaDqvQNzg==}
+  '@img/sharp-linuxmusl-arm64@0.35.3':
+    resolution: {integrity: sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-linuxmusl-x64@0.35.2':
-    resolution: {integrity: sha512-YBqMMcjDi4QGYiSn4vNOYBhmlC4z5AXqkOUUqI2e0AFA4urNv4ESgOgwNl3K+4etQhha0twXlzeF20bbULm9Yg==}
+  '@img/sharp-linuxmusl-x64@0.35.3':
+    resolution: {integrity: sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-wasm32@0.35.2':
-    resolution: {integrity: sha512-Mrv4JQNYVQ94xH+jzZ9r+gowleN8mv2FTgKT+PI6bx5C0G8TdNYndu161pg2i7uoBwxy2ImPMHrJOM2LZef7Bw==}
+  '@img/sharp-wasm32@0.35.3':
+    resolution: {integrity: sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==}
     engines: {node: '>=20.9.0'}
 
-  '@img/sharp-webcontainers-wasm32@0.35.2':
-    resolution: {integrity: sha512-QNV27pxs9wpApEiCfvHM1RDoP1w1+2KrUWWDPEhEwg+latvOrfuhWrHWZKwdSFwU6jh3myjw/yOCRsUIuOft3g==}
+  '@img/sharp-webcontainers-wasm32@0.35.3':
+    resolution: {integrity: sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==}
     engines: {node: '>=20.9.0'}
     cpu: [wasm32]
 
-  '@img/sharp-win32-arm64@0.35.2':
-    resolution: {integrity: sha512-BiVRYc/t6/Vl3e1hBx0hugG4oN9Pydf4fgMSpxTQJmwGUg/YoXTWHiFeRymHfCZzifxu4F4rpk/I67D0LQ20wQ==}
+  '@img/sharp-win32-arm64@0.35.3':
+    resolution: {integrity: sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@img/sharp-win32-ia32@0.35.2':
-    resolution: {integrity: sha512-YYEhx9PImCC7T0tI8JDMi4DB9LwLCXCU5OWNYEXAxh5Q1ShKkyC6byxzoBJ3gEFDnH2lQckWuDe70G7mB2XJog==}
+  '@img/sharp-win32-ia32@0.35.3':
+    resolution: {integrity: sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==}
     engines: {node: ^20.9.0}
     cpu: [ia32]
     os: [win32]
 
-  '@img/sharp-win32-x64@0.35.2':
-    resolution: {integrity: sha512-imoOyBcoM/iiUr4J6VPpCNjPnjvP/Gks95898yB8YqoGGYmHYbOyCuNv9FMhFgtaiHFGbHW8bxKqRV6VjtXThQ==}
+  '@img/sharp-win32-x64@0.35.3':
+    resolution: {integrity: sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [win32]
 
-  '@ioredis/commands@1.10.0':
-    resolution: {integrity: sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==}
+  '@ioredis/commands@2.0.0':
+    resolution: {integrity: sha512-vrx0AE/T0h7cRZwfo1M39Cr+ZhZrkf0V8mQN75wucKCxCLD9l/VX6no3gFvrLqD1IlG/1LtzWovqEw3t0Vr9zg==}
 
   '@jridgewell/resolve-uri@3.1.2':
     resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
@@ -487,115 +481,104 @@ packages:
       '@cfworker/json-schema':
         optional: true
 
-  '@napi-rs/wasm-runtime@1.1.6':
-    resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
-    peerDependencies:
-      '@emnapi/core': ^1.7.1
-      '@emnapi/runtime': ^1.7.1
+  '@oxc-project/types@0.142.0':
+    resolution: {integrity: sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==}
 
-  '@oxc-project/types@0.137.0':
-    resolution: {integrity: sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==}
+  '@penpot/plugin-styles@1.5.0':
+    resolution: {integrity: sha512-rwXFBRPd0IZs3ens+eRT8oA5WqkQgF6xlW6fCfH7U1NHRjej9HH7vTGXmfjoIVml6Xx1sbyYHZVxkQC8Ub8+zA==}
 
-  '@penpot/plugin-styles@1.4.2':
-    resolution: {integrity: sha512-/Rn6xy80W+mxAi6j5/SOiNY8P0qHMB1WW+j+nyZajecFSnVGPzSWOiMcIDH+Jtsz7Xpmd5AICpgVM0xjechQig==}
-
-  '@penpot/plugin-types@1.4.2':
-    resolution: {integrity: sha512-O8wU6RSYE8bIVU7g8cSTYi32ppxs3R13dq7X3Nn9tmDaJjBOKOBpVLuoRPIp3fJC65fv8/7om0sdrtFoL5v19g==}
+  '@penpot/plugin-types@1.5.0':
+    resolution: {integrity: sha512-hFk4Rx66rLaSUWoN6bhxXkDI2ymwKg9xokdslvZvXM5MSmEmfhsJKUMwtuzgYWljbbfaQhK+DjK8g8yVbbavtA==}
 
   '@pinojs/redact@0.4.0':
     resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
 
-  '@rolldown/binding-android-arm64@1.1.3':
-    resolution: {integrity: sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==}
+  '@rolldown/binding-android-arm64@1.2.2':
+    resolution: {integrity: sha512-l7x215OGvo1s52JWmR8U/DAVzEDWBCIbTm28aeJV/WDTSHgcKXaZTuBT0hJMs5NggilfJTW3clZVvd24yfKJxA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
-    resolution: {integrity: sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==}
+  '@rolldown/binding-darwin-arm64@1.2.2':
+    resolution: {integrity: sha512-9u9Xv6c1AJZT0FfwH5vrMG5Jjcwhc1MlyrPu0XfTqkzsmqfks2M6W/o5XwAJgVVN/jHpqqngC1WevHKKTIUtIA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.1.3':
-    resolution: {integrity: sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==}
+  '@rolldown/binding-darwin-x64@1.2.2':
+    resolution: {integrity: sha512-9W1mbGZAfW3oqd85bhBkmpyHCCzL1TeG/zFFP3vg7b0rlly8cxOcre5nXwz+LHazCwac2MNWgPdPCHndABjpWQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
-    resolution: {integrity: sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==}
+  '@rolldown/binding-freebsd-x64@1.2.2':
+    resolution: {integrity: sha512-0p1lhiCSCyaerFwtrdZQUx7NqGk6LQnaRKWX7tFQqwQgvX0rjM15cIkm3pax1UpEakK14C4mOxx/jSqCBdBRqQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
-    resolution: {integrity: sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.2':
+    resolution: {integrity: sha512-e+cOJXrJ2L3zx6YzqPg+f6Wbk3V1cKB8bOhbaYdVYN3DdquzNdRAmrbETz1qnt5yp/c7JNlNjmITiA2cVneQ7w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
-    resolution: {integrity: sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==}
+  '@rolldown/binding-linux-arm64-gnu@1.2.2':
+    resolution: {integrity: sha512-JsSMsj6sNat/MuhG5fnBD7QgbtpHKVe30x5/bAVirDHdhoQRXJkF6xc0Jqk8O4fiCUQAzMOoH9wZi3m60c8wtg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
-    resolution: {integrity: sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==}
+  '@rolldown/binding-linux-arm64-musl@1.2.2':
+    resolution: {integrity: sha512-B5G/zJdHaoJn9vD50eGHWkiWfmq8Uhi3IiLPJTzmZTrAalk1bztUikSXo0qga18ibE0IXboyeMUnhPjhAJ45wQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
-    resolution: {integrity: sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==}
+  '@rolldown/binding-linux-ppc64-gnu@1.2.2':
+    resolution: {integrity: sha512-6mC/awzKka8W6EoekjegpfGkjz8jXWDX63pqu/HYVpyKtZfu65Jsh4QAH3Kej3CAv/c1oGX7psTmFEbr0mDxLA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
-    resolution: {integrity: sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==}
+  '@rolldown/binding-linux-s390x-gnu@1.2.2':
+    resolution: {integrity: sha512-412MX9fJLdA1IK28EZnc8jYv2HRTleOZgfLQumJ5zy7OeJLZlg/CETwFaXjNmGVxG51cFHpKLqb5LKvBC+HsHA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
-    resolution: {integrity: sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==}
+  '@rolldown/binding-linux-x64-gnu@1.2.2':
+    resolution: {integrity: sha512-Q/+HI/ToJafZ1iCqGgVQXUEkIjufHCTF0gBQ2a5o3cg7GJ2h0qyq3nvvSmU+bGda2/7ygXpTY4TM6gO9OhQ0ZA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
-    resolution: {integrity: sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==}
+  '@rolldown/binding-linux-x64-musl@1.2.2':
+    resolution: {integrity: sha512-ZKp/w41n6wCvxzxQHtQSbuphfX3Y4cCvbjkKHusrLx4lh+JWLTU7StSltO/DKARISzbj368d+qUaCjI8K2wzXw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
-    resolution: {integrity: sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==}
+  '@rolldown/binding-openharmony-arm64@1.2.2':
+    resolution: {integrity: sha512-pxE6xD4KS3eAROkKK5yrhB9/3+vhlhVGMvlQLbdpzrBGDbKrnzx3RLwPaHvasLo6jgaiBLn7e04Df9C4tYhjmA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
-    resolution: {integrity: sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [wasm32]
-
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
-    resolution: {integrity: sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==}
+  '@rolldown/binding-win32-arm64-msvc@1.2.2':
+    resolution: {integrity: sha512-4MqEue5re+xIZzAWsB8sj0P1kqZySWqIuN4t6QaIO/YA6SFwySOLruvWQFzfmqk8LBK2P30KCSJwf6mJCZZ5/A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
-    resolution: {integrity: sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==}
+  '@rolldown/binding-win32-x64-msvc@1.2.2':
+    resolution: {integrity: sha512-NweNxxD0Nf9t8v7kodun45Ijp3EIwYY+uydPP6qBEYvfBqhIjN6dZMzlQja3tqX/aLs3F3Uz+AxDpKgRhpOZQg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -621,9 +604,6 @@ packages:
   '@tsconfig/node16@1.0.4':
     resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
 
-  '@tybys/wasm-util@0.10.3':
-    resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
-
   '@types/body-parser@1.19.6':
     resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
 
@@ -642,8 +622,8 @@ packages:
   '@types/js-yaml@4.0.9':
     resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
 
-  '@types/node@26.0.1':
-    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
   '@types/qs@6.15.1':
     resolution: {integrity: sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==}
@@ -708,8 +688,8 @@ packages:
   bencode@2.0.3:
     resolution: {integrity: sha512-D/vrAD4dLVX23NalHwb8dSvsUsxeRPO8Y7ToKA015JQYq69MLDOMkC0uGZYA/MPpltLO8rt8eqFC2j8DxjTZ/w==}
 
-  body-parser@2.2.2:
-    resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
+  body-parser@2.3.0:
+    resolution: {integrity: sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==}
     engines: {node: '>=18'}
 
   bytes@3.1.2:
@@ -745,8 +725,8 @@ packages:
   colorette@2.0.20:
     resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
 
-  concurrently@10.0.3:
-    resolution: {integrity: sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==}
+  concurrently@10.0.4:
+    resolution: {integrity: sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==}
     engines: {node: '>=22'}
     hasBin: true
 
@@ -758,6 +738,10 @@ packages:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
 
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
+
   cookie-signature@1.2.2:
     resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
     engines: {node: '>=6.6.0'}
@@ -886,8 +870,8 @@ packages:
   fast-safe-stringify@2.1.1:
     resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
 
-  fast-uri@3.1.2:
-    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
+  fast-uri@3.1.5:
+    resolution: {integrity: sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==}
 
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
@@ -949,8 +933,8 @@ packages:
   help-me@5.0.0:
     resolution: {integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==}
 
-  hono@4.12.27:
-    resolution: {integrity: sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==}
+  hono@4.12.34:
+    resolution: {integrity: sha512-GqXJqY/xJkJmuloTrnV1ZEXG3fqte+VjkUqoRNZXcrUidiUOP4fMSIHHY4tsqZBK++kVyWmt/AAfSUuy57/eSA==}
     engines: {node: '>=16.9.0'}
 
   http-errors@2.0.1:
@@ -964,12 +948,12 @@ packages:
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  ioredis@5.11.1:
-    resolution: {integrity: sha512-ehuGcf94bQXhfagULNXrJdfnWO38v070jxSx/qE87Kjzmu2fU7ro5EFAb+OPituLqgfyuQaym5DlrNydW2sJ9A==}
-    engines: {node: '>=12.22.0'}
+  ioredis@6.0.0:
+    resolution: {integrity: sha512-f+Dtubxfpf6KYFq7WVXJoOLn0bk4TJrMrN9SzeE+jrWrCWj7XX3fA6vkryafhADX+GMymRxgDJDOI33COkJc0w==}
+    engines: {node: '>=20.0.0'}
 
-  ip-address@10.2.0:
-    resolution: {integrity: sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==}
+  ip-address@10.4.0:
+    resolution: {integrity: sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ==}
     engines: {node: '>= 12'}
 
   ipaddr.js@1.9.1:
@@ -989,8 +973,8 @@ packages:
     resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
     engines: {node: '>=10'}
 
-  js-yaml@5.2.0:
-    resolution: {integrity: sha512-YeLUMlvR4Ou1B119LIaM0r65JvbOBooJDc9yEu0dClb/uSC5P4FrLU8OCCz/HXWvtPoIrR0dRzABTjo1sTN9Bw==}
+  js-yaml@5.2.3:
+    resolution: {integrity: sha512-n+mUVyUX5bVv7G/G2zyIHOhdxfuU1dY2NOFzTQUWiMUbFss8b57NFlgCCaggU78wSw5KVS9cllzeLyzyR+n5nw==}
     hasBin: true
 
   json-schema-traverse@1.0.0:
@@ -1002,78 +986,78 @@ packages:
   libphonenumber-js@1.13.7:
     resolution: {integrity: sha512-rvr3HIMdOgzhz1RFGjftji+wjoAFlzhqCNqJOU/MKTZQ8d9NZxAR/tI+0weDicyoucqVR0U1GCniqHJ0f8aM2A==}
 
-  lightningcss-android-arm64@1.32.0:
-    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+  lightningcss-android-arm64@1.33.0:
+    resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [android]
 
-  lightningcss-darwin-arm64@1.32.0:
-    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
+  lightningcss-darwin-arm64@1.33.0:
+    resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.32.0:
-    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
+  lightningcss-darwin-x64@1.33.0:
+    resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-freebsd-x64@1.32.0:
-    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+  lightningcss-freebsd-x64@1.33.0:
+    resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
-    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+  lightningcss-linux-arm-gnueabihf@1.33.0:
+    resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.32.0:
-    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+  lightningcss-linux-arm64-gnu@1.33.0:
+    resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-arm64-musl@1.32.0:
-    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
+  lightningcss-linux-arm64-musl@1.33.0:
+    resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-linux-x64-gnu@1.32.0:
-    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+  lightningcss-linux-x64-gnu@1.33.0:
+    resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-x64-musl@1.32.0:
-    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
+  lightningcss-linux-x64-musl@1.33.0:
+    resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-win32-arm64-msvc@1.32.0:
-    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+  lightningcss-win32-arm64-msvc@1.33.0:
+    resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.32.0:
-    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+  lightningcss-win32-x64-msvc@1.33.0:
+    resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.32.0:
-    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+  lightningcss@1.33.0:
+    resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
     engines: {node: '>= 12.0.0'}
 
   make-error@1.3.6:
@@ -1105,8 +1089,8 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  nanoid@3.3.15:
-    resolution: {integrity: sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==}
+  nanoid@3.3.17:
+    resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -1147,14 +1131,11 @@ packages:
   path-to-regexp@8.4.2:
     resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
 
-  penpot-mcp@file:packages:
-    resolution: {directory: packages, type: directory}
-
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  picomatch@4.0.4:
-    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
     engines: {node: '>=12'}
 
   pino-abstract-transport@3.0.0:
@@ -1180,12 +1161,12 @@ packages:
     resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
     engines: {node: '>=16.20.0'}
 
-  postcss@8.5.16:
-    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
+  postcss@8.5.25:
+    resolution: {integrity: sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==}
     engines: {node: ^10 || ^12 || >=14}
 
-  prettier@3.9.4:
-    resolution: {integrity: sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==}
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -1228,10 +1209,6 @@ packages:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
 
-  redis-parser@3.0.0:
-    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
-    engines: {node: '>=4'}
-
   reflect-metadata@0.2.2:
     resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
 
@@ -1239,8 +1216,8 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
-  rolldown@1.1.3:
-    resolution: {integrity: sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==}
+  rolldown@1.2.2:
+    resolution: {integrity: sha512-opwpo1tQBAcpSUJDt94B7hhLNGOKjCdE//XXjeLrnx9b83bjnw45tXdg1b09yEw/VLFBJGZpwRULMmOZo7ol+A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -1277,9 +1254,14 @@ packages:
   setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
-  sharp@0.35.2:
-    resolution: {integrity: sha512-FVtFjtBCMiJS6yb5CX7Sop45WFMpeGw6oRKuJnXYgf/f1ms/D7LE/ZUSNxnW7rZ/dbslQWYkoqFHGPaDBtaK4w==}
+  sharp@0.35.3:
+    resolution: {integrity: sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==}
     engines: {node: '>=20.9.0'}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
 
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
@@ -1289,8 +1271,8 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shell-quote@1.8.4:
-    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
+  shell-quote@1.9.0:
+    resolution: {integrity: sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==}
     engines: {node: '>= 0.4'}
 
   side-channel-list@1.0.1:
@@ -1379,8 +1361,8 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tsx@4.22.4:
-    resolution: {integrity: sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==}
+  tsx@4.23.5:
+    resolution: {integrity: sha512-rw55FUaqOoI7RvlQwLbhO4nSDApnQ4/CykPuiQ/EPvtrX3WA9Ig55jIt9VvbBJbzJuj12ueRu4PMZ2SxPVbihg==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -1388,6 +1370,10 @@ packages:
     resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==}
     engines: {node: '>= 0.6'}
 
+  type-is@2.1.0:
+    resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==}
+    engines: {node: '>= 18'}
+
   typescript@6.0.3:
     resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
     engines: {node: '>=14.17'}
@@ -1417,13 +1403,13 @@ packages:
     peerDependencies:
       vite: '>=5.4.0'
 
-  vite@8.1.1:
-    resolution: {integrity: sha512-X/05/cT+VITy2AeDc1der6smvGWWREtL4hPbPTaVbjSBuuWkmNOjR6HP3NzqcQA2nF6VHGUPaFRJyft/2AE9Kg==}
+  vite@8.2.0:
+    resolution: {integrity: sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.3.0
+      '@vitejs/devtools': ^0.4.0
       esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -1484,6 +1470,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -1514,18 +1512,7 @@ snapshots:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  '@emnapi/core@1.11.1':
-    dependencies:
-      '@emnapi/wasi-threads': 1.2.2
-      tslib: 2.8.1
-    optional: true
-
-  '@emnapi/runtime@1.11.1':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
-  '@emnapi/wasi-threads@1.2.2':
+  '@emnapi/runtime@1.11.3':
     dependencies:
       tslib: 2.8.1
     optional: true
@@ -1610,117 +1597,117 @@ snapshots:
   '@esbuild/win32-x64@0.28.1':
     optional: true
 
-  '@hono/node-server@1.19.14(hono@4.12.27)':
+  '@hono/node-server@2.0.12(hono@4.12.34)':
     dependencies:
-      hono: 4.12.27
+      hono: 4.12.34
 
   '@img/colour@1.1.0': {}
 
-  '@img/sharp-darwin-arm64@0.35.2':
+  '@img/sharp-darwin-arm64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.3.1
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
     optional: true
 
-  '@img/sharp-darwin-x64@0.35.2':
+  '@img/sharp-darwin-x64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.3.1
+      '@img/sharp-libvips-darwin-x64': 1.3.2
     optional: true
 
-  '@img/sharp-freebsd-wasm32@0.35.2':
+  '@img/sharp-freebsd-wasm32@0.35.3':
     dependencies:
-      '@img/sharp-wasm32': 0.35.2
+      '@img/sharp-wasm32': 0.35.3
     optional: true
 
-  '@img/sharp-libvips-darwin-arm64@1.3.1':
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-darwin-x64@1.3.1':
+  '@img/sharp-libvips-darwin-x64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-arm64@1.3.1':
+  '@img/sharp-libvips-linux-arm64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-arm@1.3.1':
+  '@img/sharp-libvips-linux-arm@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-ppc64@1.3.1':
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-riscv64@1.3.1':
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-s390x@1.3.1':
+  '@img/sharp-libvips-linux-s390x@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linux-x64@1.3.1':
+  '@img/sharp-libvips-linux-x64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
     optional: true
 
-  '@img/sharp-linux-arm64@0.35.2':
+  '@img/sharp-linux-arm64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.3.1
+      '@img/sharp-libvips-linux-arm64': 1.3.2
     optional: true
 
-  '@img/sharp-linux-arm@0.35.2':
+  '@img/sharp-linux-arm@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.3.1
+      '@img/sharp-libvips-linux-arm': 1.3.2
     optional: true
 
-  '@img/sharp-linux-ppc64@0.35.2':
+  '@img/sharp-linux-ppc64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-ppc64': 1.3.1
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
     optional: true
 
-  '@img/sharp-linux-riscv64@0.35.2':
+  '@img/sharp-linux-riscv64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-riscv64': 1.3.1
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
     optional: true
 
-  '@img/sharp-linux-s390x@0.35.2':
+  '@img/sharp-linux-s390x@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.3.1
+      '@img/sharp-libvips-linux-s390x': 1.3.2
     optional: true
 
-  '@img/sharp-linux-x64@0.35.2':
+  '@img/sharp-linux-x64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.3.1
+      '@img/sharp-libvips-linux-x64': 1.3.2
     optional: true
 
-  '@img/sharp-linuxmusl-arm64@0.35.2':
+  '@img/sharp-linuxmusl-arm64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
     optional: true
 
-  '@img/sharp-linuxmusl-x64@0.35.2':
+  '@img/sharp-linuxmusl-x64@0.35.3':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
     optional: true
 
-  '@img/sharp-wasm32@0.35.2':
+  '@img/sharp-wasm32@0.35.3':
     dependencies:
-      '@emnapi/runtime': 1.11.1
+      '@emnapi/runtime': 1.11.3
     optional: true
 
-  '@img/sharp-webcontainers-wasm32@0.35.2':
+  '@img/sharp-webcontainers-wasm32@0.35.3':
     dependencies:
-      '@img/sharp-wasm32': 0.35.2
+      '@img/sharp-wasm32': 0.35.3
     optional: true
 
-  '@img/sharp-win32-arm64@0.35.2':
+  '@img/sharp-win32-arm64@0.35.3':
     optional: true
 
-  '@img/sharp-win32-ia32@0.35.2':
+  '@img/sharp-win32-ia32@0.35.3':
     optional: true
 
-  '@img/sharp-win32-x64@0.35.2':
+  '@img/sharp-win32-x64@0.35.3':
     optional: true
 
-  '@ioredis/commands@1.10.0': {}
+  '@ioredis/commands@2.0.0': {}
 
   '@jridgewell/resolve-uri@3.1.2': {}
 
@@ -1731,9 +1718,9 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@modelcontextprotocol/sdk@1.29.0(zod@4.4.3)':
+  '@modelcontextprotocol/sdk@1.29.0(supports-color@10.2.2)(zod@4.4.3)':
     dependencies:
-      '@hono/node-server': 1.19.14(hono@4.12.27)
+      '@hono/node-server': 2.0.12(hono@4.12.34)
       ajv: 8.20.0
       ajv-formats: 3.0.1(ajv@8.20.0)
       content-type: 1.0.5
@@ -1741,9 +1728,9 @@ snapshots:
       cross-spawn: 7.0.6
       eventsource: 3.0.7
       eventsource-parser: 3.1.0
-      express: 5.2.1
-      express-rate-limit: 8.5.2(express@5.2.1)
-      hono: 4.12.27
+      express: 5.2.1(supports-color@10.2.2)
+      express-rate-limit: 8.5.2(express@5.2.1(supports-color@10.2.2))
+      hono: 4.12.34
       jose: 6.2.3
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.1
@@ -1753,68 +1740,54 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
-    dependencies:
-      '@emnapi/core': 1.11.1
-      '@emnapi/runtime': 1.11.1
-      '@tybys/wasm-util': 0.10.3
-    optional: true
+  '@oxc-project/types@0.142.0': {}
 
-  '@oxc-project/types@0.137.0': {}
+  '@penpot/plugin-styles@1.5.0': {}
 
-  '@penpot/plugin-styles@1.4.2': {}
-
-  '@penpot/plugin-types@1.4.2': {}
+  '@penpot/plugin-types@1.5.0': {}
 
   '@pinojs/redact@0.4.0': {}
 
-  '@rolldown/binding-android-arm64@1.1.3':
+  '@rolldown/binding-android-arm64@1.2.2':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
+  '@rolldown/binding-darwin-arm64@1.2.2':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.1.3':
+  '@rolldown/binding-darwin-x64@1.2.2':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
+  '@rolldown/binding-freebsd-x64@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
+  '@rolldown/binding-linux-arm64-gnu@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
+  '@rolldown/binding-linux-arm64-musl@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
+  '@rolldown/binding-linux-ppc64-gnu@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
+  '@rolldown/binding-linux-s390x-gnu@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
+  '@rolldown/binding-linux-x64-gnu@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
+  '@rolldown/binding-linux-x64-musl@1.2.2':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
+  '@rolldown/binding-openharmony-arm64@1.2.2':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
-    dependencies:
-      '@emnapi/core': 1.11.1
-      '@emnapi/runtime': 1.11.1
-      '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
+  '@rolldown/binding-win32-arm64-msvc@1.2.2':
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
-    optional: true
-
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
+  '@rolldown/binding-win32-x64-msvc@1.2.2':
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
@@ -1831,23 +1804,18 @@ snapshots:
 
   '@tsconfig/node16@1.0.4': {}
 
-  '@tybys/wasm-util@0.10.3':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
   '@types/body-parser@1.19.6':
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@types/express-serve-static-core@5.1.1':
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       '@types/qs': 6.15.1
       '@types/range-parser': 1.2.7
       '@types/send': 1.2.1
@@ -1862,7 +1830,7 @@ snapshots:
 
   '@types/js-yaml@4.0.9': {}
 
-  '@types/node@26.0.1':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
@@ -1872,18 +1840,18 @@ snapshots:
 
   '@types/send@1.2.1':
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@types/serve-static@2.2.0':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@types/validator@13.15.10': {}
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   accepts@2.0.0:
     dependencies:
@@ -1903,7 +1871,7 @@ snapshots:
   ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.2
+      fast-uri: 3.1.5
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -1919,17 +1887,17 @@ snapshots:
 
   bencode@2.0.3: {}
 
-  body-parser@2.2.2:
+  body-parser@2.3.0(supports-color@10.2.2):
     dependencies:
       bytes: 3.1.2
-      content-type: 1.0.5
-      debug: 4.4.3
+      content-type: 2.0.0
+      debug: 4.4.3(supports-color@10.2.2)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
       qs: 6.15.3
       raw-body: 3.0.2
-      type-is: 2.0.1
+      type-is: 2.1.0
     transitivePeerDependencies:
       - supports-color
 
@@ -1965,11 +1933,11 @@ snapshots:
 
   colorette@2.0.20: {}
 
-  concurrently@10.0.3:
+  concurrently@10.0.4:
     dependencies:
       chalk: 5.6.2
       rxjs: 7.8.2
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       supports-color: 10.2.2
       tree-kill: 1.2.2
       yargs: 18.0.0
@@ -1978,6 +1946,8 @@ snapshots:
 
   content-type@1.0.5: {}
 
+  content-type@2.0.0: {}
+
   cookie-signature@1.2.2: {}
 
   cookie@0.7.2: {}
@@ -2002,9 +1972,11 @@ snapshots:
 
   dateformat@4.6.3: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@10.2.2):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 10.2.2
 
   denque@2.1.0: {}
 
@@ -2081,25 +2053,25 @@ snapshots:
     dependencies:
       eventsource-parser: 3.1.0
 
-  express-rate-limit@8.5.2(express@5.2.1):
+  express-rate-limit@8.5.2(express@5.2.1(supports-color@10.2.2)):
     dependencies:
-      express: 5.2.1
-      ip-address: 10.2.0
+      express: 5.2.1(supports-color@10.2.2)
+      ip-address: 10.4.0
 
-  express@5.2.1:
+  express@5.2.1(supports-color@10.2.2):
     dependencies:
       accepts: 2.0.0
-      body-parser: 2.2.2
+      body-parser: 2.3.0(supports-color@10.2.2)
       content-disposition: 1.0.1
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 2.1.1
+      finalhandler: 2.1.1(supports-color@10.2.2)
       fresh: 2.0.0
       http-errors: 2.0.1
       merge-descriptors: 2.0.0
@@ -2110,9 +2082,9 @@ snapshots:
       proxy-addr: 2.0.7
       qs: 6.15.3
       range-parser: 1.2.1
-      router: 2.2.0
-      send: 1.2.1
-      serve-static: 2.2.1
+      router: 2.2.0(supports-color@10.2.2)
+      send: 1.2.1(supports-color@10.2.2)
+      serve-static: 2.2.1(supports-color@10.2.2)
       statuses: 2.0.2
       type-is: 2.0.1
       vary: 1.1.2
@@ -2125,15 +2097,15 @@ snapshots:
 
   fast-safe-stringify@2.1.1: {}
 
-  fast-uri@3.1.2: {}
+  fast-uri@3.1.5: {}
 
-  fdir@6.5.0(picomatch@4.0.4):
+  fdir@6.5.0(picomatch@4.0.5):
     optionalDependencies:
-      picomatch: 4.0.4
+      picomatch: 4.0.5
 
-  finalhandler@2.1.1:
+  finalhandler@2.1.1(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -2183,7 +2155,7 @@ snapshots:
 
   help-me@5.0.0: {}
 
-  hono@4.12.27: {}
+  hono@4.12.34: {}
 
   http-errors@2.0.1:
     dependencies:
@@ -2199,19 +2171,18 @@ snapshots:
 
   inherits@2.0.4: {}
 
-  ioredis@5.11.1:
+  ioredis@6.0.0(supports-color@10.2.2):
     dependencies:
-      '@ioredis/commands': 1.10.0
+      '@ioredis/commands': 2.0.0
       cluster-key-slot: 1.1.1
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       denque: 2.1.0
       redis-errors: 1.2.0
-      redis-parser: 3.0.0
       standard-as-callback: 2.1.0
     transitivePeerDependencies:
       - supports-color
 
-  ip-address@10.2.0: {}
+  ip-address@10.4.0: {}
 
   ipaddr.js@1.9.1: {}
 
@@ -2223,7 +2194,7 @@ snapshots:
 
   joycon@3.1.1: {}
 
-  js-yaml@5.2.0:
+  js-yaml@5.2.3:
     dependencies:
       argparse: 2.0.1
 
@@ -2233,54 +2204,54 @@ snapshots:
 
   libphonenumber-js@1.13.7: {}
 
-  lightningcss-android-arm64@1.32.0:
+  lightningcss-android-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-arm64@1.32.0:
+  lightningcss-darwin-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-x64@1.32.0:
+  lightningcss-darwin-x64@1.33.0:
     optional: true
 
-  lightningcss-freebsd-x64@1.32.0:
+  lightningcss-freebsd-x64@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
+  lightningcss-linux-arm-gnueabihf@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.32.0:
+  lightningcss-linux-arm64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.32.0:
+  lightningcss-linux-arm64-musl@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-gnu@1.32.0:
+  lightningcss-linux-x64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-musl@1.32.0:
+  lightningcss-linux-x64-musl@1.33.0:
     optional: true
 
-  lightningcss-win32-arm64-msvc@1.32.0:
+  lightningcss-win32-arm64-msvc@1.33.0:
     optional: true
 
-  lightningcss-win32-x64-msvc@1.32.0:
+  lightningcss-win32-x64-msvc@1.33.0:
     optional: true
 
-  lightningcss@1.32.0:
+  lightningcss@1.33.0:
     dependencies:
       detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-android-arm64: 1.32.0
-      lightningcss-darwin-arm64: 1.32.0
-      lightningcss-darwin-x64: 1.32.0
-      lightningcss-freebsd-x64: 1.32.0
-      lightningcss-linux-arm-gnueabihf: 1.32.0
-      lightningcss-linux-arm64-gnu: 1.32.0
-      lightningcss-linux-arm64-musl: 1.32.0
-      lightningcss-linux-x64-gnu: 1.32.0
-      lightningcss-linux-x64-musl: 1.32.0
-      lightningcss-win32-arm64-msvc: 1.32.0
-      lightningcss-win32-x64-msvc: 1.32.0
+      lightningcss-android-arm64: 1.33.0
+      lightningcss-darwin-arm64: 1.33.0
+      lightningcss-darwin-x64: 1.33.0
+      lightningcss-freebsd-x64: 1.33.0
+      lightningcss-linux-arm-gnueabihf: 1.33.0
+      lightningcss-linux-arm64-gnu: 1.33.0
+      lightningcss-linux-arm64-musl: 1.33.0
+      lightningcss-linux-x64-gnu: 1.33.0
+      lightningcss-linux-x64-musl: 1.33.0
+      lightningcss-win32-arm64-msvc: 1.33.0
+      lightningcss-win32-x64-msvc: 1.33.0
 
   make-error@1.3.6: {}
 
@@ -2300,7 +2271,7 @@ snapshots:
 
   ms@2.1.3: {}
 
-  nanoid@3.3.15: {}
+  nanoid@3.3.17: {}
 
   negotiator@1.0.0: {}
 
@@ -2329,11 +2300,9 @@ snapshots:
 
   path-to-regexp@8.4.2: {}
 
-  penpot-mcp@file:packages: {}
-
   picocolors@1.1.1: {}
 
-  picomatch@4.0.4: {}
+  picomatch@4.0.5: {}
 
   pino-abstract-transport@3.0.0:
     dependencies:
@@ -2378,13 +2347,13 @@ snapshots:
 
   pkce-challenge@5.0.1: {}
 
-  postcss@8.5.16:
+  postcss@8.5.25:
     dependencies:
-      nanoid: 3.3.15
+      nanoid: 3.3.17
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  prettier@3.9.4: {}
+  prettier@3.9.6: {}
 
   process-warning@5.0.0: {}
 
@@ -2425,38 +2394,33 @@ snapshots:
 
   redis-errors@1.2.0: {}
 
-  redis-parser@3.0.0:
-    dependencies:
-      redis-errors: 1.2.0
-
   reflect-metadata@0.2.2: {}
 
   require-from-string@2.0.2: {}
 
-  rolldown@1.1.3:
+  rolldown@1.2.2:
     dependencies:
-      '@oxc-project/types': 0.137.0
+      '@oxc-project/types': 0.142.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.1.3
-      '@rolldown/binding-darwin-arm64': 1.1.3
-      '@rolldown/binding-darwin-x64': 1.1.3
-      '@rolldown/binding-freebsd-x64': 1.1.3
-      '@rolldown/binding-linux-arm-gnueabihf': 1.1.3
-      '@rolldown/binding-linux-arm64-gnu': 1.1.3
-      '@rolldown/binding-linux-arm64-musl': 1.1.3
-      '@rolldown/binding-linux-ppc64-gnu': 1.1.3
-      '@rolldown/binding-linux-s390x-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-musl': 1.1.3
-      '@rolldown/binding-openharmony-arm64': 1.1.3
-      '@rolldown/binding-wasm32-wasi': 1.1.3
-      '@rolldown/binding-win32-arm64-msvc': 1.1.3
-      '@rolldown/binding-win32-x64-msvc': 1.1.3
+      '@rolldown/binding-android-arm64': 1.2.2
+      '@rolldown/binding-darwin-arm64': 1.2.2
+      '@rolldown/binding-darwin-x64': 1.2.2
+      '@rolldown/binding-freebsd-x64': 1.2.2
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.2
+      '@rolldown/binding-linux-arm64-gnu': 1.2.2
+      '@rolldown/binding-linux-arm64-musl': 1.2.2
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.2
+      '@rolldown/binding-linux-s390x-gnu': 1.2.2
+      '@rolldown/binding-linux-x64-gnu': 1.2.2
+      '@rolldown/binding-linux-x64-musl': 1.2.2
+      '@rolldown/binding-openharmony-arm64': 1.2.2
+      '@rolldown/binding-win32-arm64-msvc': 1.2.2
+      '@rolldown/binding-win32-x64-msvc': 1.2.2
 
-  router@2.2.0:
+  router@2.2.0(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -2476,9 +2440,9 @@ snapshots:
 
   semver@7.8.5: {}
 
-  send@1.2.1:
+  send@1.2.1(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -2492,48 +2456,49 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@2.2.1:
+  serve-static@2.2.1(supports-color@10.2.2):
     dependencies:
       encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 1.2.1
+      send: 1.2.1(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
   setprototypeof@1.2.0: {}
 
-  sharp@0.35.2:
+  sharp@0.35.3(@types/node@26.1.2):
     dependencies:
       '@img/colour': 1.1.0
       detect-libc: 2.1.2
       semver: 7.8.5
     optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.35.2
-      '@img/sharp-darwin-x64': 0.35.2
-      '@img/sharp-freebsd-wasm32': 0.35.2
-      '@img/sharp-libvips-darwin-arm64': 1.3.1
-      '@img/sharp-libvips-darwin-x64': 1.3.1
-      '@img/sharp-libvips-linux-arm': 1.3.1
-      '@img/sharp-libvips-linux-arm64': 1.3.1
-      '@img/sharp-libvips-linux-ppc64': 1.3.1
-      '@img/sharp-libvips-linux-riscv64': 1.3.1
-      '@img/sharp-libvips-linux-s390x': 1.3.1
-      '@img/sharp-libvips-linux-x64': 1.3.1
-      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
-      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
-      '@img/sharp-linux-arm': 0.35.2
-      '@img/sharp-linux-arm64': 0.35.2
-      '@img/sharp-linux-ppc64': 0.35.2
-      '@img/sharp-linux-riscv64': 0.35.2
-      '@img/sharp-linux-s390x': 0.35.2
-      '@img/sharp-linux-x64': 0.35.2
-      '@img/sharp-linuxmusl-arm64': 0.35.2
-      '@img/sharp-linuxmusl-x64': 0.35.2
-      '@img/sharp-webcontainers-wasm32': 0.35.2
-      '@img/sharp-win32-arm64': 0.35.2
-      '@img/sharp-win32-ia32': 0.35.2
-      '@img/sharp-win32-x64': 0.35.2
+      '@img/sharp-darwin-arm64': 0.35.3
+      '@img/sharp-darwin-x64': 0.35.3
+      '@img/sharp-freebsd-wasm32': 0.35.3
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
+      '@img/sharp-libvips-darwin-x64': 1.3.2
+      '@img/sharp-libvips-linux-arm': 1.3.2
+      '@img/sharp-libvips-linux-arm64': 1.3.2
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
+      '@img/sharp-libvips-linux-s390x': 1.3.2
+      '@img/sharp-libvips-linux-x64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
+      '@img/sharp-linux-arm': 0.35.3
+      '@img/sharp-linux-arm64': 0.35.3
+      '@img/sharp-linux-ppc64': 0.35.3
+      '@img/sharp-linux-riscv64': 0.35.3
+      '@img/sharp-linux-s390x': 0.35.3
+      '@img/sharp-linux-x64': 0.35.3
+      '@img/sharp-linuxmusl-arm64': 0.35.3
+      '@img/sharp-linuxmusl-x64': 0.35.3
+      '@img/sharp-webcontainers-wasm32': 0.35.3
+      '@img/sharp-win32-arm64': 0.35.3
+      '@img/sharp-win32-ia32': 0.35.3
+      '@img/sharp-win32-x64': 0.35.3
+      '@types/node': 26.1.2
 
   shebang-command@2.0.0:
     dependencies:
@@ -2541,7 +2506,7 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shell-quote@1.8.4: {}
+  shell-quote@1.9.0: {}
 
   side-channel-list@1.0.1:
     dependencies:
@@ -2607,21 +2572,21 @@ snapshots:
 
   tinyglobby@0.2.17:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
 
   toidentifier@1.0.1: {}
 
   tree-kill@1.2.2: {}
 
-  ts-node@10.9.2(@types/node@26.0.1)(typescript@6.0.3):
+  ts-node@10.9.2(@types/node@26.1.2)(typescript@6.0.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.12
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       acorn: 8.15.0
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -2634,7 +2599,7 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  tsx@4.22.4:
+  tsx@4.23.5:
     dependencies:
       esbuild: 0.28.1
     optionalDependencies:
@@ -2646,6 +2611,12 @@ snapshots:
       media-typer: 1.1.0
       mime-types: 3.0.2
 
+  type-is@2.1.0:
+    dependencies:
+      content-type: 2.0.0
+      media-typer: 1.1.0
+      mime-types: 3.0.2
+
   typescript@6.0.3: {}
 
   undici-types@8.3.0: {}
@@ -2658,31 +2629,31 @@ snapshots:
 
   vary@1.1.2: {}
 
-  vite-live-preview@0.4.0(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(tsx@4.22.4)):
+  vite-live-preview@0.4.0(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(tsx@4.23.5)):
     dependencies:
       '@seahax/deep-copy': 0.1.0
       '@seahax/semaphore': 0.5.1
       '@types/ws': 8.18.1
       escape-goat: 4.0.0
       strip-ansi: 7.2.0
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(tsx@4.22.4)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(tsx@4.23.5)
       ws: 8.21.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(tsx@4.22.4):
+  vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(tsx@4.23.5):
     dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.16
-      rolldown: 1.1.3
+      lightningcss: 1.33.0
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.2.2
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       esbuild: 0.28.1
       fsevents: 2.3.3
-      tsx: 4.22.4
+      tsx: 4.23.5
 
   which@2.0.2:
     dependencies:
@@ -2698,6 +2669,8 @@ snapshots:
 
   ws@8.21.0: {}
 
+  ws@8.21.1: {}
+
   y18n@5.0.8: {}
 
   yargs-parser@22.0.0: {}
diff --git a/mcp/pnpm-workspace.yaml b/mcp/pnpm-workspace.yaml
index 14eaeefa61..2425fd761c 100644
--- a/mcp/pnpm-workspace.yaml
+++ b/mcp/pnpm-workspace.yaml
@@ -12,8 +12,16 @@ linkWorkspacePackages: true
 minimumReleaseAgeExclude:
   - qs@6.14.2 || 6.15.2
   - path-to-regexp@8.4.0
+  - body-parser@2.3.0
+  - '@hono/node-server@2.0.5'
+  - fast-uri@3.1.3 || 3.1.4 || 3.1.5
+  - ip-address@10.2.1 || 10.2.2 || 10.3.1
+  - hono@4.12.34
 
 packages:
   - "./packages/common"
   - "./packages/server"
   - "./packages/plugin"
+
+overrides:
+  '@hono/node-server@<2.0.5': ^2.0.5
diff --git a/media-processor/.prettierignore b/media-processor/.prettierignore
new file mode 100644
index 0000000000..2d0c064480
--- /dev/null
+++ b/media-processor/.prettierignore
@@ -0,0 +1,3 @@
+dist/
+node_modules/
+coverage/
diff --git a/media-processor/.prettierrc b/media-processor/.prettierrc
new file mode 100644
index 0000000000..5ebd5018e8
--- /dev/null
+++ b/media-processor/.prettierrc
@@ -0,0 +1,9 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "printWidth": 120,
+  "endOfLine": "lf"
+}
diff --git a/media-processor/esbuild.config.mjs b/media-processor/esbuild.config.mjs
new file mode 100644
index 0000000000..698edc38d4
--- /dev/null
+++ b/media-processor/esbuild.config.mjs
@@ -0,0 +1,17 @@
+import { build } from "esbuild";
+
+await build({
+  entryPoints: ["src/index.ts"],
+  bundle: true,
+  platform: "node",
+  target: "node24",
+  format: "esm",
+  outfile: "dist/index.js",
+  external: ["sharp", "pino", "pino-pretty", "pino-loki"],
+  banner: {
+    js: `
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+`,
+  },
+});
diff --git a/media-processor/package.json b/media-processor/package.json
new file mode 100644
index 0000000000..7c08c70c0f
--- /dev/null
+++ b/media-processor/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "media-processor",
+  "version": "1.0.0",
+  "description": "Stateless HTTP service for Penpot image and font processing",
+  "type": "module",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "node esbuild.config.mjs",
+    "start": "node dist/index.js",
+    "start:dev": "tsx --env-file=../backend/scripts/_env src/index.ts",
+    "types:check": "tsc --noEmit",
+    "test": "vitest run",
+    "fmt": "prettier --write src/ test/",
+    "fmt:check": "prettier --check src/ test/",
+    "clean": "rm -rf dist/"
+  },
+  "packageManager": "pnpm@11.18.0+sha512.33d83c77da82f49fba836925c6f1b841181ec3132b670639bd012f7075f5c7cf634c5f870147c19aae7478fac01df09d8892e880454896edd23ee9b33757563c",
+  "dependencies": {
+    "express": "^5.2.1",
+    "multer": "^2.2.0",
+    "p-queue": "^9.3.3",
+    "pino": "^10.3.1",
+    "pino-loki": "^3.0.0",
+    "pino-pretty": "^13.1.3",
+    "sharp": "^0.35.3",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@types/express": "^5.0.6",
+    "@types/multer": "^2.0.0",
+    "@types/node": "^26.1.2",
+    "@types/supertest": "^7.2.1",
+    "esbuild": "^0.28.1",
+    "prettier": "^3.6.2",
+    "supertest": "^7.2.2",
+    "tsx": "^4.22.4",
+    "typescript": "^7.0.2",
+    "vitest": "^4.1.10"
+  }
+}
diff --git a/media-processor/pnpm-lock.yaml b/media-processor/pnpm-lock.yaml
new file mode 100644
index 0000000000..be8c8eec4e
--- /dev/null
+++ b/media-processor/pnpm-lock.yaml
@@ -0,0 +1,2649 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      express:
+        specifier: ^5.2.1
+        version: 5.2.1
+      multer:
+        specifier: ^2.2.0
+        version: 2.2.0
+      p-queue:
+        specifier: ^9.3.3
+        version: 9.3.3
+      pino:
+        specifier: ^10.3.1
+        version: 10.3.1
+      pino-loki:
+        specifier: ^3.0.0
+        version: 3.0.0
+      pino-pretty:
+        specifier: ^13.1.3
+        version: 13.1.3
+      sharp:
+        specifier: ^0.35.3
+        version: 0.35.3(@types/node@26.1.2)
+      zod:
+        specifier: ^4.4.3
+        version: 4.4.3
+    devDependencies:
+      '@types/express':
+        specifier: ^5.0.6
+        version: 5.0.6
+      '@types/multer':
+        specifier: ^2.0.0
+        version: 2.2.0
+      '@types/node':
+        specifier: ^26.1.2
+        version: 26.1.2
+      '@types/supertest':
+        specifier: ^7.2.1
+        version: 7.2.1
+      esbuild:
+        specifier: ^0.28.1
+        version: 0.28.1
+      prettier:
+        specifier: ^3.6.2
+        version: 3.9.6
+      supertest:
+        specifier: ^7.2.2
+        version: 7.2.2
+      tsx:
+        specifier: ^4.22.4
+        version: 4.23.1
+      typescript:
+        specifier: ^7.0.2
+        version: 7.0.2
+      vitest:
+        specifier: ^4.1.10
+        version: 4.1.10(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(tsx@4.23.1))
+
+packages:
+
+  '@emnapi/runtime@1.11.2':
+    resolution: {integrity: sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==}
+
+  '@esbuild/aix-ppc64@0.28.1':
+    resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.28.1':
+    resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.28.1':
+    resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.28.1':
+    resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.28.1':
+    resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.28.1':
+    resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.28.1':
+    resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.28.1':
+    resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.28.1':
+    resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.28.1':
+    resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.28.1':
+    resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.28.1':
+    resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.28.1':
+    resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.28.1':
+    resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.28.1':
+    resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.28.1':
+    resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.28.1':
+    resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.28.1':
+    resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.28.1':
+    resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.28.1':
+    resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@esbuild/sunos-x64@0.28.1':
+    resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.28.1':
+    resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.28.1':
+    resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.28.1':
+    resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@img/colour@1.1.0':
+    resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+    engines: {node: '>=18'}
+
+  '@img/sharp-darwin-arm64@0.35.3':
+    resolution: {integrity: sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.35.3':
+    resolution: {integrity: sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-freebsd-wasm32@0.35.3':
+    resolution: {integrity: sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==}
+    engines: {node: '>=20.9.0'}
+    os: [freebsd]
+
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
+    resolution: {integrity: sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.3.2':
+    resolution: {integrity: sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.3.2':
+    resolution: {integrity: sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-arm@1.3.2':
+    resolution: {integrity: sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
+    resolution: {integrity: sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
+    resolution: {integrity: sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-s390x@1.3.2':
+    resolution: {integrity: sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-x64@1.3.2':
+    resolution: {integrity: sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
+    resolution: {integrity: sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
+    resolution: {integrity: sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linux-arm64@0.35.3':
+    resolution: {integrity: sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-arm@0.35.3':
+    resolution: {integrity: sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-ppc64@0.35.3':
+    resolution: {integrity: sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-riscv64@0.35.3':
+    resolution: {integrity: sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-s390x@0.35.3':
+    resolution: {integrity: sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==}
+    engines: {node: '>=20.9.0'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-x64@0.35.3':
+    resolution: {integrity: sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linuxmusl-arm64@0.35.3':
+    resolution: {integrity: sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linuxmusl-x64@0.35.3':
+    resolution: {integrity: sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-wasm32@0.35.3':
+    resolution: {integrity: sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==}
+    engines: {node: '>=20.9.0'}
+
+  '@img/sharp-webcontainers-wasm32@0.35.3':
+    resolution: {integrity: sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==}
+    engines: {node: '>=20.9.0'}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-arm64@0.35.3':
+    resolution: {integrity: sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.35.3':
+    resolution: {integrity: sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==}
+    engines: {node: ^20.9.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.35.3':
+    resolution: {integrity: sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@noble/hashes@1.8.0':
+    resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@paralleldrive/cuid2@2.3.1':
+    resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==}
+
+  '@pinojs/redact@0.4.0':
+    resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
+
+  '@rollup/rollup-android-arm-eabi@4.62.2':
+    resolution: {integrity: sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.62.2':
+    resolution: {integrity: sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.62.2':
+    resolution: {integrity: sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.62.2':
+    resolution: {integrity: sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.62.2':
+    resolution: {integrity: sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.62.2':
+    resolution: {integrity: sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.62.2':
+    resolution: {integrity: sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.62.2':
+    resolution: {integrity: sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-arm64-gnu@4.62.2':
+    resolution: {integrity: sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm64-musl@4.62.2':
+    resolution: {integrity: sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-loong64-gnu@4.62.2':
+    resolution: {integrity: sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-loong64-musl@4.62.2':
+    resolution: {integrity: sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-ppc64-gnu@4.62.2':
+    resolution: {integrity: sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-ppc64-musl@4.62.2':
+    resolution: {integrity: sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.62.2':
+    resolution: {integrity: sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-riscv64-musl@4.62.2':
+    resolution: {integrity: sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-s390x-gnu@4.62.2':
+    resolution: {integrity: sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-gnu@4.62.2':
+    resolution: {integrity: sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-musl@4.62.2':
+    resolution: {integrity: sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-openbsd-x64@4.62.2':
+    resolution: {integrity: sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@rollup/rollup-openharmony-arm64@4.62.2':
+    resolution: {integrity: sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rollup/rollup-win32-arm64-msvc@4.62.2':
+    resolution: {integrity: sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.62.2':
+    resolution: {integrity: sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-gnu@4.62.2':
+    resolution: {integrity: sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.62.2':
+    resolution: {integrity: sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==}
+    cpu: [x64]
+    os: [win32]
+
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
+  '@types/body-parser@1.19.6':
+    resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
+
+  '@types/chai@5.2.3':
+    resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
+
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
+  '@types/cookiejar@2.1.5':
+    resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
+
+  '@types/deep-eql@4.0.2':
+    resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
+
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+
+  '@types/express-serve-static-core@5.1.2':
+    resolution: {integrity: sha512-d3KvEXBSo/lOAMc2u6fkyDHBvetBHeqD7wm/AcXfLpSOQwlmG9D/aQ0SFswVjv05p7ullQS7Mjohj6/VdbZuTg==}
+
+  '@types/express@5.0.6':
+    resolution: {integrity: sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==}
+
+  '@types/http-errors@2.0.5':
+    resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==}
+
+  '@types/methods@1.1.4':
+    resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
+
+  '@types/multer@2.2.0':
+    resolution: {integrity: sha512-3U1troeqGV8Ntp7Q3klwf4zr23VEoqYVocYXaswm9+8z3O9UHDYAqLxjJ/h550iRADTjKdOdhhasXw6gD6kYtg==}
+
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
+
+  '@types/qs@6.15.1':
+    resolution: {integrity: sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==}
+
+  '@types/range-parser@1.2.7':
+    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
+
+  '@types/send@1.2.1':
+    resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
+
+  '@types/serve-static@2.2.0':
+    resolution: {integrity: sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==}
+
+  '@types/superagent@8.1.11':
+    resolution: {integrity: sha512-KA7srSW/HENDtOw9DOqaFLgWuMqN9WgjEw62lh9dpvRaZDkhdOkazASd7X7i2eMUYLHa1U37ZttnePsH5zTDHw==}
+
+  '@types/supertest@7.2.1':
+    resolution: {integrity: sha512-4CbBvoYVLHL7+yhbYrZET0vsvuyXTC05aRe7dNQkwMzm56auceoy6Yu3K50uZmwfHna1os3CMSgM/3QVkUtPTw==}
+
+  '@typescript/typescript-aix-ppc64@7.0.2':
+    resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@typescript/typescript-darwin-arm64@7.0.2':
+    resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@typescript/typescript-darwin-x64@7.0.2':
+    resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@typescript/typescript-freebsd-arm64@7.0.2':
+    resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@typescript/typescript-freebsd-x64@7.0.2':
+    resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@typescript/typescript-linux-arm64@7.0.2':
+    resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@typescript/typescript-linux-arm@7.0.2':
+    resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@typescript/typescript-linux-loong64@7.0.2':
+    resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@typescript/typescript-linux-mips64el@7.0.2':
+    resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@typescript/typescript-linux-ppc64@7.0.2':
+    resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@typescript/typescript-linux-riscv64@7.0.2':
+    resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@typescript/typescript-linux-s390x@7.0.2':
+    resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==}
+    engines: {node: '>=16.20.0'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@typescript/typescript-linux-x64@7.0.2':
+    resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@typescript/typescript-netbsd-arm64@7.0.2':
+    resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@typescript/typescript-netbsd-x64@7.0.2':
+    resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@typescript/typescript-openbsd-arm64@7.0.2':
+    resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@typescript/typescript-openbsd-x64@7.0.2':
+    resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@typescript/typescript-sunos-x64@7.0.2':
+    resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@typescript/typescript-win32-arm64@7.0.2':
+    resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@typescript/typescript-win32-x64@7.0.2':
+    resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@vitest/expect@4.1.10':
+    resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==}
+
+  '@vitest/mocker@4.1.10':
+    resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
+  '@vitest/pretty-format@4.1.10':
+    resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==}
+
+  '@vitest/runner@4.1.10':
+    resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==}
+
+  '@vitest/snapshot@4.1.10':
+    resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==}
+
+  '@vitest/spy@4.1.10':
+    resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==}
+
+  '@vitest/utils@4.1.10':
+    resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==}
+
+  accepts@2.0.0:
+    resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
+    engines: {node: '>= 0.6'}
+
+  append-field@1.0.0:
+    resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  assertion-error@2.0.1:
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  atomic-sleep@1.0.0:
+    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
+    engines: {node: '>=8.0.0'}
+
+  body-parser@2.3.0:
+    resolution: {integrity: sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==}
+    engines: {node: '>=18'}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  busboy@1.6.0:
+    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
+    engines: {node: '>=10.16.0'}
+
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
+    engines: {node: '>=18'}
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
+
+  concat-stream@2.0.0:
+    resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}
+    engines: {'0': node >= 6.0}
+
+  content-disposition@1.1.0:
+    resolution: {integrity: sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==}
+    engines: {node: '>=18'}
+
+  content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie-signature@1.2.2:
+    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
+    engines: {node: '>=6.6.0'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
+    engines: {node: '>= 0.6'}
+
+  cookiejar@2.1.4:
+    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
+
+  dateformat@4.6.3:
+    resolution: {integrity: sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==}
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
+  dezalgo@1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
+  ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
+  end-of-stream@1.4.5:
+    resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
+
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-module-lexer@2.3.1:
+    resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==}
+
+  es-object-atoms@1.1.2:
+    resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
+  esbuild@0.28.1:
+    resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
+
+  eventemitter3@5.0.4:
+    resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
+
+  expect-type@1.4.0:
+    resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==}
+    engines: {node: '>=12.0.0'}
+
+  express@5.2.1:
+    resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
+    engines: {node: '>= 18'}
+
+  fast-copy@4.0.4:
+    resolution: {integrity: sha512-eVAiWVNPSEGIzDl5yPuLrx8fNMogScXvD9xp1Kzd41FjRIz2I3sSIcxsFeM5EzFfHAfobdvs8ZySffUopljvIA==}
+
+  fast-safe-stringify@2.1.1:
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  finalhandler@2.1.1:
+    resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==}
+    engines: {node: '>= 18.0.0'}
+
+  form-data@4.0.6:
+    resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==}
+    engines: {node: '>= 6'}
+
+  formidable@3.5.4:
+    resolution: {integrity: sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==}
+    engines: {node: '>=14.0.0'}
+
+  forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  fresh@2.0.0:
+    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
+    engines: {node: '>= 0.8'}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  hasown@2.0.4:
+    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
+    engines: {node: '>= 0.4'}
+
+  help-me@5.0.0:
+    resolution: {integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==}
+
+  http-errors@2.0.1:
+    resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+    engines: {node: '>= 0.8'}
+
+  iconv-lite@0.7.3:
+    resolution: {integrity: sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==}
+    engines: {node: '>=0.10.0'}
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
+
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
+  media-typer@0.3.0:
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
+
+  media-typer@1.1.0:
+    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+    engines: {node: '>= 0.8'}
+
+  merge-descriptors@2.0.0:
+    resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
+    engines: {node: '>=18'}
+
+  methods@1.1.2:
+    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@3.0.2:
+    resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
+    engines: {node: '>=18'}
+
+  mime@2.6.0:
+    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
+    engines: {node: '>=4.0.0'}
+    hasBin: true
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  multer@2.2.0:
+    resolution: {integrity: sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==}
+    engines: {node: '>= 10.16.0'}
+
+  nanoid@3.3.16:
+    resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  negotiator@1.0.0:
+    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
+    engines: {node: '>= 0.6'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
+  obug@2.1.4:
+    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
+    engines: {node: '>=12.20.0'}
+
+  on-exit-leak-free@2.1.2:
+    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
+    engines: {node: '>=14.0.0'}
+
+  on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  p-queue@9.3.3:
+    resolution: {integrity: sha512-NXAOdnEe5FsZJfT4oK84lE1Y5cFFdWlRuOo5tww8DyNMxyRXwn39fIkUtNLKppcPC+UYU/bXujNCUGDv01y7CA==}
+    engines: {node: '>=20'}
+
+  p-timeout@7.0.1:
+    resolution: {integrity: sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==}
+    engines: {node: '>=20'}
+
+  parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
+  path-to-regexp@8.4.2:
+    resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
+
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
+    engines: {node: '>=12'}
+
+  pino-abstract-transport@3.0.0:
+    resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
+
+  pino-loki@3.0.0:
+    resolution: {integrity: sha512-9TyUW5syTjp2nT70QcijJtIWUzdYUj+olQ7+fWNfm1/HrDGEWt86Q4ACzClH6DM6GBwtQimRDgneNczP+p4ypA==}
+    engines: {node: '>=20'}
+    hasBin: true
+
+  pino-pretty@13.1.3:
+    resolution: {integrity: sha512-ttXRkkOz6WWC95KeY9+xxWL6AtImwbyMHrL1mSwqwW9u+vLp/WIElvHvCSDg0xO/Dzrggz1zv3rN5ovTRVowKg==}
+    hasBin: true
+
+  pino-std-serializers@7.1.0:
+    resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==}
+
+  pino@10.3.1:
+    resolution: {integrity: sha512-r34yH/GlQpKZbU1BvFFqOjhISRo1MNx1tWYsYvmj6KIRHSPMT2+yHOEb1SG6NMvRoHRF0a07kCOox/9yakl1vg==}
+    hasBin: true
+
+  postcss@8.5.20:
+    resolution: {integrity: sha512-lW616l85ucIQL+FocMmL7pQFPqBmwejrCMg+iPxyImlrANNJG9NHq/RkyCZopDhd8C3LA03PHRJDjkbGu8vvug==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  process-warning@5.0.0:
+    resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
+
+  proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
+
+  pump@3.0.4:
+    resolution: {integrity: sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==}
+
+  qs@6.15.3:
+    resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}
+    engines: {node: '>=0.6'}
+
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
+  range-parser@1.3.0:
+    resolution: {integrity: sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==}
+    engines: {node: '>= 0.6'}
+
+  raw-body@3.0.2:
+    resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
+    engines: {node: '>= 0.10'}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  real-require@0.2.0:
+    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
+    engines: {node: '>= 12.13.0'}
+
+  real-require@1.0.0:
+    resolution: {integrity: sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g==}
+
+  rollup@4.62.2:
+    resolution: {integrity: sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  router@2.2.0:
+    resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
+    engines: {node: '>= 18'}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-stable-stringify@2.5.0:
+    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+    engines: {node: '>=10'}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  secure-json-parse@4.1.0:
+    resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
+
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  send@1.2.1:
+    resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
+    engines: {node: '>= 18'}
+
+  serve-static@2.2.1:
+    resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}
+    engines: {node: '>= 18'}
+
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  sharp@0.35.3:
+    resolution: {integrity: sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==}
+    engines: {node: '>=20.9.0'}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  side-channel-list@1.0.1:
+    resolution: {integrity: sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
+    engines: {node: '>= 0.4'}
+
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
+  sonic-boom@4.2.1:
+    resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
+  statuses@2.0.2:
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
+
+  std-env@4.2.0:
+    resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
+
+  streamsearch@1.1.0:
+    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
+    engines: {node: '>=10.0.0'}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-json-comments@5.0.3:
+    resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
+    engines: {node: '>=14.16'}
+
+  superagent@10.3.0:
+    resolution: {integrity: sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==}
+    engines: {node: '>=14.18.0'}
+
+  supertest@7.2.2:
+    resolution: {integrity: sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==}
+    engines: {node: '>=14.18.0'}
+
+  thread-stream@4.2.0:
+    resolution: {integrity: sha512-e2zZ96wSChazBsbENf/Pcm/4swHt2cEKQ92rhUjkL9GCKiTDJIaTBenjE/m9DXi0QBmTMDkFDdOomUy20A1tDQ==}
+    engines: {node: '>=20'}
+
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
+  tinyexec@1.2.4:
+    resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
+    engines: {node: '>=18'}
+
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
+    engines: {node: '>=12.0.0'}
+
+  tinyrainbow@3.1.0:
+    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
+    engines: {node: '>=14.0.0'}
+
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tsx@4.23.1:
+    resolution: {integrity: sha512-GQHnkIfxyx1wYCOS/wonik5MVRZU9hi1TEZmzGZSCJB1y9YgoZ8H6itNE/u4suE+yLmOzuE4E5S4TZ/ZX2wcWQ==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  type-is@1.6.18:
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
+
+  type-is@2.1.0:
+    resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==}
+    engines: {node: '>= 18'}
+
+  typedarray@0.0.6:
+    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
+
+  typescript@7.0.2:
+    resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==}
+    engines: {node: '>=16.20.0'}
+    hasBin: true
+
+  undici-types@8.3.0:
+    resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==}
+
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  vite@7.3.6:
+    resolution: {integrity: sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      lightningcss: ^1.21.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  vitest@4.1.10:
+    resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.1.10
+      '@vitest/browser-preview': 4.1.10
+      '@vitest/browser-webdriverio': 4.1.10
+      '@vitest/coverage-istanbul': 4.1.10
+      '@vitest/coverage-v8': 4.1.10
+      '@vitest/ui': 4.1.10
+      happy-dom: '*'
+      jsdom: '*'
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
+        optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
+
+snapshots:
+
+  '@emnapi/runtime@1.11.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@esbuild/aix-ppc64@0.28.1':
+    optional: true
+
+  '@esbuild/android-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/android-arm@0.28.1':
+    optional: true
+
+  '@esbuild/android-x64@0.28.1':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/darwin-x64@0.28.1':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-arm@0.28.1':
+    optional: true
+
+  '@esbuild/linux-ia32@0.28.1':
+    optional: true
+
+  '@esbuild/linux-loong64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.28.1':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-s390x@0.28.1':
+    optional: true
+
+  '@esbuild/linux-x64@0.28.1':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/sunos-x64@0.28.1':
+    optional: true
+
+  '@esbuild/win32-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/win32-ia32@0.28.1':
+    optional: true
+
+  '@esbuild/win32-x64@0.28.1':
+    optional: true
+
+  '@img/colour@1.1.0': {}
+
+  '@img/sharp-darwin-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
+    optional: true
+
+  '@img/sharp-darwin-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.3.2
+    optional: true
+
+  '@img/sharp-freebsd-wasm32@0.35.3':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.3
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.3.2
+    optional: true
+
+  '@img/sharp-linux-arm@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.3.2
+    optional: true
+
+  '@img/sharp-linux-ppc64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
+    optional: true
+
+  '@img/sharp-linux-riscv64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
+    optional: true
+
+  '@img/sharp-linux-s390x@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.3.2
+    optional: true
+
+  '@img/sharp-linux-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.3.2
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
+    optional: true
+
+  '@img/sharp-wasm32@0.35.3':
+    dependencies:
+      '@emnapi/runtime': 1.11.2
+    optional: true
+
+  '@img/sharp-webcontainers-wasm32@0.35.3':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.3
+    optional: true
+
+  '@img/sharp-win32-arm64@0.35.3':
+    optional: true
+
+  '@img/sharp-win32-ia32@0.35.3':
+    optional: true
+
+  '@img/sharp-win32-x64@0.35.3':
+    optional: true
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@noble/hashes@1.8.0': {}
+
+  '@paralleldrive/cuid2@2.3.1':
+    dependencies:
+      '@noble/hashes': 1.8.0
+
+  '@pinojs/redact@0.4.0': {}
+
+  '@rollup/rollup-android-arm-eabi@4.62.2':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-x64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-openbsd-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-openharmony-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-arm64-msvc@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-ia32-msvc@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-x64-msvc@4.62.2':
+    optional: true
+
+  '@standard-schema/spec@1.1.0': {}
+
+  '@types/body-parser@1.19.6':
+    dependencies:
+      '@types/connect': 3.4.38
+      '@types/node': 26.1.2
+
+  '@types/chai@5.2.3':
+    dependencies:
+      '@types/deep-eql': 4.0.2
+      assertion-error: 2.0.1
+
+  '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 26.1.2
+
+  '@types/cookiejar@2.1.5': {}
+
+  '@types/deep-eql@4.0.2': {}
+
+  '@types/estree@1.0.9': {}
+
+  '@types/express-serve-static-core@5.1.2':
+    dependencies:
+      '@types/node': 26.1.2
+      '@types/qs': 6.15.1
+      '@types/range-parser': 1.2.7
+      '@types/send': 1.2.1
+
+  '@types/express@5.0.6':
+    dependencies:
+      '@types/body-parser': 1.19.6
+      '@types/express-serve-static-core': 5.1.2
+      '@types/serve-static': 2.2.0
+
+  '@types/http-errors@2.0.5': {}
+
+  '@types/methods@1.1.4': {}
+
+  '@types/multer@2.2.0':
+    dependencies:
+      '@types/express': 5.0.6
+
+  '@types/node@26.1.2':
+    dependencies:
+      undici-types: 8.3.0
+
+  '@types/qs@6.15.1': {}
+
+  '@types/range-parser@1.2.7': {}
+
+  '@types/send@1.2.1':
+    dependencies:
+      '@types/node': 26.1.2
+
+  '@types/serve-static@2.2.0':
+    dependencies:
+      '@types/http-errors': 2.0.5
+      '@types/node': 26.1.2
+
+  '@types/superagent@8.1.11':
+    dependencies:
+      '@types/cookiejar': 2.1.5
+      '@types/methods': 1.1.4
+      '@types/node': 26.1.2
+      form-data: 4.0.6
+
+  '@types/supertest@7.2.1':
+    dependencies:
+      '@types/methods': 1.1.4
+      '@types/superagent': 8.1.11
+
+  '@typescript/typescript-aix-ppc64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-darwin-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-darwin-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-freebsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-freebsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-arm@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-loong64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-mips64el@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-ppc64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-riscv64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-s390x@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-netbsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-netbsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-openbsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-openbsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-sunos-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-win32-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-win32-x64@7.0.2':
+    optional: true
+
+  '@vitest/expect@4.1.10':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      chai: 6.2.2
+      tinyrainbow: 3.1.0
+
+  '@vitest/mocker@4.1.10(vite@7.3.6(@types/node@26.1.2)(tsx@4.23.1))':
+    dependencies:
+      '@vitest/spy': 4.1.10
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 7.3.6(@types/node@26.1.2)(tsx@4.23.1)
+
+  '@vitest/pretty-format@4.1.10':
+    dependencies:
+      tinyrainbow: 3.1.0
+
+  '@vitest/runner@4.1.10':
+    dependencies:
+      '@vitest/utils': 4.1.10
+      pathe: 2.0.3
+
+  '@vitest/snapshot@4.1.10':
+    dependencies:
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/utils': 4.1.10
+      magic-string: 0.30.21
+      pathe: 2.0.3
+
+  '@vitest/spy@4.1.10': {}
+
+  '@vitest/utils@4.1.10':
+    dependencies:
+      '@vitest/pretty-format': 4.1.10
+      convert-source-map: 2.0.0
+      tinyrainbow: 3.1.0
+
+  accepts@2.0.0:
+    dependencies:
+      mime-types: 3.0.2
+      negotiator: 1.0.0
+
+  append-field@1.0.0: {}
+
+  asap@2.0.6: {}
+
+  assertion-error@2.0.1: {}
+
+  asynckit@0.4.0: {}
+
+  atomic-sleep@1.0.0: {}
+
+  body-parser@2.3.0:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 2.0.0
+      debug: 4.4.3
+      http-errors: 2.0.1
+      iconv-lite: 0.7.3
+      on-finished: 2.4.1
+      qs: 6.15.3
+      raw-body: 3.0.2
+      type-is: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+
+  buffer-from@1.1.2: {}
+
+  busboy@1.6.0:
+    dependencies:
+      streamsearch: 1.1.0
+
+  bytes@3.1.2: {}
+
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
+  chai@6.2.2: {}
+
+  colorette@2.0.20: {}
+
+  combined-stream@1.0.8:
+    dependencies:
+      delayed-stream: 1.0.0
+
+  component-emitter@1.3.1: {}
+
+  concat-stream@2.0.0:
+    dependencies:
+      buffer-from: 1.1.2
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+      typedarray: 0.0.6
+
+  content-disposition@1.1.0: {}
+
+  content-type@1.0.5: {}
+
+  content-type@2.0.0: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie-signature@1.2.2: {}
+
+  cookie@0.7.2: {}
+
+  cookiejar@2.1.4: {}
+
+  dateformat@4.6.3: {}
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  delayed-stream@1.0.0: {}
+
+  depd@2.0.0: {}
+
+  detect-libc@2.1.2: {}
+
+  dezalgo@1.0.4:
+    dependencies:
+      asap: 2.0.6
+      wrappy: 1.0.2
+
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  ee-first@1.1.1: {}
+
+  encodeurl@2.0.0: {}
+
+  end-of-stream@1.4.5:
+    dependencies:
+      once: 1.4.0
+
+  es-define-property@1.0.1: {}
+
+  es-errors@1.3.0: {}
+
+  es-module-lexer@2.3.1: {}
+
+  es-object-atoms@1.1.2:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.4
+
+  esbuild@0.28.1:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.28.1
+      '@esbuild/android-arm': 0.28.1
+      '@esbuild/android-arm64': 0.28.1
+      '@esbuild/android-x64': 0.28.1
+      '@esbuild/darwin-arm64': 0.28.1
+      '@esbuild/darwin-x64': 0.28.1
+      '@esbuild/freebsd-arm64': 0.28.1
+      '@esbuild/freebsd-x64': 0.28.1
+      '@esbuild/linux-arm': 0.28.1
+      '@esbuild/linux-arm64': 0.28.1
+      '@esbuild/linux-ia32': 0.28.1
+      '@esbuild/linux-loong64': 0.28.1
+      '@esbuild/linux-mips64el': 0.28.1
+      '@esbuild/linux-ppc64': 0.28.1
+      '@esbuild/linux-riscv64': 0.28.1
+      '@esbuild/linux-s390x': 0.28.1
+      '@esbuild/linux-x64': 0.28.1
+      '@esbuild/netbsd-arm64': 0.28.1
+      '@esbuild/netbsd-x64': 0.28.1
+      '@esbuild/openbsd-arm64': 0.28.1
+      '@esbuild/openbsd-x64': 0.28.1
+      '@esbuild/openharmony-arm64': 0.28.1
+      '@esbuild/sunos-x64': 0.28.1
+      '@esbuild/win32-arm64': 0.28.1
+      '@esbuild/win32-ia32': 0.28.1
+      '@esbuild/win32-x64': 0.28.1
+
+  escape-html@1.0.3: {}
+
+  estree-walker@3.0.3:
+    dependencies:
+      '@types/estree': 1.0.9
+
+  etag@1.8.1: {}
+
+  eventemitter3@5.0.4: {}
+
+  expect-type@1.4.0: {}
+
+  express@5.2.1:
+    dependencies:
+      accepts: 2.0.0
+      body-parser: 2.3.0
+      content-disposition: 1.1.0
+      content-type: 1.0.5
+      cookie: 0.7.2
+      cookie-signature: 1.2.2
+      debug: 4.4.3
+      depd: 2.0.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 2.1.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      merge-descriptors: 2.0.0
+      mime-types: 3.0.2
+      on-finished: 2.4.1
+      once: 1.4.0
+      parseurl: 1.3.3
+      proxy-addr: 2.0.7
+      qs: 6.15.3
+      range-parser: 1.3.0
+      router: 2.2.0
+      send: 1.2.1
+      serve-static: 2.2.1
+      statuses: 2.0.2
+      type-is: 2.1.0
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  fast-copy@4.0.4: {}
+
+  fast-safe-stringify@2.1.1: {}
+
+  fdir@6.5.0(picomatch@4.0.5):
+    optionalDependencies:
+      picomatch: 4.0.5
+
+  finalhandler@2.1.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  form-data@4.0.6:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.4
+      mime-types: 2.1.35
+
+  formidable@3.5.4:
+    dependencies:
+      '@paralleldrive/cuid2': 2.3.1
+      dezalgo: 1.0.4
+      once: 1.4.0
+
+  forwarded@0.2.0: {}
+
+  fresh@2.0.0: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  get-intrinsic@1.3.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.4
+      math-intrinsics: 1.1.0
+
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.2
+
+  gopd@1.2.0: {}
+
+  has-symbols@1.1.0: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.1.0
+
+  hasown@2.0.4:
+    dependencies:
+      function-bind: 1.1.2
+
+  help-me@5.0.0: {}
+
+  http-errors@2.0.1:
+    dependencies:
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.2
+      toidentifier: 1.0.1
+
+  iconv-lite@0.7.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  inherits@2.0.4: {}
+
+  ipaddr.js@1.9.1: {}
+
+  is-promise@4.0.0: {}
+
+  joycon@3.1.1: {}
+
+  magic-string@0.30.21:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  math-intrinsics@1.1.0: {}
+
+  media-typer@0.3.0: {}
+
+  media-typer@1.1.0: {}
+
+  merge-descriptors@2.0.0: {}
+
+  methods@1.1.2: {}
+
+  mime-db@1.52.0: {}
+
+  mime-db@1.54.0: {}
+
+  mime-types@2.1.35:
+    dependencies:
+      mime-db: 1.52.0
+
+  mime-types@3.0.2:
+    dependencies:
+      mime-db: 1.54.0
+
+  mime@2.6.0: {}
+
+  minimist@1.2.8: {}
+
+  ms@2.1.3: {}
+
+  multer@2.2.0:
+    dependencies:
+      append-field: 1.0.0
+      busboy: 1.6.0
+      concat-stream: 2.0.0
+      type-is: 1.6.18
+
+  nanoid@3.3.16: {}
+
+  negotiator@1.0.0: {}
+
+  object-inspect@1.13.4: {}
+
+  obug@2.1.4: {}
+
+  on-exit-leak-free@2.1.2: {}
+
+  on-finished@2.4.1:
+    dependencies:
+      ee-first: 1.1.1
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  p-queue@9.3.3:
+    dependencies:
+      eventemitter3: 5.0.4
+      p-timeout: 7.0.1
+
+  p-timeout@7.0.1: {}
+
+  parseurl@1.3.3: {}
+
+  path-to-regexp@8.4.2: {}
+
+  pathe@2.0.3: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@4.0.5: {}
+
+  pino-abstract-transport@3.0.0:
+    dependencies:
+      split2: 4.2.0
+
+  pino-loki@3.0.0:
+    dependencies:
+      pino-abstract-transport: 3.0.0
+      pump: 3.0.4
+
+  pino-pretty@13.1.3:
+    dependencies:
+      colorette: 2.0.20
+      dateformat: 4.6.3
+      fast-copy: 4.0.4
+      fast-safe-stringify: 2.1.1
+      help-me: 5.0.0
+      joycon: 3.1.1
+      minimist: 1.2.8
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pump: 3.0.4
+      secure-json-parse: 4.1.0
+      sonic-boom: 4.2.1
+      strip-json-comments: 5.0.3
+
+  pino-std-serializers@7.1.0: {}
+
+  pino@10.3.1:
+    dependencies:
+      '@pinojs/redact': 0.4.0
+      atomic-sleep: 1.0.0
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pino-std-serializers: 7.1.0
+      process-warning: 5.0.0
+      quick-format-unescaped: 4.0.4
+      real-require: 0.2.0
+      safe-stable-stringify: 2.5.0
+      sonic-boom: 4.2.1
+      thread-stream: 4.2.0
+
+  postcss@8.5.20:
+    dependencies:
+      nanoid: 3.3.16
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  prettier@3.9.6: {}
+
+  process-warning@5.0.0: {}
+
+  proxy-addr@2.0.7:
+    dependencies:
+      forwarded: 0.2.0
+      ipaddr.js: 1.9.1
+
+  pump@3.0.4:
+    dependencies:
+      end-of-stream: 1.4.5
+      once: 1.4.0
+
+  qs@6.15.3:
+    dependencies:
+      es-define-property: 1.0.1
+      side-channel: 1.1.1
+
+  quick-format-unescaped@4.0.4: {}
+
+  range-parser@1.3.0: {}
+
+  raw-body@3.0.2:
+    dependencies:
+      bytes: 3.1.2
+      http-errors: 2.0.1
+      iconv-lite: 0.7.3
+      unpipe: 1.0.0
+
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+
+  real-require@0.2.0: {}
+
+  real-require@1.0.0: {}
+
+  rollup@4.62.2:
+    dependencies:
+      '@types/estree': 1.0.9
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.62.2
+      '@rollup/rollup-android-arm64': 4.62.2
+      '@rollup/rollup-darwin-arm64': 4.62.2
+      '@rollup/rollup-darwin-x64': 4.62.2
+      '@rollup/rollup-freebsd-arm64': 4.62.2
+      '@rollup/rollup-freebsd-x64': 4.62.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.62.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.62.2
+      '@rollup/rollup-linux-arm64-gnu': 4.62.2
+      '@rollup/rollup-linux-arm64-musl': 4.62.2
+      '@rollup/rollup-linux-loong64-gnu': 4.62.2
+      '@rollup/rollup-linux-loong64-musl': 4.62.2
+      '@rollup/rollup-linux-ppc64-gnu': 4.62.2
+      '@rollup/rollup-linux-ppc64-musl': 4.62.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.62.2
+      '@rollup/rollup-linux-riscv64-musl': 4.62.2
+      '@rollup/rollup-linux-s390x-gnu': 4.62.2
+      '@rollup/rollup-linux-x64-gnu': 4.62.2
+      '@rollup/rollup-linux-x64-musl': 4.62.2
+      '@rollup/rollup-openbsd-x64': 4.62.2
+      '@rollup/rollup-openharmony-arm64': 4.62.2
+      '@rollup/rollup-win32-arm64-msvc': 4.62.2
+      '@rollup/rollup-win32-ia32-msvc': 4.62.2
+      '@rollup/rollup-win32-x64-gnu': 4.62.2
+      '@rollup/rollup-win32-x64-msvc': 4.62.2
+      fsevents: 2.3.3
+
+  router@2.2.0:
+    dependencies:
+      debug: 4.4.3
+      depd: 2.0.0
+      is-promise: 4.0.0
+      parseurl: 1.3.3
+      path-to-regexp: 8.4.2
+    transitivePeerDependencies:
+      - supports-color
+
+  safe-buffer@5.2.1: {}
+
+  safe-stable-stringify@2.5.0: {}
+
+  safer-buffer@2.1.2: {}
+
+  secure-json-parse@4.1.0: {}
+
+  semver@7.8.5: {}
+
+  send@1.2.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      mime-types: 3.0.2
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.3.0
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  serve-static@2.2.1:
+    dependencies:
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  setprototypeof@1.2.0: {}
+
+  sharp@0.35.3(@types/node@26.1.2):
+    dependencies:
+      '@img/colour': 1.1.0
+      detect-libc: 2.1.2
+      semver: 7.8.5
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.35.3
+      '@img/sharp-darwin-x64': 0.35.3
+      '@img/sharp-freebsd-wasm32': 0.35.3
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
+      '@img/sharp-libvips-darwin-x64': 1.3.2
+      '@img/sharp-libvips-linux-arm': 1.3.2
+      '@img/sharp-libvips-linux-arm64': 1.3.2
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
+      '@img/sharp-libvips-linux-s390x': 1.3.2
+      '@img/sharp-libvips-linux-x64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
+      '@img/sharp-linux-arm': 0.35.3
+      '@img/sharp-linux-arm64': 0.35.3
+      '@img/sharp-linux-ppc64': 0.35.3
+      '@img/sharp-linux-riscv64': 0.35.3
+      '@img/sharp-linux-s390x': 0.35.3
+      '@img/sharp-linux-x64': 0.35.3
+      '@img/sharp-linuxmusl-arm64': 0.35.3
+      '@img/sharp-linuxmusl-x64': 0.35.3
+      '@img/sharp-webcontainers-wasm32': 0.35.3
+      '@img/sharp-win32-arm64': 0.35.3
+      '@img/sharp-win32-ia32': 0.35.3
+      '@img/sharp-win32-x64': 0.35.3
+      '@types/node': 26.1.2
+
+  side-channel-list@1.0.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.1
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
+  siginfo@2.0.0: {}
+
+  sonic-boom@4.2.1:
+    dependencies:
+      atomic-sleep: 1.0.0
+
+  source-map-js@1.2.1: {}
+
+  split2@4.2.0: {}
+
+  stackback@0.0.2: {}
+
+  statuses@2.0.2: {}
+
+  std-env@4.2.0: {}
+
+  streamsearch@1.1.0: {}
+
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  strip-json-comments@5.0.3: {}
+
+  superagent@10.3.0:
+    dependencies:
+      component-emitter: 1.3.1
+      cookiejar: 2.1.4
+      debug: 4.4.3
+      fast-safe-stringify: 2.1.1
+      form-data: 4.0.6
+      formidable: 3.5.4
+      methods: 1.1.2
+      mime: 2.6.0
+      qs: 6.15.3
+    transitivePeerDependencies:
+      - supports-color
+
+  supertest@7.2.2:
+    dependencies:
+      cookie-signature: 1.2.2
+      methods: 1.1.2
+      superagent: 10.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  thread-stream@4.2.0:
+    dependencies:
+      real-require: 1.0.0
+
+  tinybench@2.9.0: {}
+
+  tinyexec@1.2.4: {}
+
+  tinyglobby@0.2.17:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
+
+  tinyrainbow@3.1.0: {}
+
+  toidentifier@1.0.1: {}
+
+  tslib@2.8.1:
+    optional: true
+
+  tsx@4.23.1:
+    dependencies:
+      esbuild: 0.28.1
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  type-is@1.6.18:
+    dependencies:
+      media-typer: 0.3.0
+      mime-types: 2.1.35
+
+  type-is@2.1.0:
+    dependencies:
+      content-type: 2.0.0
+      media-typer: 1.1.0
+      mime-types: 3.0.2
+
+  typedarray@0.0.6: {}
+
+  typescript@7.0.2:
+    optionalDependencies:
+      '@typescript/typescript-aix-ppc64': 7.0.2
+      '@typescript/typescript-darwin-arm64': 7.0.2
+      '@typescript/typescript-darwin-x64': 7.0.2
+      '@typescript/typescript-freebsd-arm64': 7.0.2
+      '@typescript/typescript-freebsd-x64': 7.0.2
+      '@typescript/typescript-linux-arm': 7.0.2
+      '@typescript/typescript-linux-arm64': 7.0.2
+      '@typescript/typescript-linux-loong64': 7.0.2
+      '@typescript/typescript-linux-mips64el': 7.0.2
+      '@typescript/typescript-linux-ppc64': 7.0.2
+      '@typescript/typescript-linux-riscv64': 7.0.2
+      '@typescript/typescript-linux-s390x': 7.0.2
+      '@typescript/typescript-linux-x64': 7.0.2
+      '@typescript/typescript-netbsd-arm64': 7.0.2
+      '@typescript/typescript-netbsd-x64': 7.0.2
+      '@typescript/typescript-openbsd-arm64': 7.0.2
+      '@typescript/typescript-openbsd-x64': 7.0.2
+      '@typescript/typescript-sunos-x64': 7.0.2
+      '@typescript/typescript-win32-arm64': 7.0.2
+      '@typescript/typescript-win32-x64': 7.0.2
+
+  undici-types@8.3.0: {}
+
+  unpipe@1.0.0: {}
+
+  util-deprecate@1.0.2: {}
+
+  vary@1.1.2: {}
+
+  vite@7.3.6(@types/node@26.1.2)(tsx@4.23.1):
+    dependencies:
+      esbuild: 0.28.1
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
+      postcss: 8.5.20
+      rollup: 4.62.2
+      tinyglobby: 0.2.17
+    optionalDependencies:
+      '@types/node': 26.1.2
+      fsevents: 2.3.3
+      tsx: 4.23.1
+
+  vitest@4.1.10(@types/node@26.1.2)(vite@7.3.6(@types/node@26.1.2)(tsx@4.23.1)):
+    dependencies:
+      '@vitest/expect': 4.1.10
+      '@vitest/mocker': 4.1.10(vite@7.3.6(@types/node@26.1.2)(tsx@4.23.1))
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/runner': 4.1.10
+      '@vitest/snapshot': 4.1.10
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      es-module-lexer: 2.3.1
+      expect-type: 1.4.0
+      magic-string: 0.30.21
+      obug: 2.1.4
+      pathe: 2.0.3
+      picomatch: 4.0.5
+      std-env: 4.2.0
+      tinybench: 2.9.0
+      tinyexec: 1.2.4
+      tinyglobby: 0.2.17
+      tinyrainbow: 3.1.0
+      vite: 7.3.6(@types/node@26.1.2)(tsx@4.23.1)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 26.1.2
+    transitivePeerDependencies:
+      - msw
+
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2
+
+  wrappy@1.0.2: {}
+
+  zod@4.4.3: {}
diff --git a/media-processor/pnpm-workspace.yaml b/media-processor/pnpm-workspace.yaml
new file mode 100644
index 0000000000..5ed0b5af0d
--- /dev/null
+++ b/media-processor/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+allowBuilds:
+  esbuild: true
diff --git a/media-processor/scripts/build b/media-processor/scripts/build
new file mode 100755
index 0000000000..94ec8e856c
--- /dev/null
+++ b/media-processor/scripts/build
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+cd "$(dirname "$0")/.."
+pnpm run build
diff --git a/media-processor/scripts/setup b/media-processor/scripts/setup
new file mode 100755
index 0000000000..c7be37d33d
--- /dev/null
+++ b/media-processor/scripts/setup
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+cd "$(dirname "$0")/.."
+corepack enable
+corepack install
+pnpm install
diff --git a/media-processor/src/config.ts b/media-processor/src/config.ts
new file mode 100644
index 0000000000..c6229ae343
--- /dev/null
+++ b/media-processor/src/config.ts
@@ -0,0 +1,64 @@
+import { z } from "zod";
+import { hkdfSync } from "node:crypto";
+import type { AppConfig } from "./types.js";
+
+const envSchema = z.object({
+  PENPOT_MEDIA_PROCESSOR_PORT: z.coerce.number().int().positive().default(6065),
+  PENPOT_MEDIA_PROCESSOR_HOST: z.string().default("0.0.0.0"),
+  PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS: z.coerce.number().int().min(1).default(10),
+  PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT: z.coerce.number().int().nonnegative().default(180000),
+  PENPOT_MEDIA_PROCESSOR_MAX_FILE_SIZE: z.coerce.number().int().positive().default(367001600), // 350 MB
+  PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD: z.coerce.number().int().positive().default(10485760), // 10 MB — uploads below this use memory storage; above use disk storage
+  PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_PIXELS: z.coerce.number().int().positive().default(128_000_000),
+  PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_WIDTH: z.coerce.number().int().positive().default(16384),
+  PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_HEIGHT: z.coerce.number().int().positive().default(16384),
+  PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_MEM: z.coerce.number().int().positive().default(512),
+  PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_CPU_TIME: z.coerce.number().int().positive().default(30),
+  PENPOT_MEDIA_PROCESSOR_FONT_TIMEOUT: z.coerce.number().int().positive().default(120000),
+  PENPOT_MEDIA_PROCESSOR_SHARED_KEY: z.string().optional(),
+  PENPOT_SECRET_KEY: z.string().optional(),
+  PENPOT_MEDIA_PROCESSOR_LOG_LEVEL: z
+    .enum(["fatal", "error", "warn", "info", "debug", "trace", "silent"])
+    .default("info"),
+  PENPOT_LOGGERS_LOKI_URI: z.string().optional(),
+  PENPOT_LOGGERS_LOKI_JOB: z.string().default("media-processor"),
+  PENPOT_LOGGERS_LOKI_ENVIRONMENT: z.string().optional(),
+  PENPOT_LOGGERS_LOKI_INSTANCE: z.string().optional(),
+});
+
+function deriveSharedKey(secret: string): string {
+  const key = hkdfSync("blake2b512", secret, Buffer.from("media-processor"), "", 32);
+  return Buffer.from(key).toString("base64url");
+}
+
+export function loadConfig(): AppConfig {
+  const parsed = envSchema.parse(process.env);
+
+  let sharedKey: string | null = null;
+  if (parsed.PENPOT_MEDIA_PROCESSOR_SHARED_KEY) {
+    sharedKey = parsed.PENPOT_MEDIA_PROCESSOR_SHARED_KEY;
+  } else if (parsed.PENPOT_SECRET_KEY) {
+    sharedKey = deriveSharedKey(parsed.PENPOT_SECRET_KEY);
+  }
+
+  return {
+    port: parsed.PENPOT_MEDIA_PROCESSOR_PORT,
+    host: parsed.PENPOT_MEDIA_PROCESSOR_HOST,
+    maxConcurrentRequests: parsed.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS,
+    requestTimeout: parsed.PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT,
+    maxFileSize: parsed.PENPOT_MEDIA_PROCESSOR_MAX_FILE_SIZE,
+    memoryThreshold: parsed.PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD,
+    imageMaxPixels: parsed.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_PIXELS,
+    imageMaxWidth: parsed.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_WIDTH,
+    imageMaxHeight: parsed.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_HEIGHT,
+    fontProcessMem: parsed.PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_MEM,
+    fontProcessCpuTime: parsed.PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_CPU_TIME,
+    fontTimeout: parsed.PENPOT_MEDIA_PROCESSOR_FONT_TIMEOUT,
+    sharedKey,
+    logLevel: parsed.PENPOT_MEDIA_PROCESSOR_LOG_LEVEL,
+    lokiUri: parsed.PENPOT_LOGGERS_LOKI_URI || null,
+    lokiJob: parsed.PENPOT_LOGGERS_LOKI_JOB,
+    lokiEnvironment: parsed.PENPOT_LOGGERS_LOKI_ENVIRONMENT || null,
+    lokiInstance: parsed.PENPOT_LOGGERS_LOKI_INSTANCE || null,
+  };
+}
diff --git a/media-processor/src/index.ts b/media-processor/src/index.ts
new file mode 100644
index 0000000000..ac05201659
--- /dev/null
+++ b/media-processor/src/index.ts
@@ -0,0 +1,59 @@
+import express, { type Express } from "express";
+import { loadConfig } from "./config.js";
+import { initLogger, logger, logActiveTransports } from "./logger.js";
+import { healthRoutes } from "./routes/health.js";
+import { createImageRoutes } from "./routes/image.js";
+import { createFontRoutes } from "./routes/font.js";
+import { errorHandler } from "./middleware/error-handler.js";
+import { timeoutMiddleware } from "./middleware/timeout.js";
+import { sharedKeyAuth } from "./middleware/auth.js";
+import { createQueueMiddleware } from "./middleware/queue.js";
+import { loggingMiddleware } from "./middleware/logging.js";
+import { configureImageLimits } from "./services/image.js";
+import { configureFontLimits } from "./services/font.js";
+import { configureUploadLimits } from "./upload.js";
+import sharp from "sharp";
+
+// Auth is enforced via x-shared-key header (sharedKeyAuth middleware).
+// When no key is configured, all requests are rejected (403).
+// This service MUST be deployed on an internal Docker network only
+// — do NOT expose to the public internet.
+
+// Disable sharp/libvips caching to prevent unbounded memory growth
+sharp.cache(false);
+
+const config = loadConfig();
+initLogger(config);
+const app: Express = express();
+
+// Configure resource limits
+configureImageLimits({
+  maxPixels: config.imageMaxPixels,
+  maxWidth: config.imageMaxWidth,
+  maxHeight: config.imageMaxHeight,
+});
+
+configureFontLimits({
+  mem: config.fontProcessMem,
+  cpuTime: config.fontProcessCpuTime,
+  timeout: config.fontTimeout,
+});
+
+configureUploadLimits({ maxFileSize: config.maxFileSize, memoryThreshold: config.memoryThreshold });
+
+const queueMiddleware = createQueueMiddleware(config.maxConcurrentRequests);
+
+app.use(timeoutMiddleware(config.requestTimeout));
+app.use(loggingMiddleware);
+
+app.get("/api/health", healthRoutes);
+app.use("/api/image", sharedKeyAuth(config.sharedKey), queueMiddleware, createImageRoutes());
+app.use("/api/font", sharedKeyAuth(config.sharedKey), queueMiddleware, createFontRoutes());
+app.use(errorHandler);
+
+app.listen(config.port, config.host, () => {
+  logActiveTransports(logger);
+  logger.info(`media-processor listening on ${config.host}:${config.port}`);
+});
+
+export { app };
diff --git a/media-processor/src/logger.ts b/media-processor/src/logger.ts
new file mode 100644
index 0000000000..aede1219d2
--- /dev/null
+++ b/media-processor/src/logger.ts
@@ -0,0 +1,135 @@
+import pino, { type TransportTargetOptions } from "pino";
+import { loadConfig } from "./config.js";
+import type { AppConfig } from "./types.js";
+
+interface LogTransportProvider {
+  getTarget(): TransportTargetOptions | null;
+  getStartupMessage(): string | null;
+}
+
+class ConsoleLogTransport implements LogTransportProvider {
+  public constructor(private readonly config: AppConfig) {}
+
+  public getTarget(): TransportTargetOptions {
+    return {
+      target: "pino-pretty",
+      level: this.config.logLevel,
+      options: {
+        colorize: true,
+        translateTime: "SYS:yyyy-mm-dd HH:MM:ss.l",
+        ignore: "pid,hostname",
+        messageFormat: "{msg}",
+        levelFirst: true,
+      },
+    };
+  }
+
+  public getStartupMessage(): string {
+    return "Logging to console";
+  }
+}
+
+class LokiLogTransport implements LogTransportProvider {
+  private readonly host: string | null;
+
+  public constructor(
+    private readonly config: AppConfig,
+    lokiUri: string | null
+  ) {
+    this.host = lokiUri;
+  }
+
+  public getTarget(): TransportTargetOptions | null {
+    if (this.host === null) {
+      return null;
+    }
+    return {
+      target: "pino-loki",
+      level: this.config.logLevel,
+      options: {
+        host: this.host,
+        json: false,
+        batching: true,
+        interval: 5,
+        replaceTimestamp: true,
+        labels: this.buildLabels(),
+        messageFormat: "{msg}",
+        ignore: "pid,hostname",
+      },
+    };
+  }
+
+  private buildLabels(): Record<string, string> {
+    const labels: Record<string, string> = {
+      job: this.config.lokiJob,
+    };
+    if (this.config.lokiEnvironment) {
+      labels.environment = this.config.lokiEnvironment;
+    }
+    if (this.config.lokiInstance) {
+      labels.instance = this.config.lokiInstance;
+    }
+    return labels;
+  }
+
+  public getStartupMessage(): string | null {
+    return this.host !== null ? `Logging to Loki: ${this.host}` : null;
+  }
+}
+
+function buildLogger(config: AppConfig) {
+  const consoleTransport = new ConsoleLogTransport(config);
+  const lokiTransport = new LokiLogTransport(config, config.lokiUri);
+  const transports: LogTransportProvider[] = [consoleTransport, lokiTransport];
+
+  const instance = pino({
+    level: config.logLevel,
+    timestamp: pino.stdTimeFunctions.isoTime,
+    transport: {
+      targets: transports
+        .map((t) => t.getTarget())
+        .filter((target): target is TransportTargetOptions => target !== null),
+    },
+  });
+
+  return { instance, transports };
+}
+
+let _instance: pino.Logger | null = null;
+let _transports: LogTransportProvider[] = [];
+
+export function initLogger(config: AppConfig): pino.Logger {
+  const result = buildLogger(config);
+  _instance = result.instance;
+  _transports = result.transports;
+  return _instance;
+}
+
+function getInstance(): pino.Logger {
+  if (_instance === null) {
+    return initLogger(loadConfig());
+  }
+  return _instance;
+}
+
+// Export as a getter so consumers see the lazily-initialized instance.
+export const logger: pino.Logger = new Proxy({} as pino.Logger, {
+  get(_, prop) {
+    const inst = getInstance();
+    const value = (inst as unknown as Record<string | symbol, unknown>)[prop];
+    return typeof value === "function" ? value.bind(inst) : value;
+  },
+});
+
+export function logActiveTransports(log: pino.Logger): void {
+  for (const t of _transports) {
+    const msg = t.getStartupMessage();
+    if (msg !== null) {
+      log.info(msg);
+    }
+  }
+}
+
+export function createLogger(name: string) {
+  return logger.child({ name });
+}
diff --git a/media-processor/src/middleware/auth.ts b/media-processor/src/middleware/auth.ts
new file mode 100644
index 0000000000..72e1ca743b
--- /dev/null
+++ b/media-processor/src/middleware/auth.ts
@@ -0,0 +1,27 @@
+import { timingSafeEqual } from "node:crypto";
+import type { Request, Response, NextFunction } from "express";
+
+export function sharedKeyAuth(expectedKey: string | null) {
+  if (expectedKey === null) {
+    return (_req: Request, res: Response, _next: NextFunction): void => {
+      res.status(403).json({ type: "authorization", code: "forbidden", hint: "Shared key not configured" });
+    };
+  }
+
+  return (req: Request, res: Response, next: NextFunction): void => {
+    const provided = req.headers["x-shared-key"];
+    if (typeof provided !== "string") {
+      res.status(403).json({ type: "authorization", code: "forbidden" });
+      return;
+    }
+
+    const providedBuf = Buffer.from(provided);
+    const expectedBuf = Buffer.from(expectedKey);
+
+    if (providedBuf.length === expectedBuf.length && timingSafeEqual(providedBuf, expectedBuf)) {
+      next();
+    } else {
+      res.status(403).json({ type: "authorization", code: "forbidden" });
+    }
+  };
+}
diff --git a/media-processor/src/middleware/cleanup.ts b/media-processor/src/middleware/cleanup.ts
new file mode 100644
index 0000000000..ec5796154a
--- /dev/null
+++ b/media-processor/src/middleware/cleanup.ts
@@ -0,0 +1,25 @@
+import { rm } from "node:fs/promises";
+import type { Request, Response, NextFunction } from "express";
+import { createLogger } from "../logger.js";
+
+const logger = createLogger("cleanup");
+
+export function cleanupMiddleware(req: Request, _res: Response, next: NextFunction): void {
+  let cleaned = false;
+
+  _res.on("finish", cleanup);
+  _res.on("close", cleanup);
+
+  async function cleanup() {
+    if (cleaned) return;
+    cleaned = true;
+    const file = req.file as (Express.Multer.File & { path?: string }) | undefined;
+    if (file?.path) {
+      await rm(file.path, { force: true }).catch((err) => {
+        logger.debug({ err, path: file.path }, "Failed to cleanup uploaded file");
+      });
+    }
+  }
+
+  next();
+}
diff --git a/media-processor/src/middleware/error-handler.ts b/media-processor/src/middleware/error-handler.ts
new file mode 100644
index 0000000000..f7834c59fe
--- /dev/null
+++ b/media-processor/src/middleware/error-handler.ts
@@ -0,0 +1,55 @@
+import type { Request, Response, NextFunction } from "express";
+import type { AppError } from "../types.js";
+import { createLogger } from "../logger.js";
+import multer from "multer";
+
+const logger = createLogger("error-handler");
+
+export class ProcessingError extends Error {
+  public readonly statusCode: number;
+  public readonly errorBody: AppError;
+
+  constructor(statusCode: number, body: AppError) {
+    super(body.hint ?? body.code);
+    this.statusCode = statusCode;
+    this.errorBody = body;
+  }
+}
+
+function releaseSlot(res: Response): void {
+  const releaseQueue = (res as any).locals?.releaseQueue;
+  if (releaseQueue) releaseQueue();
+}
+
+export function errorHandler(err: Error, _req: Request, res: Response, _next: NextFunction): void {
+  if (res.headersSent) {
+    return;
+  }
+
+  if (err instanceof ProcessingError) {
+    logger.warn({ err, statusCode: err.statusCode }, "Processing error");
+    res.status(err.statusCode).json(err.errorBody);
+    releaseSlot(res);
+    return;
+  }
+
+  if (err instanceof multer.MulterError) {
+    if (err.code === "LIMIT_FILE_SIZE") {
+      logger.warn({ err }, "Upload size limit exceeded");
+      res.status(413).json({
+        type: "restriction",
+        code: "payload-too-large",
+      });
+      releaseSlot(res);
+      return;
+    }
+  }
+
+  logger.error({ err }, "Unhandled error");
+  res.status(500).json({
+    type: "internal",
+    code: "processing-error",
+    hint: "Internal server error",
+  });
+  releaseSlot(res);
+}
diff --git a/media-processor/src/middleware/logging.ts b/media-processor/src/middleware/logging.ts
new file mode 100644
index 0000000000..8c7ecc6948
--- /dev/null
+++ b/media-processor/src/middleware/logging.ts
@@ -0,0 +1,21 @@
+import type { Request, Response, NextFunction } from "express";
+import { logger } from "../logger.js";
+
+const OP_NAMES: Record<string, string> = {
+  "POST /api/image/info": "image/info",
+  "POST /api/image/thumbnail": "image/thumbnail",
+  "POST /api/font/convert": "font/convert",
+};
+
+export function loggingMiddleware(req: Request, res: Response, next: NextFunction): void {
+  const start = Date.now();
+  res.on("finish", () => {
+    const path = req.originalUrl?.split("?")[0];
+    const op = OP_NAMES[`${req.method} ${path}`];
+    if (op) {
+      const meta = res.locals.opMeta ? `, ${res.locals.opMeta}` : "";
+      logger.info(`op=${op}${meta}, status=${res.statusCode}, elapsed=${Date.now() - start}ms`);
+    }
+  });
+  next();
+}
diff --git a/media-processor/src/middleware/queue.ts b/media-processor/src/middleware/queue.ts
new file mode 100644
index 0000000000..f6e6485548
--- /dev/null
+++ b/media-processor/src/middleware/queue.ts
@@ -0,0 +1,34 @@
+import type { Request, Response, NextFunction } from "express";
+import PQueue from "p-queue";
+
+export function createQueueMiddleware(concurrency: number) {
+  const queue = new PQueue({ concurrency });
+
+  return function queueMiddleware(_req: Request, res: Response, next: NextFunction): void {
+    queue
+      .add(
+        () =>
+          new Promise<void>((resolve) => {
+            if (res.writableEnded) {
+              resolve();
+              return;
+            }
+
+            let released = false;
+            const release = () => {
+              if (!released) {
+                released = true;
+                resolve();
+              }
+            };
+
+            // Store releaseQueue callback on res.locals so route handlers and error handler can call it
+            (res as any).locals = (res as any).locals || {};
+            (res as any).locals.releaseQueue = release;
+
+            next();
+          })
+      )
+      .catch((err) => next(err instanceof Error ? err : new Error("Request processing failed")));
+  };
+}
diff --git a/media-processor/src/middleware/timeout.ts b/media-processor/src/middleware/timeout.ts
new file mode 100644
index 0000000000..3b261a4082
--- /dev/null
+++ b/media-processor/src/middleware/timeout.ts
@@ -0,0 +1,35 @@
+import type { Request, Response, NextFunction } from "express";
+
+export function timeoutMiddleware(timeout: number) {
+  return (req: Request, res: Response, next: NextFunction): void => {
+    // Create AbortController for request cancellation
+    const abortController = new AbortController();
+    (req as any).abortController = abortController;
+
+    const timer = setTimeout(() => {
+      if (!res.headersSent) {
+        res.status(504).json({
+          type: "internal",
+          code: "processing-timeout",
+          hint: "Request timed out",
+        });
+        // Abort the signal to cancel ongoing processing
+        abortController.abort();
+        res.on("finish", () => req.destroy());
+      }
+    }, timeout);
+
+    // Clear timer on finish (successful completion)
+    res.on("finish", () => clearTimeout(timer));
+
+    // Clear timer and abort signal on close (client disconnect)
+    res.on("close", () => {
+      clearTimeout(timer);
+      if (!abortController.signal.aborted) {
+        abortController.abort();
+      }
+    });
+
+    next();
+  };
+}
diff --git a/media-processor/src/routes/font.ts b/media-processor/src/routes/font.ts
new file mode 100644
index 0000000000..885b6192c3
--- /dev/null
+++ b/media-processor/src/routes/font.ts
@@ -0,0 +1,55 @@
+import { Router, type IRouter, type Request, type Response, type NextFunction } from "express";
+import { getUpload, getFileInput } from "../upload.js";
+import { convertFont } from "../services/font.js";
+import { throwValidation } from "../services/errors.js";
+import { cleanupMiddleware } from "../middleware/cleanup.js";
+
+const VALID_TARGET_MTYPES = new Set(["font/ttf", "font/otf", "font/woff"]);
+const VALID_SOURCE_MTYPES = new Set(["font/ttf", "font/otf", "font/woff", "font/woff2"]);
+
+export function createFontRoutes(): IRouter {
+  const router: IRouter = Router();
+  const upload = getUpload();
+
+  router.post(
+    "/convert",
+    upload.single("file"),
+    cleanupMiddleware,
+    async (req: Request, res: Response, next: NextFunction) => {
+      const releaseQueue = (res as any).locals?.releaseQueue;
+      const signal = (req as any).abortController?.signal;
+      try {
+        if (!req.file) {
+          throwValidation("invalid-font", "No file uploaded");
+        }
+
+        const input = getFileInput(req.file!);
+        const sourceMtype = req.file!.mimetype;
+        if (!VALID_SOURCE_MTYPES.has(sourceMtype)) {
+          throwValidation("invalid-font", `Unrecognized font mime-type: ${sourceMtype}`);
+        }
+
+        const targetMtype = req.query["target-type"] as string;
+        if (!targetMtype || !VALID_TARGET_MTYPES.has(targetMtype)) {
+          throwValidation("invalid-font", `Invalid target-type. Must be one of: font/ttf, font/otf, font/woff`);
+        }
+
+        res.locals.opMeta = `src=${sourceMtype}, dest=${targetMtype}`;
+        const result = await convertFont(input, sourceMtype, targetMtype, signal);
+
+        if (!result) {
+          throwValidation("invalid-font", `Conversion from ${sourceMtype} to ${targetMtype} is not supported`);
+        }
+
+        res.setHeader("Content-Type", targetMtype);
+        res.send(result);
+      } catch (err) {
+        next(err);
+      } finally {
+        if (releaseQueue) releaseQueue();
+      }
+    }
+  );
+
+  return router;
+}
diff --git a/media-processor/src/routes/health.ts b/media-processor/src/routes/health.ts
new file mode 100644
index 0000000000..e598130a69
--- /dev/null
+++ b/media-processor/src/routes/health.ts
@@ -0,0 +1,5 @@
+import type { Request, Response } from "express";
+
+export function healthRoutes(_req: Request, res: Response): void {
+  res.json({ status: "ok" });
+}
diff --git a/media-processor/src/routes/image.ts b/media-processor/src/routes/image.ts
new file mode 100644
index 0000000000..ac28c55b4d
--- /dev/null
+++ b/media-processor/src/routes/image.ts
@@ -0,0 +1,95 @@
+import { Router, type IRouter, type Request, type Response, type NextFunction } from "express";
+import { getUpload, getFileInput } from "../upload.js";
+import { getImageInfo, generateThumbnail } from "../services/image.js";
+import { throwValidation } from "../services/errors.js";
+import { cleanupMiddleware } from "../middleware/cleanup.js";
+import type { ThumbnailParams } from "../types.js";
+
+export function parseQuality(value: string | undefined, defaultValue = 85): number {
+  if (value === undefined) return defaultValue;
+  const parsed = parseInt(value, 10);
+  if (isNaN(parsed)) return defaultValue;
+  return Math.min(100, Math.max(1, parsed));
+}
+
+export function createImageRoutes(): IRouter {
+  const router: IRouter = Router();
+  const upload = getUpload();
+
+  router.post(
+    "/info",
+    upload.single("file"),
+    cleanupMiddleware,
+    async (req: Request, res: Response, next: NextFunction) => {
+      const releaseQueue = (res as any).locals?.releaseQueue;
+      const signal = (req as any).abortController?.signal;
+      try {
+        if (!req.file) {
+          throwValidation("invalid-image", "No file uploaded");
+        }
+
+        const input = getFileInput(req.file!);
+        const info = await getImageInfo(input, req.file!.size, signal);
+        res.locals.opMeta = `mtype=${info.mtype}, size=${info.width}x${info.height}`;
+        res.json(info);
+      } catch (err) {
+        next(err);
+      } finally {
+        if (releaseQueue) releaseQueue();
+      }
+    }
+  );
+
+  router.post(
+    "/thumbnail",
+    upload.single("file"),
+    cleanupMiddleware,
+    async (req: Request, res: Response, next: NextFunction) => {
+      const releaseQueue = (res as any).locals?.releaseQueue;
+      const signal = (req as any).abortController?.signal;
+      try {
+        if (!req.file) {
+          throwValidation("invalid-image", "No file uploaded");
+        }
+
+        const input = getFileInput(req.file!);
+        const width = parseInt(req.query.width as string, 10);
+        const height = parseInt(req.query.height as string, 10);
+        const quality = parseQuality(req.query.quality as string);
+        const format = (req.query.format as string) || "jpeg";
+        const mode = (req.query.mode as string) || "fit";
+
+        if (isNaN(width) || isNaN(height) || width <= 0 || height <= 0) {
+          throwValidation("invalid-image", "width and height must be positive integers");
+        }
+
+        if (!["jpeg", "webp", "png"].includes(format)) {
+          throwValidation("invalid-image", `Unsupported format: ${format}`);
+        }
+
+        if (!["fit", "crop"].includes(mode)) {
+          throwValidation("invalid-image", `Unsupported mode: ${mode}`);
+        }
+
+        const params: ThumbnailParams = {
+          width,
+          height,
+          quality,
+          format: format as "jpeg" | "webp" | "png",
+          mode: mode as "fit" | "crop",
+        };
+
+        res.locals.opMeta = `size=${width}x${height}, fmt=${format}, mode=${mode}, q=${params.quality}`;
+        const { data, mtype } = await generateThumbnail(input, params, signal);
+        res.setHeader("Content-Type", mtype);
+        res.send(data);
+      } catch (err) {
+        next(err);
+      } finally {
+        if (releaseQueue) releaseQueue();
+      }
+    }
+  );
+
+  return router;
+}
diff --git a/media-processor/src/services/errors.ts b/media-processor/src/services/errors.ts
new file mode 100644
index 0000000000..7afdf93e37
--- /dev/null
+++ b/media-processor/src/services/errors.ts
@@ -0,0 +1,26 @@
+import { ProcessingError } from "../middleware/error-handler.js";
+import type { AppError } from "../types.js";
+
+export function throwValidation(code: string, hint?: string): never {
+  throw new ProcessingError(400, {
+    type: "validation",
+    code,
+    hint,
+  } satisfies AppError);
+}
+
+export function throwRestriction(code: string, hint?: string): never {
+  throw new ProcessingError(413, {
+    type: "restriction",
+    code,
+    hint,
+  } satisfies AppError);
+}
+
+export function throwProcessing(code: string, hint?: string): never {
+  throw new ProcessingError(503, {
+    type: "internal",
+    code,
+    hint,
+  } satisfies AppError);
+}
diff --git a/media-processor/src/services/font.ts b/media-processor/src/services/font.ts
new file mode 100644
index 0000000000..16e4a0a091
--- /dev/null
+++ b/media-processor/src/services/font.ts
@@ -0,0 +1,313 @@
+import { execFile } from "node:child_process";
+import { writeFile, readFile, mkdtemp, rm, copyFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { throwValidation, throwProcessing } from "./errors.js";
+import { createLogger } from "../logger.js";
+import type { FileInput } from "../types.js";
+
+const logger = createLogger("font");
+
+let fontProcessMem = 512;
+let fontProcessCpuTime = 30;
+let fontTimeout = 120000;
+
+export function configureFontLimits(opts: { mem: number; cpuTime: number; timeout: number }): void {
+  fontProcessMem = opts.mem;
+  fontProcessCpuTime = opts.cpuTime;
+  fontTimeout = opts.timeout;
+}
+
+export function execCommand(
+  cmd: string,
+  args: string[],
+  timeout?: number,
+  options?: { encoding?: BufferEncoding | "buffer"; signal?: AbortSignal }
+): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
+  const effectiveTimeout = timeout ?? fontTimeout;
+  const encoding = options?.encoding ?? "utf8";
+
+  // Use prlimit on Linux for memory + CPU resource limits
+  // Matches backend's prlimit-based font processing protection
+  const isLinux = process.platform === "linux";
+  let finalCmd = cmd;
+  let finalArgs = args;
+
+  if (isLinux && cmd !== "prlimit") {
+    // Wrap with prlimit: address space ceiling + CPU time limit
+    const prlimitArgs = [
+      `--as=${fontProcessMem * 1024 * 1024}`, // address space (memory)
+      `--cpu=${fontProcessCpuTime}`, // CPU seconds
+      "--",
+      cmd,
+      ...args,
+    ];
+    finalCmd = "prlimit";
+    finalArgs = prlimitArgs;
+  }
+
+  return new Promise((resolve, reject) => {
+    execFile(
+      finalCmd,
+      finalArgs,
+      {
+        timeout: effectiveTimeout,
+        encoding: encoding === "buffer" ? null : encoding,
+        signal: options?.signal,
+      },
+      (err, stdout, stderr) => {
+        if (err) {
+          const error = new Error(`Command failed: ${finalCmd} ${finalArgs.join(" ")}\n${stderr}`);
+          if (err.killed) (error as any).killed = err.killed;
+          if (err.signal) (error as any).signal = err.signal;
+          if (err.code !== null && err.code !== undefined) (error as any).code = err.code;
+          reject(error);
+        } else {
+          resolve({ stdout, stderr });
+        }
+      }
+    );
+  });
+}
+
+async function withTempDir<T>(fn: (dir: string) => Promise<T>): Promise<T> {
+  const dir = await mkdtemp(join(tmpdir(), "penpot.font."));
+  try {
+    return await fn(dir);
+  } finally {
+    await rm(dir, { recursive: true, force: true }).catch(() => {});
+  }
+}
+
+async function withTempInput<T>(
+  ext: string,
+  input: FileInput,
+  fn: (dir: string, inputPath: string) => Promise<T>
+): Promise<T> {
+  return withTempDir(async (dir) => {
+    const inputPath = join(dir, `input${ext}`);
+    if (typeof input === "string") {
+      await copyFile(input, inputPath);
+    } else {
+      await writeFile(inputPath, input);
+    }
+    return fn(dir, inputPath);
+  });
+}
+
+async function fontConvert(
+  inputExt: string,
+  outputExt: string,
+  input: FileInput,
+  signal?: AbortSignal
+): Promise<Buffer | null> {
+  return withTempDir(async (dir) => {
+    let inputPath: string;
+    if (typeof input === "string") {
+      inputPath = input; // Use path directly — avoids reading file into heap
+    } else {
+      inputPath = join(dir, `input${inputExt}`);
+      await writeFile(inputPath, input); // Write buffer to temp file
+    }
+
+    // Ensure input path is from tmpdir to prevent injection
+    if (!inputPath.startsWith(tmpdir())) {
+      throw new Error("Font processing denied: input path is outside expected directory");
+    }
+
+    const outputPath = join(dir, `input${outputExt}`);
+    try {
+      // Escape single quotes for FontForge's string parser (not shell).
+      // execFile passes args as an array — no shell injection vector.
+      // FontForge's own lexer uses doubled single quotes for escaping.
+      const escInput = inputPath.replace(/'/g, "''");
+      const escOutput = outputPath.replace(/'/g, "''");
+      await execCommand("fontforge", ["-lang=ff", "-c", `Open('${escInput}'); Generate('${escOutput}')`], undefined, {
+        signal,
+      });
+      return await readFile(outputPath);
+    } catch (err: unknown) {
+      const error = err as NodeJS.ErrnoException & { killed?: boolean; signal?: string };
+      // Detect resource limit kills from prlimit (SIGKILL = OOM, SIGXCPU = CPU time exceeded)
+      if (error.killed || error.signal === "SIGKILL" || error.signal === "SIGXCPU") {
+        logger.warn({ err, inputExt, outputExt }, "FontForge killed by resource limits");
+        throwProcessing("resource-limit-exceeded", "Font processing exceeded resource limits");
+      }
+      logger.warn({ err, inputExt, outputExt }, "FontForge conversion failed");
+      return null;
+    }
+  });
+}
+
+async function ttfToOtf(input: FileInput, signal?: AbortSignal): Promise<Buffer | null> {
+  return fontConvert(".ttf", ".otf", input, signal);
+}
+
+async function otfToTtf(input: FileInput, signal?: AbortSignal): Promise<Buffer | null> {
+  return fontConvert(".otf", ".ttf", input, signal);
+}
+
+async function sfntToWoff(input: FileInput, ext: string = ".ttf", signal?: AbortSignal): Promise<Buffer | null> {
+  return withTempInput(ext, input, async (dir, inputPath) => {
+    try {
+      await execCommand("sfnt2woff", [inputPath], undefined, { signal });
+      const output = join(dir, "input.woff");
+      return await readFile(output);
+    } catch (err: unknown) {
+      const error = err as NodeJS.ErrnoException & { killed?: boolean; signal?: string };
+      if (error.killed || error.signal === "SIGKILL" || error.signal === "SIGXCPU") {
+        logger.warn({ err }, "sfnt2woff killed by resource limits");
+        throwProcessing("resource-limit-exceeded", "Font processing exceeded resource limits");
+      }
+      logger.warn({ err }, "sfnt2woff conversion failed");
+      return null;
+    }
+  });
+}
+
+async function woffToSfnt(input: FileInput, signal?: AbortSignal): Promise<Buffer | null> {
+  return withTempInput(".woff", input, async (_dir, inputPath) => {
+    try {
+      const { stdout } = await execCommand("woff2sfnt", [inputPath], undefined, { encoding: "buffer", signal });
+      return stdout as Buffer;
+    } catch (err: unknown) {
+      const error = err as NodeJS.ErrnoException & { killed?: boolean; signal?: string };
+      if (error.killed || error.signal === "SIGKILL" || error.signal === "SIGXCPU") {
+        logger.warn({ err }, "woff2sfnt killed by resource limits");
+        throwProcessing("resource-limit-exceeded", "Font processing exceeded resource limits");
+      }
+      logger.warn({ err }, "woff2sfnt conversion failed");
+      return null;
+    }
+  });
+}
+
+async function woff2ToSfnt(input: FileInput, signal?: AbortSignal): Promise<Buffer | null> {
+  return withTempInput(".woff2", input, async (dir, inputPath) => {
+    const output = join(dir, "input.ttf");
+    try {
+      await execCommand("woff2_decompress", [inputPath], undefined, { signal });
+      return await readFile(output);
+    } catch (err: unknown) {
+      const error = err as NodeJS.ErrnoException & { killed?: boolean; signal?: string };
+      if (error.killed || error.signal === "SIGKILL" || error.signal === "SIGXCPU") {
+        logger.warn({ err }, "woff2_decompress killed by resource limits");
+        throwProcessing("resource-limit-exceeded", "Font processing exceeded resource limits");
+      }
+      logger.warn({ err }, "woff2_decompress failed");
+      return null;
+    }
+  });
+}
+
+function getSfntType(data: Buffer): "ttf" | "otf" {
+  const magic = data.subarray(0, 4).toString("hex");
+  switch (magic) {
+    case "4f54544f":
+      return "otf";
+    case "00010000":
+      return "ttf";
+    default:
+      throwValidation("invalid-font", "Unrecognized font format");
+  }
+}
+
+async function convertFromSfnt(sfnt: Buffer, targetType: string, signal?: AbortSignal): Promise<Buffer | null> {
+  if (targetType === "ttf") {
+    const stype = getSfntType(sfnt);
+    if (stype === "ttf") return sfnt;
+    return otfToTtf(sfnt, signal);
+  }
+  if (targetType === "otf") {
+    const stype = getSfntType(sfnt);
+    if (stype === "otf") return sfnt;
+    return ttfToOtf(sfnt, signal);
+  }
+  if (targetType === "woff") {
+    return sfntToWoff(sfnt, ".ttf", signal);
+  }
+  return null;
+}
+
+function validateFontSignature(data: Buffer, expectedType: string): void {
+  if (data.length < 4) {
+    throwValidation("invalid-font", "Font data too short");
+  }
+
+  const magic = data.subarray(0, 4).toString("hex");
+
+  switch (expectedType) {
+    case "ttf":
+      if (magic !== "00010000") {
+        throwValidation("invalid-font", "Invalid TTF signature");
+      }
+      break;
+    case "otf":
+      if (magic !== "4f54544f") {
+        throwValidation("invalid-font", "Invalid OTF signature");
+      }
+      break;
+    case "woff":
+      if (magic !== "774f4646") {
+        throwValidation("invalid-font", "Invalid WOFF signature");
+      }
+      break;
+    case "woff2":
+      if (magic !== "774f4632") {
+        throwValidation("invalid-font", "Invalid WOFF2 signature");
+      }
+      break;
+  }
+}
+
+export async function convertFont(
+  input: FileInput,
+  sourceMtype: string,
+  targetMtype: string,
+  signal?: AbortSignal
+): Promise<Buffer | null> {
+  const sourceType = sourceMtype.replace("font/", "");
+  const targetType = targetMtype.replace("font/", "");
+
+  // Same type: validate signature and return data as-is
+  if (sourceType === targetType) {
+    let data: Buffer;
+    if (typeof input === "string") {
+      data = await readFile(input);
+    } else {
+      data = input;
+    }
+    validateFontSignature(data, sourceType);
+    return data;
+  }
+
+  // Source is TTF
+  if (sourceType === "ttf") {
+    if (targetType === "otf") return ttfToOtf(input, signal);
+    if (targetType === "woff") return sfntToWoff(input, ".ttf", signal);
+    return null;
+  }
+
+  // Source is OTF
+  if (sourceType === "otf") {
+    if (targetType === "ttf") return otfToTtf(input, signal);
+    if (targetType === "woff") return sfntToWoff(input, ".otf", signal);
+    return null;
+  }
+
+  // Source is WOFF: extract sfnt first, then convert
+  if (sourceType === "woff") {
+    const sfnt = await woffToSfnt(input, signal);
+    if (!sfnt) {
+      throwValidation("invalid-font", "Could not extract SFNT from WOFF");
+    }
+    return convertFromSfnt(sfnt, targetType, signal);
+  }
+
+  // Source is WOFF2: decompress to sfnt, then convert
+  const sfnt = await woff2ToSfnt(input, signal);
+  if (!sfnt) {
+    throwValidation("invalid-font", "Could not decompress WOFF2");
+  }
+  return convertFromSfnt(sfnt, targetType, signal);
+}
diff --git a/media-processor/src/services/image.ts b/media-processor/src/services/image.ts
new file mode 100644
index 0000000000..302f41ddf5
--- /dev/null
+++ b/media-processor/src/services/image.ts
@@ -0,0 +1,204 @@
+import sharp from "sharp";
+import type { FileInput, ImageInfo, ThumbnailParams } from "../types.js";
+import { throwValidation, throwRestriction } from "./errors.js";
+import { createLogger } from "../logger.js";
+
+const logger = createLogger("image");
+
+const SUPPORTED_MIMES = new Set(["image/jpeg", "image/png", "image/webp", "image/gif"]);
+
+function orientationSwapDimensions(
+  width: number,
+  height: number,
+  orientation: number
+): { width: number; height: number } {
+  if (orientation === 6 || orientation === 8) {
+    return { width: height, height: width };
+  }
+  return { width, height };
+}
+
+let imageMaxPixels = 128_000_000;
+let imageMaxWidth = 16384;
+let imageMaxHeight = 16384;
+
+export function configureImageLimits(opts: { maxPixels: number; maxWidth: number; maxHeight: number }): void {
+  imageMaxPixels = opts.maxPixels;
+  imageMaxWidth = opts.maxWidth;
+  imageMaxHeight = opts.maxHeight;
+}
+
+function validateImageDimensions(width: number, height: number): void {
+  if (width > imageMaxWidth || height > imageMaxHeight) {
+    throwRestriction(
+      "image-dimensions-exceeded",
+      `Image dimensions ${width}x${height} exceed maximum ${imageMaxWidth}x${imageMaxHeight}`
+    );
+  }
+  const pixels = width * height;
+  if (pixels > imageMaxPixels) {
+    throwRestriction("image-pixel-count-exceeded", `Image pixel count ${pixels} exceeds maximum ${imageMaxPixels}`);
+  }
+}
+
+function validateOutputDimensions(width: number, height: number): void {
+  if (width > imageMaxWidth || height > imageMaxHeight) {
+    throwRestriction(
+      "output-dimensions-exceeded",
+      `Requested output dimensions ${width}x${height} exceed maximum ${imageMaxWidth}x${imageMaxHeight}`
+    );
+  }
+  const pixels = width * height;
+  if (pixels > imageMaxPixels) {
+    throwRestriction(
+      "output-pixel-count-exceeded",
+      `Requested output pixel count ${pixels} exceeds maximum ${imageMaxPixels}`
+    );
+  }
+}
+
+export async function getImageInfo(input: FileInput, size: number, signal?: AbortSignal): Promise<ImageInfo> {
+  if (signal?.aborted) {
+    throw new Error("Request cancelled");
+  }
+
+  let metadata;
+  try {
+    metadata = await sharp(input).metadata();
+  } catch (err) {
+    throwValidation("invalid-image", `Failed to decode image: ${(err as Error).message}`);
+  }
+
+  if (!metadata.width || !metadata.height) {
+    throwValidation("invalid-image", "Could not read image dimensions");
+  }
+
+  const mtype = metadata.format ? `image/${metadata.format}` : undefined;
+  if (!mtype || !SUPPORTED_MIMES.has(mtype)) {
+    throwValidation("invalid-image", `Unsupported image format: ${metadata.format}`);
+  }
+
+  const orientation = metadata.orientation ?? 1;
+  const { width, height } = orientationSwapDimensions(metadata.width!, metadata.height!, orientation);
+
+  validateImageDimensions(width, height);
+
+  logger.debug({ width, height, mtype: mtype!, size }, "Image info extracted");
+
+  return {
+    width,
+    height,
+    mtype: mtype!,
+    size,
+    orientation,
+  };
+}
+
+const FORMAT_MIMES: Record<string, string> = {
+  jpeg: "image/jpeg",
+  webp: "image/webp",
+  png: "image/png",
+};
+
+export async function generateThumbnail(
+  input: FileInput,
+  params: ThumbnailParams,
+  signal?: AbortSignal
+): Promise<{ data: Buffer; mtype: string }> {
+  // Check if request was cancelled before starting
+  if (signal?.aborted) {
+    throw new Error("Request cancelled");
+  }
+
+  // Pre-validate source image dimensions using the same sharp instance
+  // that will be used for the resize pipeline. Sharp reads metadata
+  // (dimensions, orientation) from the image header without fully decoding
+  // the pixel data, then reuses the instance for the resize operations.
+  const source = sharp(input);
+  let srcMeta;
+  try {
+    srcMeta = await source.metadata();
+  } catch (err) {
+    throwValidation("invalid-image", `Failed to decode image: ${(err as Error).message}`);
+  }
+
+  // Check again after metadata read
+  if (signal?.aborted) {
+    throw new Error("Request cancelled");
+  }
+
+  if (srcMeta.width == null || srcMeta.height == null) {
+    throwValidation("invalid-image", "Could not read source image dimensions");
+  }
+
+  // Validate source image format
+  if (srcMeta.format && !SUPPORTED_MIMES.has(`image/${srcMeta.format}`)) {
+    throwValidation("unsupported-image-format", `Unsupported image format: ${srcMeta.format}`);
+  }
+
+  const orientation = srcMeta.orientation ?? 1;
+  const { width: displayWidth, height: displayHeight } = orientationSwapDimensions(
+    srcMeta.width,
+    srcMeta.height,
+    orientation
+  );
+  validateImageDimensions(displayWidth, displayHeight);
+
+  // Validate requested output dimensions (important for crop mode which can enlarge)
+  validateOutputDimensions(params.width, params.height);
+
+  logger.debug(
+    { width: params.width, height: params.height, format: params.format, mode: params.mode },
+    "Generating thumbnail"
+  );
+
+  let pipeline = source.rotate();
+
+  // Only flatten for JPEG output (which doesn't support transparency).
+  // PNG and WebP support alpha, so preserve it.
+  if (params.format === "jpeg") {
+    pipeline = pipeline.flatten({ background: { r: 255, g: 255, b: 255 } });
+  }
+
+  if (params.mode === "fit") {
+    pipeline = pipeline.resize(params.width, params.height, {
+      fit: "inside",
+      withoutEnlargement: true,
+    });
+  } else {
+    pipeline = pipeline.resize(params.width, params.height, {
+      fit: "cover",
+      position: "center",
+    });
+  }
+
+  switch (params.format) {
+    case "jpeg":
+      pipeline = pipeline.jpeg({ quality: params.quality });
+      break;
+    case "webp":
+      pipeline = pipeline.webp({ quality: params.quality });
+      break;
+    case "png":
+      pipeline = pipeline.png();
+      break;
+  }
+
+  let data: Buffer;
+  try {
+    // Sharp 0.35.3 does not support cancellation of native libvips operations.
+    // toBuffer() only accepts { resolveWithObject: boolean }, no AbortSignal.
+    // We hold the queue slot until Sharp completes fully, then check signal
+    // to throw if the request was cancelled during processing. This prevents
+    // concurrency limit violations and handles timeouts gracefully.
+    data = await pipeline.toBuffer();
+  } catch (err) {
+    throwValidation("invalid-image", `Failed to process image: ${(err as Error).message}`);
+  }
+
+  if (signal?.aborted) {
+    throw new Error("Request cancelled");
+  }
+
+  return { data, mtype: FORMAT_MIMES[params.format] };
+}
diff --git a/media-processor/src/types.ts b/media-processor/src/types.ts
new file mode 100644
index 0000000000..22c702f5f7
--- /dev/null
+++ b/media-processor/src/types.ts
@@ -0,0 +1,44 @@
+export type FileInput = Buffer | string;
+
+export interface AppConfig {
+  port: number;
+  host: string;
+  maxConcurrentRequests: number;
+  requestTimeout: number;
+  maxFileSize: number;
+  memoryThreshold: number;
+  imageMaxPixels: number;
+  imageMaxWidth: number;
+  imageMaxHeight: number;
+  fontProcessMem: number;
+  fontProcessCpuTime: number;
+  fontTimeout: number;
+  sharedKey: string | null;
+  logLevel: string;
+  lokiUri: string | null;
+  lokiJob: string;
+  lokiEnvironment: string | null;
+  lokiInstance: string | null;
+}
+
+export interface ImageInfo {
+  width: number;
+  height: number;
+  mtype: string;
+  size: number;
+  orientation: number;
+}
+
+export interface ThumbnailParams {
+  width: number;
+  height: number;
+  quality: number;
+  format: "jpeg" | "webp" | "png";
+  mode: "fit" | "crop";
+}
+
+export interface AppError {
+  type: "validation" | "restriction" | "internal";
+  code: string;
+  hint?: string;
+}
diff --git a/media-processor/src/upload-storage.ts b/media-processor/src/upload-storage.ts
new file mode 100644
index 0000000000..1677e3efe7
--- /dev/null
+++ b/media-processor/src/upload-storage.ts
@@ -0,0 +1,89 @@
+import multer from "multer";
+import { mkdtemp, rm } from "node:fs/promises";
+import { createWriteStream } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { randomBytes } from "node:crypto";
+import type { Request } from "express";
+
+interface HybridStorageOptions {
+  memoryThreshold: number;
+}
+
+interface FileInfo {
+  destination: string;
+  filename: string;
+  path: string;
+  size: number;
+}
+
+function getContentLength(req: Request): number {
+  const cl = req.headers["content-length"];
+  if (!cl) return -1;
+  const parsed = parseInt(cl, 10);
+  return isNaN(parsed) ? -1 : parsed;
+}
+
+export function createHybridStorage(opts: HybridStorageOptions): multer.StorageEngine {
+  const memoryStorage = multer.memoryStorage();
+
+  let tempDirPromise: Promise<string> | null = null;
+
+  async function ensureTempDir(): Promise<string> {
+    if (!tempDirPromise) {
+      tempDirPromise = mkdtemp(join(tmpdir(), "penpot.upload."));
+    }
+    return tempDirPromise;
+  }
+
+  return {
+    _handleFile(req: Request, file: Express.Multer.File, cb: (error?: any, info?: Partial<FileInfo>) => void): void {
+      const contentLength = getContentLength(req);
+      const useDisk = contentLength < 0 || contentLength >= opts.memoryThreshold;
+
+      if (!useDisk) {
+        memoryStorage._handleFile(req, file, cb);
+        return;
+      }
+
+      ensureTempDir()
+        .then((dir) => {
+          const filename = `${randomBytes(16).toString("hex")}${getExt(file.originalname)}`;
+          const filepath = join(dir, filename);
+
+          const ws = createWriteStream(filepath);
+
+          file.stream.pipe(ws);
+
+          ws.on("error", (err: Error) => {
+            cb(err);
+          });
+
+          ws.on("finish", () => {
+            cb(null, {
+              destination: dir,
+              filename,
+              path: filepath,
+              size: ws.bytesWritten,
+            });
+          });
+        })
+        .catch(cb);
+    },
+
+    _removeFile(req: Request, file: Express.Multer.File & { path?: string }, cb: (error: Error | null) => void): void {
+      if (file.path) {
+        rm(file.path, { force: true })
+          .then(() => cb(null))
+          .catch(() => cb(null));
+      } else {
+        cb(null);
+      }
+    },
+  };
+}
+
+function getExt(filename: string): string {
+  const dot = filename.lastIndexOf(".");
+  return dot >= 0 ? filename.substring(dot) : "";
+}
diff --git a/media-processor/src/upload.ts b/media-processor/src/upload.ts
new file mode 100644
index 0000000000..3ba22fb899
--- /dev/null
+++ b/media-processor/src/upload.ts
@@ -0,0 +1,50 @@
+import multer from "multer";
+import { readFile } from "node:fs/promises";
+import { createHybridStorage } from "./upload-storage.js";
+import type { Request } from "express";
+import type { FileInput } from "./types.js";
+
+let _upload: multer.Multer | null = null;
+
+// Hybrid storage: small uploads (< memoryThreshold) buffered in RAM for speed;
+// large uploads streamed to disk to avoid heap pressure.
+// Default threshold is 10MB. Disk files are cleaned up after response finishes.
+export function configureUploadLimits(opts: { maxFileSize: number; memoryThreshold: number }): void {
+  const storage = createHybridStorage({ memoryThreshold: opts.memoryThreshold });
+
+  _upload = multer({
+    storage,
+    limits: { fileSize: opts.maxFileSize },
+  });
+}
+
+export function getUpload(): multer.Multer {
+  if (!_upload) {
+    throw new Error("Upload not configured — call configureUploadLimits first");
+  }
+  return _upload;
+}
+
+// Returns file input suitable for sharp and font processing.
+// For disk-stored files, returns the file path (libvips uses mmap).
+// For memory-stored files, returns the buffer.
+export function getFileInput(file: Express.Multer.File): FileInput {
+  if (file.path) {
+    return file.path;
+  }
+  if (file.buffer) {
+    return file.buffer;
+  }
+  throw new Error("File has no buffer or path");
+}
+
+// Returns file contents as Buffer regardless of storage backend (memory or disk).
+export async function getFileBuffer(file: Express.Multer.File): Promise<Buffer> {
+  if (file.buffer) {
+    return file.buffer;
+  }
+  if (file.path) {
+    return readFile(file.path);
+  }
+  throw new Error("File has no buffer or path");
+}
diff --git a/media-processor/test/config.test.ts b/media-processor/test/config.test.ts
new file mode 100644
index 0000000000..019cbd4947
--- /dev/null
+++ b/media-processor/test/config.test.ts
@@ -0,0 +1,130 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { loadConfig } from "../src/config.js";
+
+describe("loadConfig", () => {
+  const originalEnv = process.env;
+
+  beforeEach(() => {
+    process.env = { ...originalEnv };
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+  });
+
+  it("uses defaults when env vars not set", () => {
+    const config = loadConfig();
+    expect(config.port).toBe(6065);
+    expect(config.host).toBe("0.0.0.0");
+    expect(config.maxConcurrentRequests).toBe(10);
+    expect(config.requestTimeout).toBe(180000);
+    expect(config.maxFileSize).toBe(367001600);
+    expect(config.memoryThreshold).toBe(10485760);
+  });
+
+  it("accepts valid config with all fields set", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_PORT = "8080";
+    process.env.PENPOT_MEDIA_PROCESSOR_HOST = "127.0.0.1";
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS = "20";
+    process.env.PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT = "30000";
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_FILE_SIZE = "104857600";
+    process.env.PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD = "5242880";
+    process.env.PENPOT_MEDIA_PROCESSOR_SHARED_KEY = "test-key";
+
+    const config = loadConfig();
+    expect(config.port).toBe(8080);
+    expect(config.host).toBe("127.0.0.1");
+    expect(config.maxConcurrentRequests).toBe(20);
+    expect(config.requestTimeout).toBe(30000);
+    expect(config.maxFileSize).toBe(104857600);
+    expect(config.memoryThreshold).toBe(5242880);
+    expect(config.sharedKey).toBe("test-key");
+  });
+
+  it("rejects concurrency=0", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS = "0";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative concurrency", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS = "-5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects fractional concurrency", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS = "2.5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative timeout", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT = "-1000";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects fractional timeout", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT = "1000.5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects fractional port", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_PORT = "8080.5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative port", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_PORT = "-8080";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative max file size", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_FILE_SIZE = "-100";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative memory threshold", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD = "-100";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative image max pixels", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_PIXELS = "-100";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects fractional image max width", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_WIDTH = "100.5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects fractional image max height", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_IMAGE_MAX_HEIGHT = "100.5";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative font process mem", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_MEM = "-512";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative font process cpu time", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_FONT_PROCESS_CPU_TIME = "-30";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("rejects negative font timeout", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_FONT_TIMEOUT = "-120000";
+    expect(() => loadConfig()).toThrow();
+  });
+
+  it("accepts concurrency=1 (minimum valid)", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_MAX_CONCURRENT_REQUESTS = "1";
+    const config = loadConfig();
+    expect(config.maxConcurrentRequests).toBe(1);
+  });
+
+  it("accepts timeout=0 (edge case, might be valid for testing)", () => {
+    process.env.PENPOT_MEDIA_PROCESSOR_REQUEST_TIMEOUT = "0";
+    const config = loadConfig();
+    expect(config.requestTimeout).toBe(0);
+  });
+});
diff --git a/media-processor/test/fixtures/font-1.otf b/media-processor/test/fixtures/font-1.otf
new file mode 100644
index 0000000000..9326ec7844
Binary files /dev/null and b/media-processor/test/fixtures/font-1.otf differ
diff --git a/media-processor/test/fixtures/font-1.ttf b/media-processor/test/fixtures/font-1.ttf
new file mode 100644
index 0000000000..cb2f335971
Binary files /dev/null and b/media-processor/test/fixtures/font-1.ttf differ
diff --git a/media-processor/test/fixtures/font-1.woff b/media-processor/test/fixtures/font-1.woff
new file mode 100644
index 0000000000..9607e1e194
Binary files /dev/null and b/media-processor/test/fixtures/font-1.woff differ
diff --git a/media-processor/test/fixtures/font-1.woff2 b/media-processor/test/fixtures/font-1.woff2
new file mode 100644
index 0000000000..492d463d90
Binary files /dev/null and b/media-processor/test/fixtures/font-1.woff2 differ
diff --git a/media-processor/test/font.test.ts b/media-processor/test/font.test.ts
new file mode 100644
index 0000000000..cb0a462801
--- /dev/null
+++ b/media-processor/test/font.test.ts
@@ -0,0 +1,310 @@
+import { describe, it, expect, beforeAll } from "vitest";
+import { readFile, writeFile, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { convertFont, execCommand } from "../src/services/font.js";
+import { ProcessingError } from "../src/middleware/error-handler.js";
+
+const FIXTURES = join(import.meta.dirname, "fixtures");
+
+let ttfData: Buffer;
+let otfData: Buffer;
+let woffData: Buffer;
+let woff2Data: Buffer;
+
+beforeAll(async () => {
+  [ttfData, otfData, woffData, woff2Data] = await Promise.all([
+    readFile(join(FIXTURES, "font-1.ttf")),
+    readFile(join(FIXTURES, "font-1.otf")),
+    readFile(join(FIXTURES, "font-1.woff")),
+    readFile(join(FIXTURES, "font-1.woff2")),
+  ]);
+});
+
+describe("convertFont", () => {
+  describe("sourceType=ttf", () => {
+    it("ttf→ttf returns the input buffer unchanged", async () => {
+      const result = await convertFont(ttfData, "font/ttf", "font/ttf");
+      expect(result).toBe(ttfData);
+    });
+
+    it("ttf→otf returns non-null Buffer", async () => {
+      const result = await convertFont(ttfData, "font/ttf", "font/otf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("ttf→woff returns non-null Buffer", async () => {
+      const result = await convertFont(ttfData, "font/ttf", "font/woff");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe("sourceType=otf", () => {
+    it("otf→otf returns the input buffer unchanged", async () => {
+      const result = await convertFont(otfData, "font/otf", "font/otf");
+      expect(result).toBe(otfData);
+    });
+
+    it("otf→ttf returns non-null Buffer", async () => {
+      const result = await convertFont(otfData, "font/otf", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("otf→woff returns non-null Buffer", async () => {
+      const result = await convertFont(otfData, "font/otf", "font/woff");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe("sourceType=woff", () => {
+    it("woff→woff returns the input buffer unchanged", async () => {
+      const result = await convertFont(woffData, "font/woff", "font/woff");
+      expect(result).toBe(woffData);
+    });
+
+    it("woff→ttf returns non-null Buffer", async () => {
+      const result = await convertFont(woffData, "font/woff", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("woff→otf returns Buffer or null (FontForge limitation)", async () => {
+      const result = await convertFont(woffData, "font/woff", "font/otf");
+      // FontForge may fail to convert TTF-based WOFF to OTF for some fonts.
+      // The backend handles null gracefully (variant is just absent).
+      if (result !== null) {
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result.length).toBeGreaterThan(0);
+      }
+    });
+  });
+
+  describe("sourceType=woff2", () => {
+    it("woff2→ttf returns non-null Buffer", async () => {
+      const result = await convertFont(woff2Data, "font/woff2", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("woff2→otf returns non-null Buffer", async () => {
+      const result = await convertFont(woff2Data, "font/woff2", "font/otf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("woff2→woff returns non-null Buffer", async () => {
+      const result = await convertFont(woff2Data, "font/woff2", "font/woff");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe("invalid input", () => {
+    it("woff with garbage data throws ProcessingError", async () => {
+      const garbage = Buffer.from("not a font at all");
+      await expect(convertFont(garbage, "font/woff", "font/ttf")).rejects.toThrow(ProcessingError);
+    });
+
+    it("woff2 with garbage data throws ProcessingError", async () => {
+      const garbage = Buffer.from("not a font at all");
+      await expect(convertFont(garbage, "font/woff2", "font/ttf")).rejects.toThrow(ProcessingError);
+    });
+
+    it("sfnt with garbage data throws validation error", async () => {
+      const garbage = Buffer.from("not a font at all");
+      try {
+        await convertFont(garbage, "font/woff", "font/ttf");
+        expect.fail("should have thrown");
+      } catch (err) {
+        expect(err).toBeInstanceOf(ProcessingError);
+        const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+        expect(pe.statusCode).toBe(400);
+        expect(pe.errorBody.code).toBe("invalid-font");
+      }
+    });
+
+    it("ttf→ttf with invalid magic bytes throws validation error", async () => {
+      const invalidTtf = Buffer.from("00000000", "hex");
+      try {
+        await convertFont(invalidTtf, "font/ttf", "font/ttf");
+        expect.fail("should have thrown");
+      } catch (err) {
+        expect(err).toBeInstanceOf(ProcessingError);
+        const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+        expect(pe.statusCode).toBe(400);
+        expect(pe.errorBody.code).toBe("invalid-font");
+      }
+    });
+
+    it("otf→otf with invalid magic bytes throws validation error", async () => {
+      const invalidOtf = Buffer.from("00000000", "hex");
+      try {
+        await convertFont(invalidOtf, "font/otf", "font/otf");
+        expect.fail("should have thrown");
+      } catch (err) {
+        expect(err).toBeInstanceOf(ProcessingError);
+        const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+        expect(pe.statusCode).toBe(400);
+        expect(pe.errorBody.code).toBe("invalid-font");
+      }
+    });
+
+    it("woff→woff with invalid magic bytes throws validation error", async () => {
+      const invalidWoff = Buffer.from("00000000", "hex");
+      try {
+        await convertFont(invalidWoff, "font/woff", "font/woff");
+        expect.fail("should have thrown");
+      } catch (err) {
+        expect(err).toBeInstanceOf(ProcessingError);
+        const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+        expect(pe.statusCode).toBe(400);
+        expect(pe.errorBody.code).toBe("invalid-font");
+      }
+    });
+
+    it("woff2→woff2 with invalid magic bytes throws validation error", async () => {
+      const invalidWoff2 = Buffer.from("00000000", "hex");
+      try {
+        await convertFont(invalidWoff2, "font/woff2", "font/woff2");
+        expect.fail("should have thrown");
+      } catch (err) {
+        expect(err).toBeInstanceOf(ProcessingError);
+        const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+        expect(pe.statusCode).toBe(400);
+        expect(pe.errorBody.code).toBe("invalid-font");
+      }
+    });
+  });
+
+  describe("data integrity", () => {
+    it("ttf→otf produces valid font buffer", async () => {
+      const result = await convertFont(ttfData, "font/ttf", "font/otf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("otf→ttf produces valid font buffer", async () => {
+      const result = await convertFont(otfData, "font/otf", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+
+    it("woff→ttf produces valid SFNT with correct magic bytes", async () => {
+      const result = await convertFont(woffData, "font/woff", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+      // SFNT magic: 00010000 (TTF) or 4f54544f (OTF/CFF)
+      const magic = result!.subarray(0, 4).toString("hex");
+      expect(["00010000", "4f54544f"]).toContain(magic);
+    });
+
+    it("woff2→ttf produces valid font buffer", async () => {
+      const result = await convertFont(woff2Data, "font/woff2", "font/ttf");
+      expect(result).toBeInstanceOf(Buffer);
+      expect(result!.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe("file path input", () => {
+    it("ttf→otf with file path returns non-null Buffer", async () => {
+      const tempPath = join(tmpdir(), `test-font-${Date.now()}.ttf`);
+      try {
+        await writeFile(tempPath, ttfData);
+        const result = await convertFont(tempPath, "font/ttf", "font/otf");
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result!.length).toBeGreaterThan(0);
+      } finally {
+        await rm(tempPath, { force: true });
+      }
+    });
+
+    it("ttf→ttf with file path returns file contents as Buffer", async () => {
+      const tempPath = join(tmpdir(), `test-font-${Date.now()}.ttf`);
+      try {
+        await writeFile(tempPath, ttfData);
+        const result = await convertFont(tempPath, "font/ttf", "font/ttf");
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result!.length).toBe(ttfData.length);
+      } finally {
+        await rm(tempPath, { force: true });
+      }
+    });
+
+    it("woff→ttf with file path returns non-null Buffer", async () => {
+      const tempPath = join(tmpdir(), `test-font-${Date.now()}.woff`);
+      try {
+        await writeFile(tempPath, woffData);
+        const result = await convertFont(tempPath, "font/woff", "font/ttf");
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result!.length).toBeGreaterThan(0);
+      } finally {
+        await rm(tempPath, { force: true });
+      }
+    });
+
+    it("ttf→woff with file path returns non-null Buffer", async () => {
+      const tempPath = join(tmpdir(), `test-font-${Date.now()}.ttf`);
+      try {
+        await writeFile(tempPath, ttfData);
+        const result = await convertFont(tempPath, "font/ttf", "font/woff");
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result!.length).toBeGreaterThan(0);
+      } finally {
+        await rm(tempPath, { force: true });
+      }
+    });
+
+    it("woff2→ttf with file path returns non-null Buffer", async () => {
+      const tempPath = join(tmpdir(), `test-font-${Date.now()}.woff2`);
+      try {
+        await writeFile(tempPath, woff2Data);
+        const result = await convertFont(tempPath, "font/woff2", "font/ttf");
+        expect(result).toBeInstanceOf(Buffer);
+        expect(result!.length).toBeGreaterThan(0);
+      } finally {
+        await rm(tempPath, { force: true });
+      }
+    });
+  });
+
+  describe("path validation", () => {
+    it("rejects string input path outside tmpdir", async () => {
+      const outsidePath = "/etc/passwd";
+      try {
+        await convertFont(outsidePath, "font/ttf", "font/otf");
+        expect.fail("should have thrown");
+      } catch (err) {
+        const error = err as Error;
+        expect(error.message).toContain("Font processing denied: input path is outside expected directory");
+      }
+    });
+  });
+});
+
+describe("execCommand", () => {
+  it("preserves killed and signal properties from child process errors", async () => {
+    try {
+      await execCommand("false", []);
+      expect.fail("should have thrown");
+    } catch (err) {
+      const error = err as Error & { killed?: boolean; signal?: string; code?: number };
+      expect(error).toBeInstanceOf(Error);
+      expect(error.message).toContain("Command failed");
+    }
+  });
+
+  it("preserves error properties when command is killed by signal", async () => {
+    try {
+      await execCommand("sh", ["-c", "kill -KILL $$"], 5000);
+      expect.fail("should have thrown");
+    } catch (err) {
+      const error = err as Error & { killed?: boolean; signal?: string };
+      expect(error).toBeInstanceOf(Error);
+      expect(error.signal).toBe("SIGKILL");
+    }
+  });
+});
diff --git a/media-processor/test/image.test.ts b/media-processor/test/image.test.ts
new file mode 100644
index 0000000000..b80d8ec3f5
--- /dev/null
+++ b/media-processor/test/image.test.ts
@@ -0,0 +1,909 @@
+import { describe, it, expect, afterEach } from "vitest";
+import { getImageInfo, generateThumbnail, configureImageLimits } from "../src/services/image.js";
+import { parseQuality } from "../src/routes/image.js";
+import { ProcessingError } from "../src/middleware/error-handler.js";
+import sharp from "sharp";
+import { writeFile, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+
+const DEFAULT_LIMITS = {
+  maxPixels: 128_000_000,
+  maxWidth: 16384,
+  maxHeight: 16384,
+};
+
+afterEach(() => {
+  configureImageLimits(DEFAULT_LIMITS);
+});
+
+describe("getImageInfo", () => {
+  it("returns correct info for a PNG", async () => {
+    const buffer = await sharp({
+      create: { width: 100, height: 80, channels: 4, background: { r: 255, g: 0, b: 0, alpha: 1 } },
+    })
+      .png()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.width).toBe(100);
+    expect(info.height).toBe(80);
+    expect(info.mtype).toBe("image/png");
+    expect(info.size).toBe(buffer.length);
+    expect(info.orientation).toBe(1);
+  });
+
+  it("returns correct info for a JPEG", async () => {
+    const buffer = await sharp({
+      create: { width: 200, height: 150, channels: 3, background: { r: 0, g: 255, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.width).toBe(200);
+    expect(info.height).toBe(150);
+    expect(info.mtype).toBe("image/jpeg");
+  });
+
+  it("returns correct info for a WebP", async () => {
+    const buffer = await sharp({
+      create: { width: 300, height: 250, channels: 3, background: { r: 0, g: 0, b: 255 } },
+    })
+      .webp()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.width).toBe(300);
+    expect(info.height).toBe(250);
+    expect(info.mtype).toBe("image/webp");
+  });
+
+  it("throws on invalid image data", async () => {
+    const buffer = Buffer.from("not an image");
+    await expect(getImageInfo(buffer, buffer.length)).rejects.toThrow();
+  });
+
+  it("returns correct info for a GIF", async () => {
+    // sharp create doesn't support GIF directly, so create PNG then convert
+    const pngBuffer = await sharp({
+      create: { width: 120, height: 90, channels: 3, background: { r: 200, g: 100, b: 50 } },
+    })
+      .png()
+      .toBuffer();
+
+    const gifBuffer = await sharp(pngBuffer).gif().toBuffer();
+    const info = await getImageInfo(gifBuffer, gifBuffer.length);
+    expect(info.width).toBe(120);
+    expect(info.height).toBe(90);
+    expect(info.mtype).toBe("image/gif");
+  });
+
+  it("returns size equal to buffer length", async () => {
+    const buffer = await sharp({
+      create: { width: 50, height: 50, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.size).toBe(buffer.length);
+  });
+
+  it("defaults orientation to 1 when no EXIF data", async () => {
+    const buffer = await sharp({
+      create: { width: 60, height: 40, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .png()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.orientation).toBe(1);
+  });
+
+  it("throws on garbage data (sharp unsupported format)", async () => {
+    const buffer = Buffer.alloc(100, 0xff);
+    await expect(getImageInfo(buffer, buffer.length)).rejects.toThrow();
+  });
+
+  it("accepts file path input and returns correct info", async () => {
+    const buffer = await sharp({
+      create: { width: 100, height: 80, channels: 3, background: { r: 0, g: 128, b: 255 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const tempPath = join(tmpdir(), `test-image-${Date.now()}.jpg`);
+    try {
+      await writeFile(tempPath, buffer);
+      const info = await getImageInfo(tempPath, buffer.length);
+      expect(info.width).toBe(100);
+      expect(info.height).toBe(80);
+      expect(info.mtype).toBe("image/jpeg");
+      expect(info.size).toBe(buffer.length);
+    } finally {
+      await rm(tempPath, { force: true });
+    }
+  });
+
+  it("throws restriction when width exceeds limit", async () => {
+    configureImageLimits({ maxPixels: 128_000_000, maxWidth: 100, maxHeight: 16384 });
+    const buffer = await sharp({
+      create: { width: 200, height: 50, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    try {
+      await getImageInfo(buffer, buffer.length);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("image-dimensions-exceeded");
+    }
+  });
+
+  it("throws restriction when height exceeds limit", async () => {
+    configureImageLimits({ maxPixels: 128_000_000, maxWidth: 16384, maxHeight: 100 });
+    const buffer = await sharp({
+      create: { width: 50, height: 200, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    try {
+      await getImageInfo(buffer, buffer.length);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("image-dimensions-exceeded");
+    }
+  });
+
+  it("throws restriction when pixel count exceeds limit", async () => {
+    configureImageLimits({ maxPixels: 1000, maxWidth: 16384, maxHeight: 16384 });
+    const buffer = await sharp({
+      create: { width: 50, height: 50, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    try {
+      await getImageInfo(buffer, buffer.length);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("image-pixel-count-exceeded");
+    }
+  });
+
+  it("passes when dimensions are exactly at the limit", async () => {
+    configureImageLimits({ maxPixels: 10000, maxWidth: 100, maxHeight: 100 });
+    const buffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const info = await getImageInfo(buffer, buffer.length);
+    expect(info.width).toBe(100);
+    expect(info.height).toBe(100);
+  });
+
+  it("throws when pixel count is exactly 1 over limit", async () => {
+    configureImageLimits({ maxPixels: 9999, maxWidth: 16384, maxHeight: 16384 });
+    const buffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 0, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    try {
+      await getImageInfo(buffer, buffer.length);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.errorBody.code).toBe("image-pixel-count-exceeded");
+    }
+  });
+
+  it("throws when signal is aborted before processing", async () => {
+    const buffer = await sharp({
+      create: { width: 100, height: 80, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .png()
+      .toBuffer();
+
+    const controller = new AbortController();
+    controller.abort();
+
+    try {
+      await getImageInfo(buffer, buffer.length, controller.signal);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(Error);
+      expect((err as Error).message).toBe("Request cancelled");
+    }
+  });
+});
+
+describe("generateThumbnail", () => {
+  const createImage = (w: number, h: number) =>
+    sharp({
+      create: { width: w, height: h, channels: 3, background: { r: 128, g: 128, b: 128 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+  it("mode=fit produces thumbnail fitting within dimensions (no upscale)", async () => {
+    const buffer = await createImage(1000, 800);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBeLessThanOrEqual(200);
+    expect(meta.height).toBeLessThanOrEqual(200);
+    expect(mtype).toBe("image/jpeg");
+  });
+
+  it("mode=crop produces center-cropped thumbnail at exact dimensions", async () => {
+    const buffer = await createImage(1000, 800);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "crop",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(200);
+    expect(meta.height).toBe(200);
+    expect(mtype).toBe("image/jpeg");
+  });
+
+  it("supports webp output", async () => {
+    const buffer = await createImage(500, 400);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 100,
+      height: 100,
+      quality: 80,
+      format: "webp",
+      mode: "fit",
+    });
+    expect(mtype).toBe("image/webp");
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBeLessThanOrEqual(100);
+  });
+
+  it("supports png output", async () => {
+    const buffer = await createImage(500, 400);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 100,
+      height: 100,
+      quality: 80,
+      format: "png",
+      mode: "fit",
+    });
+    expect(mtype).toBe("image/png");
+  });
+
+  it("fit mode does not upscale small source", async () => {
+    const buffer = await createImage(50, 40);
+    const { data } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(50);
+    expect(meta.height).toBe(40);
+  });
+
+  it("crop mode with non-square target", async () => {
+    const buffer = await createImage(1000, 500);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 100,
+      quality: 85,
+      format: "jpeg",
+      mode: "crop",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(200);
+    expect(meta.height).toBe(100);
+    expect(mtype).toBe("image/jpeg");
+  });
+
+  it("png output with crop mode", async () => {
+    const buffer = await createImage(800, 600);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 150,
+      height: 150,
+      quality: 80,
+      format: "png",
+      mode: "crop",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(150);
+    expect(meta.height).toBe(150);
+    expect(mtype).toBe("image/png");
+  });
+
+  it("webp output with crop mode", async () => {
+    const buffer = await createImage(800, 600);
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 150,
+      height: 150,
+      quality: 80,
+      format: "webp",
+      mode: "crop",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(150);
+    expect(meta.height).toBe(150);
+    expect(mtype).toBe("image/webp");
+  });
+
+  it("source at exact target dimensions (fit mode) returns same size", async () => {
+    const buffer = await createImage(200, 200);
+    const { data } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(200);
+    expect(meta.height).toBe(200);
+  });
+
+  it("source at exact target dimensions (crop mode) returns same size", async () => {
+    const buffer = await createImage(200, 200);
+    const { data } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "crop",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(200);
+    expect(meta.height).toBe(200);
+  });
+
+  it("very small source (1x1) with fit mode returns 1x1", async () => {
+    const buffer = await createImage(1, 1);
+    const { data } = await generateThumbnail(buffer, {
+      width: 200,
+      height: 200,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(1);
+    expect(meta.height).toBe(1);
+  });
+
+  it("throws restriction when source exceeds dimension limits", async () => {
+    configureImageLimits({ maxPixels: 1000, maxWidth: 50, maxHeight: 50 });
+    const buffer = await createImage(200, 200);
+
+    try {
+      await generateThumbnail(buffer, {
+        width: 100,
+        height: 100,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+    }
+  });
+
+  it("removes alpha channel from PNG source", async () => {
+    const pngBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 4, background: { r: 255, g: 0, b: 0, alpha: 0.5 } },
+    })
+      .png()
+      .toBuffer();
+
+    const { data } = await generateThumbnail(pngBuffer, {
+      width: 50,
+      height: 50,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    // JPEG output should not have alpha
+    expect(meta.channels).toBe(3);
+  });
+
+  it("composites transparent PNG onto white background for JPEG", async () => {
+    // Create a fully transparent PNG — removeAlpha() would produce black,
+    // but the local ImageMagick path composites onto white.
+    const pngBuffer = await sharp({
+      create: { width: 10, height: 10, channels: 4, background: { r: 0, g: 0, b: 0, alpha: 0 } },
+    })
+      .png()
+      .toBuffer();
+
+    const { data } = await generateThumbnail(pngBuffer, {
+      width: 10,
+      height: 10,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+
+    // Sample a pixel — should be white (255,255,255), not black (0,0,0)
+    const pixel = await sharp(data).raw().toBuffer();
+    const r = pixel[0];
+    const g = pixel[1];
+    const b = pixel[2];
+    expect(r).toBe(255);
+    expect(g).toBe(255);
+    expect(b).toBe(255);
+  });
+
+  it("GIF source works with thumbnail generation", async () => {
+    const pngBuffer = await sharp({
+      create: { width: 200, height: 200, channels: 3, background: { r: 100, g: 100, b: 100 } },
+    })
+      .png()
+      .toBuffer();
+
+    const gifBuffer = await sharp(pngBuffer).gif().toBuffer();
+    const { data, mtype } = await generateThumbnail(gifBuffer, {
+      width: 100,
+      height: 100,
+      quality: 85,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBeLessThanOrEqual(100);
+    expect(meta.height).toBeLessThanOrEqual(100);
+    expect(mtype).toBe("image/jpeg");
+  });
+
+  it("JPEG quality affects output file size", async () => {
+    // Create an image with actual detail (gradient) so quality matters
+    const width = 200;
+    const height = 200;
+    const channels = 3;
+    const rawBuffer = Buffer.alloc(width * height * channels);
+    for (let y = 0; y < height; y++) {
+      for (let x = 0; x < width; x++) {
+        const idx = (y * width + x) * channels;
+        rawBuffer[idx] = (x * 255) / width;
+        rawBuffer[idx + 1] = (y * 255) / height;
+        rawBuffer[idx + 2] = ((x + y) * 255) / (width + height);
+      }
+    }
+    const buffer = await sharp(rawBuffer, { raw: { width, height, channels } }).jpeg().toBuffer();
+
+    const low = await generateThumbnail(buffer, {
+      width: 100,
+      height: 100,
+      quality: 10,
+      format: "jpeg",
+      mode: "fit",
+    });
+    const high = await generateThumbnail(buffer, {
+      width: 100,
+      height: 100,
+      quality: 100,
+      format: "jpeg",
+      mode: "fit",
+    });
+    expect(low.data.length).toBeLessThan(high.data.length);
+  });
+
+  it("accepts quality=1 (minimum valid quality)", async () => {
+    const buffer = await sharp({
+      create: { width: 100, height: 80, channels: 3, background: { r: 128, g: 128, b: 128 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 50,
+      height: 40,
+      quality: 1,
+      format: "jpeg",
+      mode: "fit",
+    });
+    expect(data).toBeInstanceOf(Buffer);
+    expect(data.length).toBeGreaterThan(0);
+    expect(mtype).toBe("image/jpeg");
+  });
+
+  it("accepts file path input for thumbnail generation", async () => {
+    const buffer = await sharp({
+      create: { width: 100, height: 80, channels: 3, background: { r: 128, g: 128, b: 128 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const tempPath = join(tmpdir(), `test-image-${Date.now()}.jpg`);
+    try {
+      await writeFile(tempPath, buffer);
+      const { data, mtype } = await generateThumbnail(tempPath, {
+        width: 50,
+        height: 40,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      });
+      const meta = await sharp(data).metadata();
+      expect(meta.width).toBeLessThanOrEqual(50);
+      expect(meta.height).toBeLessThanOrEqual(40);
+      expect(mtype).toBe("image/jpeg");
+    } finally {
+      await rm(tempPath, { force: true });
+    }
+  });
+
+  it("throws validation error for unsupported source format (TIFF)", async () => {
+    const pngBuffer = await sharp({
+      create: { width: 100, height: 80, channels: 3, background: { r: 128, g: 128, b: 128 } },
+    })
+      .png()
+      .toBuffer();
+
+    const tiffBuffer = await sharp(pngBuffer).tiff().toBuffer();
+
+    try {
+      await generateThumbnail(tiffBuffer, {
+        width: 50,
+        height: 40,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(400);
+      expect(pe.errorBody.code).toBe("unsupported-image-format");
+    }
+  });
+
+  it("throws invalid-image for corrupted image data", async () => {
+    // Create corrupted image by truncating valid image
+    const validBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    // Truncate to create corrupted data
+    const corruptedBuffer = validBuffer.subarray(0, Math.floor(validBuffer.length / 2));
+
+    try {
+      await getImageInfo(corruptedBuffer, corruptedBuffer.length);
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(400);
+      expect(pe.errorBody.code).toBe("invalid-image");
+    }
+  });
+
+  it("throws invalid-image for truncated image data in generateThumbnail", async () => {
+    const validBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    // Truncate to create corrupted data
+    const corruptedBuffer = validBuffer.subarray(0, Math.floor(validBuffer.length / 2));
+
+    try {
+      await generateThumbnail(corruptedBuffer, {
+        width: 50,
+        height: 50,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(400);
+      expect(pe.errorBody.code).toBe("invalid-image");
+    }
+  });
+
+  it("preserves alpha channel in PNG output from transparent PNG", async () => {
+    // Create a transparent PNG with alpha < 1
+    const transparentPng = await sharp({
+      create: { width: 100, height: 100, channels: 4, background: { r: 255, g: 0, b: 0, alpha: 0.5 } },
+    })
+      .png()
+      .toBuffer();
+
+    const { data, mtype } = await generateThumbnail(transparentPng, {
+      width: 50,
+      height: 50,
+      quality: 85,
+      format: "png",
+      mode: "fit",
+    });
+
+    expect(mtype).toBe("image/png");
+    const meta = await sharp(data).metadata();
+    // PNG should preserve alpha channel (4 channels)
+    expect(meta.channels).toBe(4);
+  });
+
+  it("preserves alpha channel in WebP output from transparent PNG", async () => {
+    const transparentPng = await sharp({
+      create: { width: 100, height: 100, channels: 4, background: { r: 0, g: 255, b: 0, alpha: 0.5 } },
+    })
+      .png()
+      .toBuffer();
+
+    const { data, mtype } = await generateThumbnail(transparentPng, {
+      width: 50,
+      height: 50,
+      quality: 85,
+      format: "webp",
+      mode: "fit",
+    });
+
+    expect(mtype).toBe("image/webp");
+    const meta = await sharp(data).metadata();
+    // WebP should preserve alpha channel (4 channels)
+    expect(meta.channels).toBe(4);
+  });
+
+  it("preserves alpha channel in PNG output from transparent WebP", async () => {
+    // Create a transparent WebP
+    const transparentWebp = await sharp({
+      create: { width: 100, height: 100, channels: 4, background: { r: 0, g: 0, b: 255, alpha: 0.5 } },
+    })
+      .webp()
+      .toBuffer();
+
+    const { data, mtype } = await generateThumbnail(transparentWebp, {
+      width: 50,
+      height: 50,
+      quality: 85,
+      format: "png",
+      mode: "fit",
+    });
+
+    expect(mtype).toBe("image/png");
+    const meta = await sharp(data).metadata();
+    // PNG should preserve alpha channel (4 channels)
+    expect(meta.channels).toBe(4);
+  });
+
+  it("throws restriction when requested width exceeds limit (crop mode)", async () => {
+    configureImageLimits({ maxPixels: 128_000_000, maxWidth: 100, maxHeight: 16384 });
+    const buffer = await createImage(50, 50);
+
+    try {
+      await generateThumbnail(buffer, {
+        width: 200,
+        height: 50,
+        quality: 85,
+        format: "jpeg",
+        mode: "crop",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("output-dimensions-exceeded");
+    }
+  });
+
+  it("throws restriction when requested height exceeds limit (crop mode)", async () => {
+    configureImageLimits({ maxPixels: 128_000_000, maxWidth: 16384, maxHeight: 100 });
+    const buffer = await createImage(50, 50);
+
+    try {
+      await generateThumbnail(buffer, {
+        width: 50,
+        height: 200,
+        quality: 85,
+        format: "jpeg",
+        mode: "crop",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("output-dimensions-exceeded");
+    }
+  });
+
+  it("throws restriction when requested pixel count exceeds limit (crop mode)", async () => {
+    configureImageLimits({ maxPixels: 10000, maxWidth: 16384, maxHeight: 16384 });
+    const buffer = await createImage(50, 50);
+
+    try {
+      await generateThumbnail(buffer, {
+        width: 200,
+        height: 200,
+        quality: 85,
+        format: "jpeg",
+        mode: "crop",
+      });
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as import("../src/middleware/error-handler.js").ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.code).toBe("output-pixel-count-exceeded");
+    }
+  });
+
+  it("accepts requested dimensions at the limit (crop mode)", async () => {
+    configureImageLimits({ maxPixels: 10000, maxWidth: 100, maxHeight: 100 });
+    const buffer = await createImage(50, 50);
+
+    const { data, mtype } = await generateThumbnail(buffer, {
+      width: 100,
+      height: 100,
+      quality: 85,
+      format: "jpeg",
+      mode: "crop",
+    });
+
+    expect(mtype).toBe("image/jpeg");
+    const meta = await sharp(data).metadata();
+    expect(meta.width).toBe(100);
+    expect(meta.height).toBe(100);
+  });
+
+  it("throws when signal is aborted before processing", async () => {
+    const buffer = await createImage(100, 80);
+
+    const controller = new AbortController();
+    controller.abort();
+
+    try {
+      await generateThumbnail(
+        buffer,
+        {
+          width: 50,
+          height: 40,
+          quality: 85,
+          format: "jpeg",
+          mode: "fit",
+        },
+        controller.signal
+      );
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(Error);
+      expect((err as Error).message).toBe("Request cancelled");
+    }
+  });
+
+  it("aborts during toBuffer when signal fires", async () => {
+    const buffer = await createImage(2000, 2000);
+
+    const controller = new AbortController();
+    const signal = controller.signal;
+
+    const promise = generateThumbnail(
+      buffer,
+      {
+        width: 1000,
+        height: 1000,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      },
+      signal
+    );
+
+    setTimeout(() => controller.abort(), 10);
+
+    try {
+      await promise;
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(Error);
+      expect((err as Error).message).toBe("Request cancelled");
+    }
+  });
+
+  it("waits for Sharp to complete before checking signal", async () => {
+    const buffer = await createImage(100, 80);
+
+    const controller = new AbortController();
+    const signal = controller.signal;
+
+    const promise = generateThumbnail(
+      buffer,
+      {
+        width: 50,
+        height: 40,
+        quality: 85,
+        format: "jpeg",
+        mode: "fit",
+      },
+      signal
+    );
+
+    controller.abort();
+
+    try {
+      await promise;
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(Error);
+      expect((err as Error).message).toBe("Request cancelled");
+    }
+  });
+});
+
+describe("parseQuality", () => {
+  it("returns default when value is undefined", () => {
+    expect(parseQuality(undefined)).toBe(85);
+  });
+
+  it("returns default when value is empty string", () => {
+    expect(parseQuality("")).toBe(85);
+  });
+
+  it("returns default when value is not a number", () => {
+    expect(parseQuality("abc")).toBe(85);
+  });
+
+  it("returns parsed value when valid", () => {
+    expect(parseQuality("50")).toBe(50);
+  });
+
+  it("clamps quality=0 to 1 (minimum valid)", () => {
+    expect(parseQuality("0")).toBe(1);
+  });
+
+  it("preserves quality=1 (minimum valid)", () => {
+    expect(parseQuality("1")).toBe(1);
+  });
+
+  it("clamps quality=101 to 100 (maximum valid)", () => {
+    expect(parseQuality("101")).toBe(100);
+  });
+
+  it("preserves quality=100 (maximum valid)", () => {
+    expect(parseQuality("100")).toBe(100);
+  });
+
+  it("uses custom default value", () => {
+    expect(parseQuality(undefined, 75)).toBe(75);
+    expect(parseQuality("abc", 75)).toBe(75);
+  });
+});
diff --git a/media-processor/test/middleware.test.ts b/media-processor/test/middleware.test.ts
new file mode 100644
index 0000000000..f7b33c74f3
--- /dev/null
+++ b/media-processor/test/middleware.test.ts
@@ -0,0 +1,681 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { ProcessingError, errorHandler } from "../src/middleware/error-handler.js";
+import { sharedKeyAuth } from "../src/middleware/auth.js";
+import { timeoutMiddleware } from "../src/middleware/timeout.js";
+import { cleanupMiddleware } from "../src/middleware/cleanup.js";
+import { throwValidation, throwRestriction } from "../src/services/errors.js";
+import multer from "multer";
+import type { Request, Response, NextFunction } from "express";
+import { EventEmitter } from "node:events";
+
+function mockRes() {
+  const res = {
+    status: vi.fn().mockReturnThis(),
+    json: vi.fn().mockReturnThis(),
+    send: vi.fn().mockReturnThis(),
+    headersSent: false,
+  };
+  return res as unknown as Response;
+}
+
+function mockReq() {
+  return {} as Request;
+}
+
+describe("ProcessingError", () => {
+  it("stores statusCode", () => {
+    const err = new ProcessingError(400, {
+      type: "validation",
+      code: "test-error",
+    });
+    expect(err.statusCode).toBe(400);
+  });
+
+  it("stores errorBody", () => {
+    const body = { type: "validation" as const, code: "test-error", hint: "details" };
+    const err = new ProcessingError(400, body);
+    expect(err.errorBody).toEqual(body);
+  });
+
+  it("message defaults to code when no hint", () => {
+    const err = new ProcessingError(400, {
+      type: "validation",
+      code: "test-error",
+    });
+    expect(err.message).toBe("test-error");
+  });
+
+  it("message uses hint when provided", () => {
+    const err = new ProcessingError(400, {
+      type: "validation",
+      code: "test-error",
+      hint: "something went wrong",
+    });
+    expect(err.message).toBe("something went wrong");
+  });
+
+  it("is an instance of Error", () => {
+    const err = new ProcessingError(500, {
+      type: "internal",
+      code: "internal-error",
+    });
+    expect(err).toBeInstanceOf(Error);
+  });
+});
+
+describe("throwValidation", () => {
+  it("throws ProcessingError with status 400", () => {
+    try {
+      throwValidation("bad-input", "invalid value");
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as ProcessingError;
+      expect(pe.statusCode).toBe(400);
+      expect(pe.errorBody.type).toBe("validation");
+      expect(pe.errorBody.code).toBe("bad-input");
+      expect(pe.errorBody.hint).toBe("invalid value");
+    }
+  });
+
+  it("works without hint", () => {
+    try {
+      throwValidation("bad-input");
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as ProcessingError;
+      expect(pe.errorBody.hint).toBeUndefined();
+    }
+  });
+});
+
+describe("throwRestriction", () => {
+  it("throws ProcessingError with status 413", () => {
+    try {
+      throwRestriction("too-large", "file exceeds limit");
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as ProcessingError;
+      expect(pe.statusCode).toBe(413);
+      expect(pe.errorBody.type).toBe("restriction");
+      expect(pe.errorBody.code).toBe("too-large");
+      expect(pe.errorBody.hint).toBe("file exceeds limit");
+    }
+  });
+
+  it("works without hint", () => {
+    try {
+      throwRestriction("too-large");
+      expect.fail("should have thrown");
+    } catch (err) {
+      expect(err).toBeInstanceOf(ProcessingError);
+      const pe = err as ProcessingError;
+      expect(pe.errorBody.hint).toBeUndefined();
+    }
+  });
+});
+
+describe("errorHandler", () => {
+  let res: ReturnType<typeof mockRes>;
+  let next: NextFunction;
+
+  beforeEach(() => {
+    res = mockRes();
+    next = vi.fn();
+  });
+
+  it("handles ProcessingError (400 validation)", () => {
+    const err = new ProcessingError(400, {
+      type: "validation",
+      code: "bad-input",
+      hint: "invalid value",
+    });
+
+    errorHandler(err, mockReq(), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "validation",
+      code: "bad-input",
+      hint: "invalid value",
+    });
+  });
+
+  it("handles ProcessingError (413 restriction)", () => {
+    const err = new ProcessingError(413, {
+      type: "restriction",
+      code: "payload-too-large",
+    });
+
+    errorHandler(err, mockReq(), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(413);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "restriction",
+      code: "payload-too-large",
+    });
+  });
+
+  it("handles MulterError LIMIT_FILE_SIZE as 413", () => {
+    const err = new multer.MulterError("LIMIT_FILE_SIZE");
+    errorHandler(err, mockReq(), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(413);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "restriction",
+      code: "payload-too-large",
+    });
+  });
+
+  it("handles generic Error as 500", () => {
+    const err = new Error("something broke");
+
+    errorHandler(err, mockReq(), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(500);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "internal",
+      code: "processing-error",
+      hint: "Internal server error",
+    });
+  });
+
+  it("handles Error with empty message", () => {
+    const err = new Error("");
+
+    errorHandler(err, mockReq(), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(500);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "internal",
+      code: "processing-error",
+      hint: "Internal server error",
+    });
+  });
+
+  it("does not write response if headers already sent", () => {
+    const err = new ProcessingError(400, {
+      type: "validation",
+      code: "bad-input",
+      hint: "invalid value",
+    });
+
+    const resWithHeadersSent = {
+      ...res,
+      headersSent: true,
+    };
+
+    errorHandler(err, mockReq(), resWithHeadersSent, next);
+
+    expect(resWithHeadersSent.status).not.toHaveBeenCalled();
+    expect(resWithHeadersSent.json).not.toHaveBeenCalled();
+  });
+
+  it("calls releaseQueue for ProcessingError", () => {
+    const releaseQueue = vi.fn();
+    const resWithLocals = { ...res, locals: { releaseQueue } } as any;
+    const err = new ProcessingError(400, { type: "validation", code: "test" });
+
+    errorHandler(err, mockReq(), resWithLocals, next);
+
+    expect(releaseQueue).toHaveBeenCalled();
+  });
+
+  it("calls releaseQueue for MulterError LIMIT_FILE_SIZE", () => {
+    const releaseQueue = vi.fn();
+    const resWithLocals = { ...res, locals: { releaseQueue } } as any;
+    const err = new multer.MulterError("LIMIT_FILE_SIZE");
+
+    errorHandler(err, mockReq(), resWithLocals, next);
+
+    expect(releaseQueue).toHaveBeenCalled();
+  });
+
+  it("calls releaseQueue for generic Error", () => {
+    const releaseQueue = vi.fn();
+    const resWithLocals = { ...res, locals: { releaseQueue } } as any;
+    const err = new Error("something broke");
+
+    errorHandler(err, mockReq(), resWithLocals, next);
+
+    expect(releaseQueue).toHaveBeenCalled();
+  });
+
+  it("does not throw when releaseQueue is not set", () => {
+    const resWithNoLocals = { ...res, locals: {} } as any;
+    const err = new ProcessingError(400, { type: "validation", code: "test" });
+
+    expect(() => errorHandler(err, mockReq(), resWithNoLocals, next)).not.toThrow();
+  });
+});
+
+describe("sharedKeyAuth", () => {
+  let res: ReturnType<typeof mockRes>;
+  let next: NextFunction;
+
+  beforeEach(() => {
+    res = mockRes();
+    next = vi.fn();
+  });
+
+  it("returns 403 when expectedKey is null", () => {
+    const middleware = sharedKeyAuth(null);
+    const req = { headers: {} } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "authorization",
+      code: "forbidden",
+      hint: "Shared key not configured",
+    });
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 when expectedKey is null regardless of NODE_ENV", () => {
+    const originalEnv = process.env.NODE_ENV;
+    delete process.env.NODE_ENV;
+    try {
+      const middleware = sharedKeyAuth(null);
+      const req = { headers: {} } as unknown as Request;
+      middleware(req, res, next);
+      expect(res.status).toHaveBeenCalledWith(403);
+      expect(next).not.toHaveBeenCalled();
+    } finally {
+      process.env.NODE_ENV = originalEnv;
+    }
+  });
+
+  it("passes through with correct key", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: { "x-shared-key": "test-key" } } as unknown as Request;
+    middleware(req, res, next);
+    expect(next).toHaveBeenCalled();
+    expect(res.status).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 with wrong key", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: { "x-shared-key": "wrong-key" } } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenCalledWith({ type: "authorization", code: "forbidden" });
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 with missing header", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: {} } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenCalledWith({ type: "authorization", code: "forbidden" });
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 with undefined header value", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: { "x-shared-key": undefined } } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 when key is null and NODE_ENV is production", () => {
+    const originalEnv = process.env.NODE_ENV;
+    process.env.NODE_ENV = "production";
+    try {
+      const middleware = sharedKeyAuth(null);
+      const req = { headers: {} } as unknown as Request;
+      middleware(req, res, next);
+      expect(res.status).toHaveBeenCalledWith(403);
+      expect(res.json).toHaveBeenCalledWith({
+        type: "authorization",
+        code: "forbidden",
+        hint: "Shared key not configured",
+      });
+      expect(next).not.toHaveBeenCalled();
+    } finally {
+      process.env.NODE_ENV = originalEnv;
+    }
+  });
+
+  it("returns 403 for multibyte Unicode with same string length but different byte length", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: { "x-shared-key": "test-ké" } } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 for emoji input (multibyte)", () => {
+    const middleware = sharedKeyAuth("test-key");
+    const req = { headers: { "x-shared-key": "test-k🔑" } } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("returns 403 for accented characters with same string length", () => {
+    const middleware = sharedKeyAuth("abcdefgh");
+    const req = { headers: { "x-shared-key": "ábcdefgh" } } as unknown as Request;
+    middleware(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(next).not.toHaveBeenCalled();
+  });
+});
+
+describe("timeoutMiddleware", () => {
+  it("calls next() immediately", () => {
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    expect(next).toHaveBeenCalled();
+  });
+
+  it("clears timer when response finishes", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+    res.emit("finish");
+
+    // Advance past timeout - should not throw
+    vi.advanceTimersByTime(2000);
+    vi.useRealTimers();
+  });
+
+  it("clears timer when response closes", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+    res.emit("close");
+
+    // Advance past timeout - should not throw
+    vi.advanceTimersByTime(2000);
+    vi.useRealTimers();
+  });
+
+  it("sends 504 response when timeout expires before response", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(100);
+    const req = new EventEmitter() as unknown as Request;
+    (req as any).destroy = vi.fn();
+    const res = new EventEmitter() as unknown as Response;
+    (res as any).headersSent = false;
+    (res as any).status = vi.fn().mockReturnThis();
+    (res as any).json = vi.fn().mockReturnThis();
+    const next = vi.fn();
+
+    middleware(req, res, next);
+    vi.advanceTimersByTime(150);
+
+    expect(res.status).toHaveBeenCalledWith(504);
+    expect(res.json).toHaveBeenCalledWith({
+      type: "internal",
+      code: "processing-timeout",
+      hint: "Request timed out",
+    });
+    vi.useRealTimers();
+  });
+
+  it("does not send response if headers already sent", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(100);
+    const req = new EventEmitter() as unknown as Request;
+    (req as any).destroy = vi.fn();
+    const res = new EventEmitter() as unknown as Response;
+    (res as any).headersSent = true;
+    (res as any).status = vi.fn().mockReturnThis();
+    (res as any).json = vi.fn().mockReturnThis();
+    const next = vi.fn();
+
+    middleware(req, res, next);
+    vi.advanceTimersByTime(150);
+
+    expect(res.status).not.toHaveBeenCalled();
+    vi.useRealTimers();
+  });
+
+  it("destroys request AFTER response finishes (not before)", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(100);
+    const req = new EventEmitter() as unknown as Request;
+    (req as any).destroy = vi.fn();
+    const res = new EventEmitter() as unknown as Response;
+    (res as any).headersSent = false;
+    (res as any).status = vi.fn().mockReturnThis();
+    (res as any).json = vi.fn().mockReturnThis();
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // Advance to timeout - this triggers the 504 response
+    vi.advanceTimersByTime(100);
+
+    // req.destroy should NOT be called yet (response not finished)
+    expect(req.destroy).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(504);
+
+    // Now simulate response finishing
+    res.emit("finish");
+
+    // Now req.destroy should be called
+    expect(req.destroy).toHaveBeenCalled();
+    vi.useRealTimers();
+  });
+
+  it("creates AbortController and attaches to request", () => {
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    expect((req as any).abortController).toBeDefined();
+    expect((req as any).abortController.signal).toBeDefined();
+    expect((req as any).abortController.signal.aborted).toBe(false);
+  });
+
+  it("aborts signal when timeout fires", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(100);
+    const req = new EventEmitter() as unknown as Request;
+    (req as any).destroy = vi.fn();
+    const res = new EventEmitter() as unknown as Response;
+    (res as any).headersSent = false;
+    (res as any).status = vi.fn().mockReturnThis();
+    (res as any).json = vi.fn().mockReturnThis();
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // Signal should not be aborted yet
+    expect((req as any).abortController.signal.aborted).toBe(false);
+
+    // Advance to timeout
+    vi.advanceTimersByTime(150);
+
+    // Signal should now be aborted
+    expect((req as any).abortController.signal.aborted).toBe(true);
+    vi.useRealTimers();
+  });
+
+  it("does not abort signal when response finishes before timeout", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // Response finishes before timeout
+    res.emit("finish");
+
+    // Advance past timeout
+    vi.advanceTimersByTime(2000);
+
+    // Signal should NOT be aborted (timer was cleared)
+    expect((req as any).abortController.signal.aborted).toBe(false);
+    vi.useRealTimers();
+  });
+
+  it("aborts signal when response closes (client disconnect)", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(1000);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // Signal should not be aborted initially
+    expect((req as any).abortController.signal.aborted).toBe(false);
+
+    // Simulate client disconnect (response closes)
+    res.emit("close");
+
+    // Signal should now be aborted
+    expect((req as any).abortController.signal.aborted).toBe(true);
+    vi.useRealTimers();
+  });
+
+  it("does not abort signal again if already aborted when response closes", async () => {
+    vi.useFakeTimers();
+    const middleware = timeoutMiddleware(100);
+    const req = new EventEmitter() as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    (res as any).headersSent = false;
+    (res as any).status = vi.fn().mockReturnValue({ json: vi.fn() });
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // Advance past timeout to trigger abort
+    vi.advanceTimersByTime(200);
+
+    // Signal should be aborted from timeout
+    expect((req as any).abortController.signal.aborted).toBe(true);
+
+    // Simulate client disconnect (response closes)
+    res.emit("close");
+
+    // Signal should still be aborted (no error thrown)
+    expect((req as any).abortController.signal.aborted).toBe(true);
+    vi.useRealTimers();
+  });
+});
+
+describe("cleanupMiddleware", () => {
+  it("calls next() immediately", () => {
+    const req = {} as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    cleanupMiddleware(req, res, next);
+
+    expect(next).toHaveBeenCalled();
+  });
+
+  it("removes file on response finish", async () => {
+    const req = {
+      file: {
+        path: "/tmp/test-file.jpg",
+      },
+    } as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    // Mock the rm function by spying on the cleanup behavior
+    // We'll verify the middleware registers the finish handler
+    cleanupMiddleware(req, res, next);
+
+    // Emit finish event - this should trigger cleanup
+    // The actual rm is mocked internally, so we just verify no errors
+    res.emit("finish");
+
+    // Wait for async cleanup
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  });
+
+  it("removes file on response close", async () => {
+    const req = {
+      file: {
+        path: "/tmp/test-file.jpg",
+      },
+    } as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    cleanupMiddleware(req, res, next);
+
+    // Emit close event - this should trigger cleanup
+    res.emit("close");
+
+    // Wait for async cleanup
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  });
+
+  it("does nothing when req.file is undefined", async () => {
+    const req = {} as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    cleanupMiddleware(req, res, next);
+
+    // Emit finish event - should not throw
+    res.emit("finish");
+
+    // Wait for async cleanup
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  });
+
+  it("does nothing when req.file.path is undefined", async () => {
+    const req = {
+      file: {
+        buffer: Buffer.from("test"),
+      },
+    } as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    cleanupMiddleware(req, res, next);
+
+    // Emit finish event - should not throw
+    res.emit("finish");
+
+    // Wait for async cleanup
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  });
+
+  it("doesn't throw when file doesn't exist", async () => {
+    const req = {
+      file: {
+        path: "/tmp/nonexistent-file.jpg",
+      },
+    } as unknown as Request;
+    const res = new EventEmitter() as unknown as Response;
+    const next = vi.fn();
+
+    cleanupMiddleware(req, res, next);
+
+    // Emit finish event - should not throw even if file doesn't exist
+    res.emit("finish");
+
+    // Wait for async cleanup
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  });
+});
diff --git a/media-processor/test/queue.test.ts b/media-processor/test/queue.test.ts
new file mode 100644
index 0000000000..cd6d26cc94
--- /dev/null
+++ b/media-processor/test/queue.test.ts
@@ -0,0 +1,377 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { createQueueMiddleware } from "../src/middleware/queue.js";
+import type { Request, Response, NextFunction } from "express";
+import { EventEmitter } from "node:events";
+
+function mockRes() {
+  const res = new EventEmitter() as any;
+  res.status = vi.fn().mockReturnThis();
+  res.json = vi.fn().mockReturnThis();
+  res.send = vi.fn().mockReturnThis();
+  res.headersSent = false;
+  res.writableEnded = false;
+  return res as Response;
+}
+
+function mockReq() {
+  return {} as Request;
+}
+
+describe("queueMiddleware", () => {
+  it("calls next() when queue has capacity", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req = mockReq();
+    const res = mockRes();
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    expect(next).toHaveBeenCalled();
+  });
+
+  it("skips next() when res.writableEnded is true (timeout already sent)", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req = mockReq();
+    const res = mockRes();
+    (res as any).writableEnded = true;
+    const next = vi.fn();
+
+    middleware(req, res, next);
+
+    // next() should NOT be called because response already ended
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it("queues requests when concurrency limit reached", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    // First request takes the slot
+    middleware(req1, res1, next1);
+    expect(next1).toHaveBeenCalled();
+
+    // Second request should queue
+    middleware(req2, res2, next2);
+    expect(next2).not.toHaveBeenCalled();
+
+    // Release first request's queue slot (simulating processing completion)
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    // Now second request should proceed
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("resolves promise when releaseQueue is called", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // Release first request's queue slot
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("processes requests sequentially with concurrency 1", async () => {
+    const middleware = createQueueMiddleware(1);
+    const order: number[] = [];
+
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn(() => order.push(1));
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn(() => order.push(2));
+
+    const req3 = mockReq();
+    const res3 = mockRes();
+    const next3 = vi.fn(() => order.push(3));
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+    middleware(req3, res3, next3);
+
+    // Only first should be called immediately
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+    expect(next3).not.toHaveBeenCalled();
+
+    // Release first request's queue slot
+    const releaseQueue1 = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue1).toBeDefined();
+    releaseQueue1();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Now second should be called
+    expect(next2).toHaveBeenCalled();
+    expect(next3).not.toHaveBeenCalled();
+
+    // Release second request's queue slot
+    const releaseQueue2 = (res2 as any).locals?.releaseQueue;
+    expect(releaseQueue2).toBeDefined();
+    releaseQueue2();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Now third should be called
+    expect(next3).toHaveBeenCalled();
+
+    // Verify sequential order
+    expect(order).toEqual([1, 2, 3]);
+  });
+
+  it("processes requests in parallel with concurrency 10", async () => {
+    const middleware = createQueueMiddleware(10);
+    const calls: number[] = [];
+
+    // Create 5 requests (less than concurrency limit)
+    const requests = Array.from({ length: 5 }, (_, i) => {
+      const req = mockReq();
+      const res = mockRes();
+      const next = vi.fn(() => calls.push(i));
+      return { req, res, next };
+    });
+
+    // All should be called immediately
+    requests.forEach(({ req, res, next }) => {
+      middleware(req, res, next);
+    });
+
+    // All 5 should be called immediately since concurrency is 10
+    expect(calls.length).toBe(5);
+    expect(calls).toEqual([0, 1, 2, 3, 4]);
+  });
+
+  it("handles request errors gracefully", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // Simulate error by releasing queue slot (as would happen in finally block)
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Second request should still proceed even after first "error"
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("doesn't block on slow requests within concurrency limit", async () => {
+    const middleware = createQueueMiddleware(2);
+    const calls: number[] = [];
+
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn(() => calls.push(1));
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn(() => calls.push(2));
+
+    const req3 = mockReq();
+    const res3 = mockRes();
+    const next3 = vi.fn(() => calls.push(3));
+
+    // Start first two requests (concurrency is 2)
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // Both should be called immediately
+    expect(next1).toHaveBeenCalled();
+    expect(next2).toHaveBeenCalled();
+    expect(next3).not.toHaveBeenCalled();
+
+    // Third request should wait
+    middleware(req3, res3, next3);
+    expect(next3).not.toHaveBeenCalled();
+
+    // Release first request's queue slot
+    const releaseQueue1 = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue1).toBeDefined();
+    releaseQueue1();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Now third should proceed
+    expect(next3).toHaveBeenCalled();
+  });
+
+  it("releases slot when error handler calls releaseQueue (covers Multer error path)", async () => {
+    // This test verifies that the error handler releases the queue slot
+    // by calling releaseQueue from res.locals. This covers the Multer error
+    // case where the route handler never runs.
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // First request is processing, second is queued
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+
+    // Simulate error handler calling releaseQueue (e.g., Multer error)
+    const releaseQueue = (res1 as any).locals.releaseQueue;
+    releaseQueue();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Second request should proceed because slot was released
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("releases slot when releaseQueue callback is called", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // First request is processing, second is queued
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+
+    // Simulate processing completing by calling releaseQueue
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Now second request should proceed
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("releases slot on processing error (via finally block)", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // First request is processing, second is queued
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+
+    // Simulate processing error and release in finally block
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Second request should proceed even after error
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("releaseQueue is idempotent (can be called multiple times)", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // First request is processing, second is queued
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+
+    // Call releaseQueue multiple times
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+    releaseQueue(); // Should not throw or cause issues
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Second request should proceed
+    expect(next2).toHaveBeenCalled();
+  });
+
+  it("holds queue slot when client disconnects (close event)", async () => {
+    const middleware = createQueueMiddleware(1);
+    const req1 = mockReq();
+    const res1 = mockRes();
+    const next1 = vi.fn();
+
+    const req2 = mockReq();
+    const res2 = mockRes();
+    const next2 = vi.fn();
+
+    middleware(req1, res1, next1);
+    middleware(req2, res2, next2);
+
+    // First request is processing, second is queued
+    expect(next1).toHaveBeenCalled();
+    expect(next2).not.toHaveBeenCalled();
+
+    // Simulate client disconnect (close event)
+    res1.emit("close");
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Second request should NOT proceed because slot is still held
+    expect(next2).not.toHaveBeenCalled();
+
+    // Now release the slot (simulating processing completion)
+    const releaseQueue = (res1 as any).locals?.releaseQueue;
+    expect(releaseQueue).toBeDefined();
+    releaseQueue();
+
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    // Now second request should proceed
+    expect(next2).toHaveBeenCalled();
+  });
+});
diff --git a/media-processor/test/routes-integration.test.ts b/media-processor/test/routes-integration.test.ts
new file mode 100644
index 0000000000..26fa0b36de
--- /dev/null
+++ b/media-processor/test/routes-integration.test.ts
@@ -0,0 +1,296 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest";
+import request from "supertest";
+import express from "express";
+import { createImageRoutes } from "../src/routes/image.js";
+import { createFontRoutes } from "../src/routes/font.js";
+import { errorHandler } from "../src/middleware/error-handler.js";
+import { timeoutMiddleware } from "../src/middleware/timeout.js";
+import { sharedKeyAuth } from "../src/middleware/auth.js";
+import { createQueueMiddleware } from "../src/middleware/queue.js";
+import { configureImageLimits } from "../src/services/image.js";
+import { configureFontLimits } from "../src/services/font.js";
+import { configureUploadLimits } from "../src/upload.js";
+import sharp from "sharp";
+import { readdir, rm, stat } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+// Test app with low memoryThreshold to force disk storage
+function createTestApp() {
+  const app = express();
+
+  // Configure with low threshold to force disk storage
+  configureImageLimits({
+    maxPixels: 128_000_000,
+    maxWidth: 16384,
+    maxHeight: 16384,
+  });
+
+  configureFontLimits({
+    mem: 1024 * 1024 * 512,
+    cpuTime: 30,
+    timeout: 30,
+  });
+
+  // Very low threshold to force disk storage for small files
+  configureUploadLimits({ maxFileSize: 10 * 1024 * 1024, memoryThreshold: 10 });
+
+  const queueMiddleware = createQueueMiddleware(10);
+
+  app.use(timeoutMiddleware(5000));
+  app.use("/api/image", sharedKeyAuth("test-key"), queueMiddleware, createImageRoutes());
+  app.use("/api/font", sharedKeyAuth("test-key"), queueMiddleware, createFontRoutes());
+  app.use(errorHandler);
+
+  return app;
+}
+
+describe("HTTP upload cleanup", () => {
+  let app: ReturnType<typeof createTestApp>;
+
+  beforeAll(() => {
+    app = createTestApp();
+  });
+
+  async function getTempFiles(): Promise<string[]> {
+    const tmp = tmpdir();
+    const files = await readdir(tmp);
+    const uploadDirs = files.filter((f) => f.startsWith("penpot.upload."));
+
+    // Get all files inside upload directories
+    const allFiles: string[] = [];
+    for (const dir of uploadDirs) {
+      try {
+        const dirPath = join(tmp, dir);
+        const dirFiles = await readdir(dirPath);
+        allFiles.push(...dirFiles.map((f) => join(dir, f)));
+      } catch {
+        // Directory might not exist or be inaccessible
+      }
+    }
+    return allFiles;
+  }
+
+  it("removes disk-backed file after successful image/info request", async () => {
+    const beforeFiles = await getTempFiles();
+
+    // Create a small image
+    const imageBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const response = await request(app)
+      .post("/api/image/info")
+      .set("x-shared-key", "test-key")
+      .attach("file", imageBuffer, { filename: "test.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(200);
+    expect(response.body.width).toBe(100);
+    expect(response.body.height).toBe(100);
+
+    // Wait for cleanup
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    const afterFiles = await getTempFiles();
+
+    // No new temp files should remain
+    const newFiles = afterFiles.filter((f) => !beforeFiles.includes(f));
+    expect(newFiles.length).toBe(0);
+  });
+
+  it("removes disk-backed file after successful image/thumbnail request", async () => {
+    const beforeFiles = await getTempFiles();
+
+    const imageBuffer = await sharp({
+      create: { width: 200, height: 200, channels: 3, background: { r: 0, g: 255, b: 0 } },
+    })
+      .png()
+      .toBuffer();
+
+    const response = await request(app)
+      .post("/api/image/thumbnail?width=100&height=100&format=jpeg&mode=fit")
+      .set("x-shared-key", "test-key")
+      .attach("file", imageBuffer, { filename: "test.png", contentType: "image/png" });
+
+    expect(response.status).toBe(200);
+    expect(response.headers["content-type"]).toMatch(/image\/jpeg/);
+
+    // Wait for cleanup
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    const afterFiles = await getTempFiles();
+    const newFiles = afterFiles.filter((f) => !beforeFiles.includes(f));
+    expect(newFiles.length).toBe(0);
+  });
+
+  it("removes disk-backed file after successful font/convert request", async () => {
+    const beforeFiles = await getTempFiles();
+
+    // Create a minimal TTF font (this is a simplified test - in reality you'd use a real font)
+    // For this test, we'll just verify the cleanup happens even if the conversion fails
+    const fontBuffer = Buffer.from("not a real font");
+
+    const response = await request(app)
+      .post("/api/font/convert?target-type=font/woff")
+      .set("x-shared-key", "test-key")
+      .attach("file", fontBuffer, { filename: "test.ttf", contentType: "font/ttf" });
+
+    // The conversion will fail, but cleanup should still happen
+    // We expect either 400 (invalid font) or 500 (processing error)
+    expect([400, 500]).toContain(response.status);
+
+    // Wait for cleanup
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    const afterFiles = await getTempFiles();
+    const newFiles = afterFiles.filter((f) => !beforeFiles.includes(f));
+    expect(newFiles.length).toBe(0);
+  });
+
+  it("removes disk-backed file after failed request", async () => {
+    const beforeFiles = await getTempFiles();
+
+    // Send invalid image data
+    const invalidBuffer = Buffer.from("not an image");
+
+    const response = await request(app)
+      .post("/api/image/info")
+      .set("x-shared-key", "test-key")
+      .attach("file", invalidBuffer, { filename: "invalid.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(400);
+
+    // Wait for cleanup
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    const afterFiles = await getTempFiles();
+    const newFiles = afterFiles.filter((f) => !beforeFiles.includes(f));
+    expect(newFiles.length).toBe(0);
+  });
+
+  it("removes disk-backed file after timeout", async () => {
+    // Create a test app with very short timeout
+    const timeoutApp = express();
+    configureImageLimits({ maxPixels: 128_000_000, maxWidth: 16384, maxHeight: 16384 });
+    configureUploadLimits({ maxFileSize: 10 * 1024 * 1024, memoryThreshold: 10 });
+    const queueMiddleware = createQueueMiddleware(10);
+    timeoutApp.use(timeoutMiddleware(10)); // 10ms timeout - very aggressive
+    timeoutApp.use("/api/image", sharedKeyAuth("test-key"), queueMiddleware, createImageRoutes());
+    timeoutApp.use(errorHandler);
+
+    const beforeFiles = await getTempFiles();
+
+    // Create a large image that will take time to process
+    const imageBuffer = await sharp({
+      create: { width: 4000, height: 4000, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg({ quality: 100 })
+      .toBuffer();
+
+    const response = await request(timeoutApp)
+      .post("/api/image/thumbnail?width=2000&height=2000&format=jpeg&mode=fit")
+      .set("x-shared-key", "test-key")
+      .attach("file", imageBuffer, { filename: "large.jpg", contentType: "image/jpeg" });
+
+    // Should timeout
+    expect(response.status).toBe(504);
+    expect(response.body.type).toBe("internal");
+    expect(response.body.code).toBe("processing-timeout");
+
+    // Wait for processing to settle (Sharp may still be working in background)
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+
+    const afterFiles = await getTempFiles();
+    const newFiles = afterFiles.filter((f) => !beforeFiles.includes(f));
+    expect(newFiles.length).toBe(0);
+  });
+});
+
+describe("HTTP malformed image handling", () => {
+  let app: ReturnType<typeof createTestApp>;
+
+  beforeAll(() => {
+    app = createTestApp();
+  });
+
+  it("returns 400 for corrupted image in /api/image/info", async () => {
+    // Create a valid image then truncate it
+    const validBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const corruptedBuffer = validBuffer.subarray(0, Math.floor(validBuffer.length / 2));
+
+    const response = await request(app)
+      .post("/api/image/info")
+      .set("x-shared-key", "test-key")
+      .attach("file", corruptedBuffer, { filename: "corrupted.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(400);
+    expect(response.body.type).toBe("validation");
+    expect(response.body.code).toBe("invalid-image");
+  });
+
+  it("returns 400 for corrupted image in /api/image/thumbnail", async () => {
+    const validBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const corruptedBuffer = validBuffer.subarray(0, Math.floor(validBuffer.length / 2));
+
+    const response = await request(app)
+      .post("/api/image/thumbnail?width=50&height=50&format=jpeg&mode=fit")
+      .set("x-shared-key", "test-key")
+      .attach("file", corruptedBuffer, { filename: "corrupted.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(400);
+    expect(response.body.type).toBe("validation");
+    expect(response.body.code).toBe("invalid-image");
+  });
+});
+
+describe("HTTP quality parameter clamping", () => {
+  let app: ReturnType<typeof createTestApp>;
+
+  beforeAll(() => {
+    app = createTestApp();
+  });
+
+  it("clamps quality=0 to 1 at route level", async () => {
+    const imageBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const response = await request(app)
+      .post("/api/image/thumbnail?width=50&height=50&quality=0&format=jpeg&mode=fit")
+      .set("x-shared-key", "test-key")
+      .attach("file", imageBuffer, { filename: "test.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(200);
+    expect(response.headers["content-type"]).toMatch(/image\/jpeg/);
+  });
+
+  it("clamps quality=101 to 100 at route level", async () => {
+    const imageBuffer = await sharp({
+      create: { width: 100, height: 100, channels: 3, background: { r: 255, g: 0, b: 0 } },
+    })
+      .jpeg()
+      .toBuffer();
+
+    const response = await request(app)
+      .post("/api/image/thumbnail?width=50&height=50&quality=101&format=jpeg&mode=fit")
+      .set("x-shared-key", "test-key")
+      .attach("file", imageBuffer, { filename: "test.jpg", contentType: "image/jpeg" });
+
+    expect(response.status).toBe(200);
+    expect(response.headers["content-type"]).toMatch(/image\/jpeg/);
+  });
+});
diff --git a/media-processor/test/setup.ts b/media-processor/test/setup.ts
new file mode 100644
index 0000000000..b4c413ce0a
--- /dev/null
+++ b/media-processor/test/setup.ts
@@ -0,0 +1 @@
+process.env.PENPOT_MEDIA_PROCESSOR_LOG_LEVEL = "silent";
diff --git a/media-processor/test/upload-storage.test.ts b/media-processor/test/upload-storage.test.ts
new file mode 100644
index 0000000000..b2613e533a
--- /dev/null
+++ b/media-processor/test/upload-storage.test.ts
@@ -0,0 +1,212 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { createHybridStorage } from "../src/upload-storage.js";
+import type { Request } from "express";
+import { Readable } from "node:stream";
+import { rm } from "node:fs/promises";
+
+function mockReq(contentLength?: string): Request {
+  const headers: Record<string, string> = {};
+  if (contentLength !== undefined) {
+    headers["content-length"] = contentLength;
+  }
+  return { headers } as Request;
+}
+
+function mockFile(content: string = "test content") {
+  const stream = Readable.from([content]);
+  return {
+    fieldname: "file",
+    originalname: "test.txt",
+    encoding: "7bit",
+    mimetype: "text/plain",
+    stream,
+  } as Express.Multer.File;
+}
+
+describe("createHybridStorage", () => {
+  let storage: ReturnType<typeof createHybridStorage>;
+  let tempDirs: string[] = [];
+
+  beforeEach(() => {
+    storage = createHybridStorage({ memoryThreshold: 1024 });
+  });
+
+  afterEach(async () => {
+    for (const dir of tempDirs) {
+      await rm(dir, { recursive: true, force: true });
+    }
+    tempDirs = [];
+  });
+
+  it("uses memory storage when Content-Length is below threshold", async () => {
+    const req = mockReq("100");
+    const file = mockFile("small content");
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeUndefined();
+          expect((info as any).buffer).toBeDefined();
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("uses disk storage when Content-Length is above threshold", async () => {
+    const req = mockReq("2048");
+    const file = mockFile("x".repeat(2048));
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeDefined();
+          expect((info as any).destination).toBeDefined();
+          tempDirs.push((info as any).destination);
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("uses disk storage when Content-Length is absent (chunked transfer)", async () => {
+    const req = mockReq();
+    const file = mockFile("chunked content");
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeDefined();
+          expect((info as any).destination).toBeDefined();
+          tempDirs.push((info as any).destination);
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("uses disk storage when Content-Length is invalid", async () => {
+    const req = mockReq("not-a-number");
+    const file = mockFile("content");
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeDefined();
+          tempDirs.push((info as any).destination);
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("removes file from disk", async () => {
+    const req = mockReq("2048");
+    const file = mockFile("x".repeat(2048));
+
+    const info = await new Promise<any>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else resolve(info);
+      });
+    });
+
+    tempDirs.push(info.destination);
+
+    await new Promise<void>((resolve, reject) => {
+      storage._removeFile(req, { ...file, path: info.path } as any, (err) => {
+        if (err) reject(err);
+        else resolve();
+      });
+    });
+  });
+
+  it("uses memory storage when Content-Length is 0", async () => {
+    const req = mockReq("0");
+    const file = mockFile("");
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeUndefined();
+          expect((info as any).buffer).toBeDefined();
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("uses disk storage when Content-Length equals threshold", async () => {
+    const req = mockReq("1024");
+    const file = mockFile("x".repeat(1024));
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeDefined();
+          expect((info as any).destination).toBeDefined();
+          tempDirs.push((info as any).destination);
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("uses disk storage when Content-Length is very large", async () => {
+    const req = mockReq("1073741824"); // 1GB
+    const file = mockFile("x"); // Small actual content, but large Content-Length
+
+    await new Promise<void>((resolve, reject) => {
+      storage._handleFile(req, file, (err, info) => {
+        if (err) reject(err);
+        else {
+          expect(info).toBeDefined();
+          expect((info as any).path).toBeDefined();
+          expect((info as any).destination).toBeDefined();
+          tempDirs.push((info as any).destination);
+          resolve();
+        }
+      });
+    });
+  });
+
+  it("reuses the same temp directory for concurrent uploads", async () => {
+    const req1 = mockReq("2048");
+    const file1 = mockFile("x".repeat(2048));
+    const req2 = mockReq("2048");
+    const file2 = mockFile("y".repeat(2048));
+
+    const [info1, info2] = await Promise.all([
+      new Promise<any>((resolve, reject) => {
+        storage._handleFile(req1, file1, (err, info) => {
+          if (err) reject(err);
+          else resolve(info);
+        });
+      }),
+      new Promise<any>((resolve, reject) => {
+        storage._handleFile(req2, file2, (err, info) => {
+          if (err) reject(err);
+          else resolve(info);
+        });
+      }),
+    ]);
+
+    tempDirs.push(info1.destination);
+    tempDirs.push(info2.destination);
+
+    // Both uploads should use the same temp directory
+    expect(info1.destination).toBe(info2.destination);
+  });
+});
diff --git a/media-processor/tsconfig.json b/media-processor/tsconfig.json
new file mode 100644
index 0000000000..b5edd7fa16
--- /dev/null
+++ b/media-processor/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["ES2022"],
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "sourceMap": true,
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/media-processor/vitest.config.ts b/media-processor/vitest.config.ts
new file mode 100644
index 0000000000..ad177edacb
--- /dev/null
+++ b/media-processor/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  envPrefix: [],
+  test: {
+    setupFiles: ["./test/setup.ts"],
+  },
+});
diff --git a/package.json b/package.json
index 256ffc3436..695a8f2e20 100644
--- a/package.json
+++ b/package.json
@@ -4,19 +4,21 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.12.0+sha512.820a6fbd0d9f04c226638002aead1e45340a9139dd5dc077c1d83ef44aa2481c8eb6637b4c9aa696a3c7e35ba818e49cf27213e5f2b91138d09b7a3e26e898ba",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "type": "module",
   "devDependencies": {
-    "@playwright/mcp": "^0.0.76",
-    "@playwright/test": "^1.61.1",
-    "@types/node": "^26.0.1",
+    "@playwright/mcp": "^0.0.78",
+    "@playwright/test": "^1.62.0",
+    "@types/node": "^26.1.2",
+    "commander": "^15.0.0",
+    "dotenv": "^17.4.2",
     "esbuild": "^0.28.1",
-    "mdts": "^0.20.3",
+    "mdts": "^0.20.6",
     "nrepl-client": "^0.3.0",
-    "playwright": "^1.61.1"
+    "playwright": "1.62.1"
   }
 }
diff --git a/plugins/.prettierrc b/plugins/.prettierrc
index 544138be45..3baced4112 100644
--- a/plugins/.prettierrc
+++ b/plugins/.prettierrc
@@ -1,3 +1,4 @@
 {
-  "singleQuote": true
+  "singleQuote": true,
+  "endOfLine": "auto"
 }
diff --git a/plugins/CHANGELOG.md b/plugins/CHANGELOG.md
index eaae151372..9cd186baf0 100644
--- a/plugins/CHANGELOG.md
+++ b/plugins/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### 🚀 Features
 
 - **plugin-types:** Added `paddingType` (`'simple' | 'multiple'`) to flex and grid layouts and `marginType` (`'simple' | 'multiple'`) to layout children, exposing whether the four padding/margin sides are mirrored or honoured independently.
+- **plugin-types**: Added `waitForLayoutUpdate` to wait until pending layout updates have finished. It rejects when the optional timeout elapses, defaulting to 30 seconds so a wait never hangs.
+- **plugin-types**: Added `waitForLayoutUpdate` to the `Shape` interface to wait until the pending layout updates of a shape and its children have finished
 
 ### 🩹 Fixes
 
diff --git a/plugins/apps/colors-to-tokens-plugin/package.json b/plugins/apps/colors-to-tokens-plugin/package.json
index 17903d2e95..e0719fca63 100644
--- a/plugins/apps/colors-to-tokens-plugin/package.json
+++ b/plugins/apps/colors-to-tokens-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/composable-test-suite/.gitignore b/plugins/apps/composable-test-suite/.gitignore
new file mode 100644
index 0000000000..186871f845
--- /dev/null
+++ b/plugins/apps/composable-test-suite/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Dependencies and build output
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/plugins/apps/composable-test-suite/.prettierrc b/plugins/apps/composable-test-suite/.prettierrc
new file mode 100644
index 0000000000..3d58be61d9
--- /dev/null
+++ b/plugins/apps/composable-test-suite/.prettierrc
@@ -0,0 +1,20 @@
+{
+    "tabWidth": 4,
+    "overrides": [
+        {
+            "files": "*.yml",
+            "options": {
+                "tabWidth": 2
+            }
+        }
+    ],
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": false,
+    "quoteProps": "as-needed",
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "arrowParens": "always",
+    "printWidth": 120,
+    "endOfLine": "auto"
+}
diff --git a/plugins/apps/composable-test-suite/README.md b/plugins/apps/composable-test-suite/README.md
new file mode 100644
index 0000000000..f324a490ee
--- /dev/null
+++ b/plugins/apps/composable-test-suite/README.md
@@ -0,0 +1,205 @@
+# Composable Penpot API Tests (Plugin)
+
+A Penpot plugin that runs a suite of component behaviour tests against the live
+Penpot document, driving the public Plugin API exactly as a user's actions would.
+
+## What this is for
+
+Penpot components have subtle behaviour — overrides, propagation from a main to
+its copies, nesting, precedence between competing changes. This plugin exercises
+that behaviour through the same Plugin API that real integrations use, so the
+tests act as a check that the API surfaces the expected component semantics end to
+end.
+
+## Core principles
+
+These are the ideas the suite is built around. They are intended to outlast any
+particular code structure.
+
+- **A test is a composition of operations over a situation.** A _situation_ is the
+  state a test acts on (the relevant shapes of a configuration, plus a record of
+  what has happened). An _operation_ is one step — an edit, a structural change, or
+  an assertion. Tests are built by composing small operations, not by writing
+  bespoke procedures, so behaviour is described declaratively and pieces are
+  reused across tests.
+
+- **Operations compose, and choice points expand into variants.** Operations can
+  be sequenced, and a test can express a _choice_ (do this, or skip it; pick one of
+  several). Before running, every choice is expanded into the full set of concrete
+  variants — so a single compact test definition becomes many independent runs
+  covering every combination. Each variant runs against a freshly built situation,
+  so variants never interfere.
+
+- **The real API, with real propagation.** Operations mutate the live document
+  through the Plugin API; propagation happens for real, and assertions read the
+  real resulting state. The suite does not simulate or model component behaviour —
+  it observes it.
+
+- **Foundation operations own what they expose.** A starting configuration is
+  built by a foundation operation — the first step of a test — which names the
+  participants a test refers to, so a test addresses parts of the configuration by
+  role rather than by reaching into internals. How a configuration is grown
+  (instantiated, nested) is offered by the foundation operation itself; what
+  content it is built around is supplied by a pluggable content-creation strategy.
+
+- **Results are addressed by stable identity.** Every test (every expanded variant)
+  has a stable identity assigned once. The UI renders the tests, and each result
+  streams back keyed by that identity, so what you select to run and what you see
+  reported always refer to the same thing.
+
+## Usage
+
+### Build and run the plugin
+
+The plugin lives in the plugins workspace (`plugins/apps/composable-test-suite`)
+and runs like the other plugins there. From the `plugins/` directory (after a
+workspace `pnpm install`):
+
+```
+pnpm run start:plugin:composable-test-suite
+```
+
+Alternatively, from this directory, self-contained (installs its own
+dependencies, isolated from the surrounding workspace):
+
+```
+pnpm run bootstrap
+```
+
+Either way this builds the plugin and then keeps rebuilding on change while
+serving it locally; a connected plugin panel reloads automatically on each
+rebuild. The first build takes a little while before the server is ready.
+
+Other scripts: `pnpm run build` (one-off build), `pnpm start` (watch + serve),
+`pnpm run init` (build, then watch + serve), `pnpm run types:check` (type-check
+only).
+
+### Connect it in Penpot
+
+In Penpot, open the plugin manager and add a plugin by URL, using:
+
+```
+http://localhost:4202/manifest.json
+```
+
+(4202 is the conventional dev port shared by the plugins in this workspace, so
+only one of them can be served at a time.)
+
+The plugin panel will open inside Penpot.
+
+### Run the tests
+
+The panel lists every case as a group, headed by the case's identifier and its
+test count (e.g. `MainEditSyncs [4 tests]`), with passed/failed counts at the
+right edge. From there you can:
+
+- **Run all**, or select individual tests (or whole groups) and **run selected**;
+  **clear selection** deselects everything in one step.
+- Watch each test's status update live as it runs — pending, running, then passed
+  or failed.
+- **Fold open a group** to read the case's description — what is set up, what is
+  varied, and what must hold — shown in its own box above the group's tests.
+- **Fold open a test** to see the steps that were applied and, if it failed, the
+  failure message. (Details appear once a test has been run.)
+
+Because the tests create and modify shapes in the current document, run them in a
+scratch file rather than one whose contents you care about.
+
+## Remote control (for agents and scripts)
+
+The panel can be driven programmatically as well as by hand. Every checkbox
+carries a stable DOM id: a case's group checkbox has the case identifier (e.g.
+`MainEditSyncs`), and each of its tests has the composite identifier with the
+1-based index (e.g. `MainEditSyncs-2`).
+
+Driving the panel from outside requires a browser-automation bridge such as
+Playwright with access to the running Penpot session — available, for example, in
+Penpot's agentic devenv setup. The plugin renders inside a
+`<plugin-modal title="Composable Tests">` element in the Penpot workspace, which
+hosts the panel in a cross-origin iframe. Top-page selectors therefore do not
+reach the panel's elements; go through a frame-scoped locator:
+
+```js
+const frame = page.getByTitle("Composable Tests").locator("iframe").contentFrame();
+
+// start from a clean slate: deselect everything
+await frame.getByRole("button", { name: "Clear selection" }).click();
+
+// select a whole case (its checkbox sits in the header — works while folded)
+await frame.locator("#MainEditSyncs").click();
+
+// select a single test: unfold its group first (click the header label),
+// then click the test's checkbox
+await frame.getByText("MainEditSyncs", { exact: true }).click();
+await frame.locator("#MainEditSyncs-2").click();
+
+// run what is selected
+await frame.getByRole("button", { name: "Run selected" }).click();
+```
+
+State can be read back the same way — e.g. a checkbox's selection via
+`isChecked()` (a group checkbox reports `indeterminate` for a partial selection),
+or the per-group passed/failed counts from the header text.
+
+### Reading logs
+
+`console.log` statements anywhere in the plugin code — including test operations
+and assertions, which run in the plugin sandbox — surface in the browser console
+of the Penpot page, so a browser-automation bridge can read them (with
+Playwright's MCP tools: `browser_console_messages`). The page console carries a
+lot of unrelated traffic (Penpot itself, vite, other plugins), so prefix debug
+logs with the case identifier, e.g. `[MainEditSyncs] …`, and filter for that.
+Together with the panel state this closes the debug loop: add a log, run the
+failing test by id, read the log.
+
+### Auto-reload on code changes
+
+While the dev server is running (`pnpm start` or `pnpm run bootstrap`), any code
+change triggers a rebuild, and the live preview then reloads the plugin
+automatically — sandbox included, so changed test code takes effect without any
+manual reload step. Note that the reload resets the panel completely: all
+checkboxes are cleared and previous results are gone, so re-select what you want
+to run after changing code.
+
+## Running in CI (headless, mocked backend)
+
+The suite can run fully headless, without the panel and without a running
+Penpot instance. From the `plugins/` directory:
+
+```
+pnpm --filter composable-test-suite run test:ci
+```
+
+This builds the in-sandbox entry (`src/ci/headless.ts`) as a single
+self-executing bundle and hands it to the driver (`ci/run-ci.ts`), which
+serves the prebuilt frontend bundle via the frontend e2e static server,
+intercepts every backend RPC with Playwright fixtures (no backend, no login),
+opens the mocked workspace file, injects the bundle directly into the plugin
+sandbox, and streams each test's result from the page console — failing the
+process if any test fails. The mocked backend is not a limitation here:
+everything the suite asserts is frontend store logic executed in memory; the
+backend's only role is persistence, which the mock answers with a canned
+response.
+
+Prerequisites: the frontend bundle must exist at `frontend/resources/public`
+(the devenv watch build suffices; CI builds it via `frontend/scripts/build`),
+and the Playwright browser must be installed
+(`pnpm --filter composable-test-suite exec playwright install chromium`).
+
+Options via environment variables:
+
+- `TEST_FILTER` — run only tests whose composite identifier contains the
+  given substring (case-insensitive), e.g. `TEST_FILTER=MainEditSyncs` for a
+  whole case or `TEST_FILTER=MainEditSyncs-2` for a single variant.
+- `CI_TIMEOUT_MS` — overall timeout waiting for results (default 600000).
+
+## Adding a test
+
+A new test is a composition of operations over a starting configuration, added to
+the set of cases the suite runs. Give the case a meaningful CamelCase identifier
+(e.g. `MainEditSyncs`) and a plain-terms description in three parts: the situation
+setup (what is created), the actions and variations applied to it, and the
+requirement that is asserted. Reuse existing operations and content-creation
+strategies where they fit; introduce a new one only when a genuinely new kind of
+step or configuration is needed. Express variation through the suite's choice
+operations rather than by writing out each combination by hand.
diff --git a/plugins/apps/composable-test-suite/ci/fixtures/get-file.json b/plugins/apps/composable-test-suite/ci/fixtures/get-file.json
new file mode 100644
index 0000000000..7b6e526953
--- /dev/null
+++ b/plugins/apps/composable-test-suite/ci/fixtures/get-file.json
@@ -0,0 +1,60 @@
+{
+    "~:features": {
+        "~#set": [
+            "layout/grid",
+            "styles/v2",
+            "fdata/pointer-map",
+            "fdata/objects-map",
+            "fdata/shape-data-type",
+            "fdata/path-data",
+            "components/v2",
+            "design-tokens/v1",
+            "variants/v1",
+            "plugins/runtime"
+        ]
+    },
+    "~:permissions": {
+        "~:type": "~:membership",
+        "~:is-owner": true,
+        "~:is-admin": true,
+        "~:can-edit": true,
+        "~:can-read": true,
+        "~:is-logged": true
+    },
+    "~:has-media-trimmed": false,
+    "~:comment-thread-seqn": 0,
+    "~:name": "New File 1",
+    "~:revn": 11,
+    "~:modified-at": "~m1713873823633",
+    "~:id": "~uc7ce0794-0992-8105-8004-38f280443849",
+    "~:is-shared": false,
+    "~:version": 46,
+    "~:project-id": "~uc7ce0794-0992-8105-8004-38e630f7920b",
+    "~:created-at": "~m1713536343369",
+    "~:data": {
+        "~:pages": ["~u66697432-c33d-8055-8006-2c62cc084cad"],
+        "~:pages-index": {
+            "~u66697432-c33d-8055-8006-2c62cc084cad": {
+                "~#penpot/pointer": [
+                    "~ude58c8f6-c5c2-8196-8004-3df9e2e52d88",
+                    {
+                        "~:created-at": "~m1713873823636"
+                    }
+                ]
+            }
+        },
+        "~:id": "~uc7ce0794-0992-8105-8004-38f280443849",
+        "~:options": {
+            "~:components-v2": true
+        },
+        "~:recent-colors": [
+            {
+                "~:color": "#0000ff",
+                "~:opacity": 1,
+                "~:id": null,
+                "~:file-id": null,
+                "~:image": null
+            }
+        ]
+    }
+}
diff --git a/plugins/apps/composable-test-suite/ci/run-ci.ts b/plugins/apps/composable-test-suite/ci/run-ci.ts
new file mode 100644
index 0000000000..7f5820ccd1
--- /dev/null
+++ b/plugins/apps/composable-test-suite/ci/run-ci.ts
@@ -0,0 +1,301 @@
+import { spawn, type ChildProcess } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { chromium, type Page } from "playwright";
+
+// Out-of-sandbox CI driver (Node + Playwright) for the composable test suite,
+// following the plugin-api-test-suite's CI driver. NOTE on provenance: the mock
+// harness here (the RPC fixture table, the WebSocket mock, the get-file fixture)
+// exists in three places that must stay in sync — the frontend e2e harness
+// (frontend/playwright, the origin), the plugin-api-test-suite driver, and this
+// file. If workspace loading changes and this driver times out waiting for the
+// viewport, diff against those two first. It serves the prebuilt
+// frontend bundle via the frontend e2e static server, intercepts every backend
+// RPC with Playwright `page.route` (reusing the frontend e2e mock fixtures),
+// injects the prebuilt `headless.js` bundle into the plugin sandbox via
+// `globalThis.ɵloadPlugin`, and captures the results from the page console.
+//
+// No backend and no login are needed: everything the suite asserts (component
+// synchronization, overrides, swap slots, variants) is frontend store logic,
+// executed optimistically in memory; the backend's only role is persistence,
+// which the mock answers with a canned 200.
+//
+// Optional env:
+// - TEST_FILTER: run only tests whose composite identifier contains the given
+//   substring (case-insensitive), e.g. "MainEditSyncs" or "MainEditSyncs-2".
+// - CI_TIMEOUT_MS: overall timeout waiting for results (default 600000).
+
+const here = dirname(fileURLToPath(import.meta.url));
+// here = <root>/plugins/apps/composable-test-suite/ci
+const repoRoot = resolve(here, "../../../../");
+const frontendDir = resolve(repoRoot, "frontend");
+const e2eDataDir = resolve(frontendDir, "playwright/data");
+
+const BASE_URL = "http://localhost:3000";
+
+const headlessBundlePath = resolve(here, "../dist/headless.js");
+
+// Source the permissions from the same manifest the real plugin ships with, so
+// the CI sandbox never drifts from what users actually grant.
+const manifestPath = resolve(here, "../public/manifest.json");
+const PERMISSIONS: string[] = (JSON.parse(readFileSync(manifestPath, "utf-8")) as { permissions: string[] })
+    .permissions;
+
+// Ids of the mocked full-feature file fixture (`ci/fixtures/get-file.json`),
+// kept in sync with the frontend e2e fixtures.
+const MOCK_TEAM_ID = "c7ce0794-0992-8105-8004-38e630f7920a";
+const MOCK_FILE_ID = "c7ce0794-0992-8105-8004-38f280443849";
+const MOCK_PAGE_ID = "66697432-c33d-8055-8006-2c62cc084cad";
+
+// Workspace-load RPCs mirrored from the frontend e2e harness. Maps RPC glob ->
+// fixture file relative to frontend/playwright/data.
+const MOCK_RPCS: Record<string, string> = {
+    "get-profile": "logged-in-user/get-profile-logged-in.json",
+    "get-teams": "get-teams.json",
+    "get-team?id=*": "workspace/get-team-default.json",
+    "get-team-members?team-id=*": "logged-in-user/get-team-members-your-penpot.json",
+    "get-team-users?file-id=*": "logged-in-user/get-team-users-single-user.json",
+    "get-project?id=*": "workspace/get-project-default.json",
+    "get-comment-threads?file-id=*": "workspace/get-comment-threads-empty.json",
+    "get-profiles-for-file-comments?file-id=*": "workspace/get-profile-for-file-comments.json",
+    "get-file-object-thumbnails?file-id=*": "workspace/get-file-object-thumbnails-blank.json",
+    "get-font-variants?team-id=*": "workspace/get-font-variants-empty.json",
+    "get-file-fragment?file-id=*": "workspace/get-file-fragment-blank.json",
+    "get-file-libraries?file-id=*": "workspace/get-file-libraries-empty.json",
+    "update-profile-props": "workspace/update-profile-empty.json",
+};
+
+// Persistence (`update-file`) response shape the frontend expects: it reads
+// `revn`/`lagged` (persistence.cljs `update-file-revn`). `revn` is merged with
+// `max`, so a low value is harmless.
+const UPDATE_FILE_RESPONSE = JSON.stringify({ "~:revn": 1, "~:lagged": [] });
+
+interface ReportedResult {
+    identifier: string;
+    name: string;
+    passed: boolean;
+    durationMs: number;
+    error?: string;
+    transcript?: string[];
+}
+
+async function waitForServer(url: string, timeoutMs = 30000): Promise<void> {
+    const start = Date.now();
+    for (;;) {
+        try {
+            const res = await fetch(url);
+            if (res.ok || res.status === 404) return; // static server is up
+        } catch {
+            /* not up yet */
+        }
+        if (Date.now() - start > timeoutMs) {
+            throw new Error(`Timed out waiting for server at ${url}`);
+        }
+        await new Promise((r) => setTimeout(r, 250));
+    }
+}
+
+function startE2eServer(): ChildProcess {
+    // Reuse the frontend e2e static server: it serves frontend/resources/public
+    // on port 3000, which is also the host the app opens its notifications
+    // WebSocket against — so the WS mock below matches without extra config.
+    return spawn("node", ["scripts/e2e-server.js"], {
+        cwd: frontendDir,
+        stdio: "inherit",
+    });
+}
+
+// Install the frontend e2e WebSocket mock so the workspace's notifications
+// socket can be "opened" without a backend.
+async function installWebSocketMock(page: Page): Promise<Set<string>> {
+    const created = new Set<string>();
+    await page.exposeFunction("onMockWebSocketConstructor", (url: string) => {
+        created.add(url);
+    });
+    await page.addInitScript({
+        path: resolve(frontendDir, "playwright/scripts/MockWebSocket.js"),
+    });
+    return created;
+}
+
+async function openNotificationsWebSocket(page: Page, created: Set<string>): Promise<void> {
+    const start = Date.now();
+    let wsUrl: string | undefined;
+    while (!wsUrl) {
+        wsUrl = [...created].find((u) => u.includes("ws/notifications"));
+        if (wsUrl) break;
+        if (Date.now() - start > 30000) {
+            throw new Error("Timed out waiting for notifications WebSocket");
+        }
+        await new Promise((r) => setTimeout(r, 50));
+    }
+    await page.evaluate((url) => {
+        (WebSocket as unknown as { getByURL: (u: string) => { mockOpen: () => void } | undefined })
+            .getByURL(url)
+            ?.mockOpen();
+    }, wsUrl);
+}
+
+async function setupMockedRoutes(page: Page): Promise<void> {
+    // Config flags: deterministic empty flags.
+    await page.route("**/js/config.js*", (route) =>
+        route.fulfill({
+            status: 200,
+            contentType: "application/javascript",
+            body: 'var penpotFlags = "";\n',
+        })
+    );
+
+    // Workspace-load RPCs from the frontend e2e fixtures.
+    for (const [rpc, fixture] of Object.entries(MOCK_RPCS)) {
+        await page.route(`**/api/main/methods/${rpc}`, (route) =>
+            route.fulfill({
+                status: 200,
+                contentType: "application/transit+json",
+                path: resolve(e2eDataDir, fixture),
+            })
+        );
+    }
+
+    // get-file: the custom full-feature fixture (enables plugins/runtime,
+    // design-tokens/v1, variants/v1, ...). Without these features active the
+    // plugin runtime never initialises.
+    await page.route(/\/api\/main\/methods\/get-file\?/, (route) =>
+        route.fulfill({
+            status: 200,
+            contentType: "application/transit+json",
+            path: resolve(here, "fixtures/get-file.json"),
+        })
+    );
+
+    // Blanket no-op persistence: the suite mutates the in-memory store
+    // optimistically, so a 200 `update-file` mock is enough.
+    await page.route(/\/api\/main\/methods\/update-file\b/, (route) =>
+        route.fulfill({
+            status: 200,
+            contentType: "application/transit+json",
+            body: UPDATE_FILE_RESPONSE,
+        })
+    );
+}
+
+function fileUrl(): string {
+    return `${BASE_URL}/#/workspace?team-id=${MOCK_TEAM_ID}&file-id=${MOCK_FILE_ID}&page-id=${MOCK_PAGE_ID}`;
+}
+
+function printReport(results: ReportedResult[]) {
+    // Each result is already printed live as it streams in; here we only recap
+    // the failures (with their transcripts) so they're easy to find at the
+    // bottom of a long run.
+    const failures = results.filter((r) => !r.passed);
+    if (failures.length > 0) {
+        console.log("\nFailures:");
+        for (const r of failures) {
+            console.log(`  ✗ ${r.identifier} — ${r.name} (${r.durationMs}ms)`);
+            if (r.error) console.log(`      ${r.error}`);
+            for (const step of r.transcript ?? []) {
+                console.log(`        · ${step}`);
+            }
+        }
+    }
+}
+
+async function main() {
+    const bundle = readFileSync(headlessBundlePath, "utf-8");
+
+    const server = startE2eServer();
+    await waitForServer(BASE_URL);
+
+    const browser = await chromium.launch();
+    const context = await browser.newContext();
+    const page = await context.newPage();
+
+    const wsCreated = await installWebSocketMock(page);
+    await setupMockedRoutes(page);
+
+    // The bundle runs inside an SES Compartment (its own `globalThis`), so a
+    // page `addInitScript` global can't reach it. Prepend the filter straight
+    // into the evaluated code.
+    const filter = process.env["TEST_FILTER"];
+    const injectedCode = filter
+        ? `globalThis.__COMPOSABLE_SUITE_FILTER__ = ${JSON.stringify(filter)};\n${bundle}`
+        : bundle;
+
+    const results: ReportedResult[] = [];
+    let fatal: string | null = null;
+
+    console.log("\nRunning tests:");
+    const done = new Promise<void>((resolvePromise) => {
+        page.on("console", (msg) => {
+            const text = msg.text();
+            if (text.startsWith("__TEST_RESULT__ ")) {
+                const result: ReportedResult = JSON.parse(text.slice("__TEST_RESULT__ ".length));
+                results.push(result);
+                const icon = result.passed ? "✓" : "✗";
+                console.log(`  ${icon} ${result.identifier} — ${result.name} (${result.durationMs}ms)`);
+                if (!result.passed && result.error) {
+                    console.log(`      ${result.error}`);
+                }
+            } else if (text.startsWith("__TEST_DONE__ ")) {
+                resolvePromise();
+            } else if (text.startsWith("__TEST_FATAL__ ")) {
+                fatal = (JSON.parse(text.slice("__TEST_FATAL__ ".length)) as { message: string }).message;
+                resolvePromise();
+            }
+        });
+    });
+
+    await page.goto(fileUrl());
+    await openNotificationsWebSocket(page, wsCreated);
+
+    await page.waitForSelector('[data-testid="viewport"]');
+    // The plugin runtime initialises asynchronously after the file's features
+    // are active; wait for the loader to be exposed before injecting.
+    await page.waitForFunction(
+        () => typeof (globalThis as unknown as { ɵloadPlugin?: unknown }).ɵloadPlugin === "function",
+        { timeout: 30000 }
+    );
+
+    await page.evaluate(
+        ({ code, permissions }) => {
+            (globalThis as unknown as { ɵloadPlugin: (m: unknown) => void }).ɵloadPlugin({
+                pluginId: "00000000-0000-0000-0000-000000000000",
+                name: "Composable Test Suite (CI)",
+                code,
+                icon: "",
+                description: "",
+                permissions,
+            });
+        },
+        { code: injectedCode, permissions: PERMISSIONS }
+    );
+
+    const timeoutMs = Number(process.env["CI_TIMEOUT_MS"] ?? 600000);
+    await Promise.race([
+        done,
+        new Promise<void>((_, reject) =>
+            setTimeout(() => reject(new Error("Timed out waiting for test results")), timeoutMs)
+        ),
+    ]);
+
+    await browser.close();
+    server.kill();
+
+    printReport(results);
+
+    if (fatal) {
+        console.error(`\nFatal error while running tests: ${fatal}`);
+        process.exit(1);
+    }
+
+    const failed = results.filter((r) => !r.passed).length;
+    const passed = results.filter((r) => r.passed).length;
+    console.log(`\n${passed} passed, ${failed} failed.`);
+    process.exit(failed > 0 ? 1 : 0);
+}
+
+main().catch((err: unknown) => {
+    console.error(err);
+    process.exit(1);
+});
diff --git a/plugins/apps/composable-test-suite/index.html b/plugins/apps/composable-test-suite/index.html
new file mode 100644
index 0000000000..a0a995f060
--- /dev/null
+++ b/plugins/apps/composable-test-suite/index.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Composable Tests</title>
+    </head>
+    <body>
+        <div class="plugin-container">
+            <div class="toolbar">
+                <button type="button" id="run-all-btn" data-appearance="primary">Run all</button>
+                <button type="button" id="run-selected-btn" data-appearance="secondary">Run selected</button>
+                <button type="button" id="clear-selection-btn" data-appearance="secondary">Clear selection</button>
+            </div>
+            <div id="summary" class="summary body-s"></div>
+            <div id="tree" class="tree"></div>
+        </div>
+
+        <script type="module" src="/src/main.ts"></script>
+    </body>
+</html>
diff --git a/plugins/apps/composable-test-suite/package.json b/plugins/apps/composable-test-suite/package.json
new file mode 100644
index 0000000000..21b2a1c1e3
--- /dev/null
+++ b/plugins/apps/composable-test-suite/package.json
@@ -0,0 +1,30 @@
+{
+    "name": "composable-test-suite",
+    "private": true,
+    "version": "1.0.0",
+    "type": "module",
+    "scripts": {
+        "start": "vite build --watch",
+        "init": "pnpm run build && pnpm run start",
+        "build": "tsc && vite build",
+        "build:headless": "vite build --config vite.config.headless.ts",
+        "test:ci": "pnpm run build:headless && tsx ci/run-ci.ts",
+        "preview": "vite preview",
+        "bootstrap": "pnpm install --ignore-workspace && pnpm run build && pnpm run start",
+        "types:check": "tsc --noEmit",
+        "fmt": "prettier --write src ci index.html",
+        "clean": "rm -rf dist/"
+    },
+    "dependencies": {
+        "@penpot/plugin-styles": "1.4.2",
+        "@penpot/plugin-types": "1.4.2"
+    },
+    "devDependencies": {
+        "playwright": "^1.62.1",
+        "prettier": "^3.9.6",
+        "typescript": "^5.9.3",
+        "vite": "^8.2.0",
+        "vite-live-preview": "^0.4.0"
+    },
+    "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
+}
diff --git a/plugins/apps/composable-test-suite/pnpm-lock.yaml b/plugins/apps/composable-test-suite/pnpm-lock.yaml
new file mode 100644
index 0000000000..93ed3672c1
--- /dev/null
+++ b/plugins/apps/composable-test-suite/pnpm-lock.yaml
@@ -0,0 +1,857 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@penpot/plugin-styles':
+        specifier: 1.4.1
+        version: 1.4.1
+      '@penpot/plugin-types':
+        specifier: 1.4.1
+        version: 1.4.1
+    devDependencies:
+      playwright:
+        specifier: ^1.61.1
+        version: 1.61.1
+      prettier:
+        specifier: ^3.6.2
+        version: 3.9.4
+      typescript:
+        specifier: ^5.8.3
+        version: 5.9.3
+      vite:
+        specifier: ^7.0.8
+        version: 7.3.6(@types/node@26.0.1)
+      vite-live-preview:
+        specifier: ^0.3.2
+        version: 0.3.2(vite@7.3.6(@types/node@26.0.1))
+
+packages:
+
+  '@commander-js/extra-typings@12.1.0':
+    resolution: {integrity: sha512-wf/lwQvWAA0goIghcb91dQYpkLBcyhOhQNqG/VgWhnKzgt+UOMvra7EX/2fv70arm5RW+PUHoQHHDa6/p77Eqg==}
+    peerDependencies:
+      commander: ~12.1.0
+
+  '@esbuild/aix-ppc64@0.28.1':
+    resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.28.1':
+    resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.28.1':
+    resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.28.1':
+    resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.28.1':
+    resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.28.1':
+    resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.28.1':
+    resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.28.1':
+    resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.28.1':
+    resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.28.1':
+    resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.28.1':
+    resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.28.1':
+    resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.28.1':
+    resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.28.1':
+    resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.28.1':
+    resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.28.1':
+    resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.28.1':
+    resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.28.1':
+    resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.28.1':
+    resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.28.1':
+    resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@esbuild/sunos-x64@0.28.1':
+    resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.28.1':
+    resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.28.1':
+    resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.28.1':
+    resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@penpot/plugin-styles@1.4.1':
+    resolution: {integrity: sha512-6TuJqKQsq1Xmhn2A02R+kCOzIzIdqgFg5z6ncLH2PlAflKIX6aYsGiOF7yFx4RYgCegRVMFPnVis6/hwO+YGQg==}
+
+  '@penpot/plugin-types@1.4.1':
+    resolution: {integrity: sha512-pHE2B3GI8M5JR03S/NdBoN+z6e1R1IEh3vpFbLG9LN0EZpQE6nEbmCo5jWAWI73Jqlg6CHG/RWVJNmWECnkDTA==}
+
+  '@rollup/rollup-android-arm-eabi@4.62.2':
+    resolution: {integrity: sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.62.2':
+    resolution: {integrity: sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.62.2':
+    resolution: {integrity: sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.62.2':
+    resolution: {integrity: sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.62.2':
+    resolution: {integrity: sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.62.2':
+    resolution: {integrity: sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.62.2':
+    resolution: {integrity: sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.62.2':
+    resolution: {integrity: sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-arm64-gnu@4.62.2':
+    resolution: {integrity: sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm64-musl@4.62.2':
+    resolution: {integrity: sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-loong64-gnu@4.62.2':
+    resolution: {integrity: sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-loong64-musl@4.62.2':
+    resolution: {integrity: sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-ppc64-gnu@4.62.2':
+    resolution: {integrity: sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-ppc64-musl@4.62.2':
+    resolution: {integrity: sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.62.2':
+    resolution: {integrity: sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-riscv64-musl@4.62.2':
+    resolution: {integrity: sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-s390x-gnu@4.62.2':
+    resolution: {integrity: sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-gnu@4.62.2':
+    resolution: {integrity: sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-musl@4.62.2':
+    resolution: {integrity: sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-openbsd-x64@4.62.2':
+    resolution: {integrity: sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@rollup/rollup-openharmony-arm64@4.62.2':
+    resolution: {integrity: sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rollup/rollup-win32-arm64-msvc@4.62.2':
+    resolution: {integrity: sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.62.2':
+    resolution: {integrity: sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-gnu@4.62.2':
+    resolution: {integrity: sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.62.2':
+    resolution: {integrity: sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==}
+    cpu: [x64]
+    os: [win32]
+
+  '@types/ansi-html@0.0.0':
+    resolution: {integrity: sha512-PEBpUlteD0VW02udY7UjjgjxHwVXmkdanhmRIMkzatGmORJGjzqKylrXVxz1G5xRTEECMxIkwTHpPmZ9Jb7ANQ==}
+
+  '@types/debug@4.1.13':
+    resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
+
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+
+  '@types/ms@2.1.0':
+    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
+
+  '@types/node@26.0.1':
+    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+
+  '@types/ws@8.18.1':
+    resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
+
+  ansi-html@0.0.9:
+    resolution: {integrity: sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==}
+    engines: {'0': node >= 0.8.0}
+    hasBin: true
+
+  chalk@5.6.2:
+    resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  esbuild@0.28.1:
+    resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escape-goat@4.0.0:
+    resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==}
+    engines: {node: '>=12'}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  nanoid@3.3.15:
+    resolution: {integrity: sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  p-defer@4.0.1:
+    resolution: {integrity: sha512-Mr5KC5efvAK5VUptYEIopP1bakB85k2IWXaRC0rsh1uwn1L6M0LVml8OIQ4Gudg4oyZakf7FmeRLkMMtZW1i5A==}
+    engines: {node: '>=12'}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
+  playwright-core@1.61.1:
+    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.61.1:
+    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  postcss@8.5.16:
+    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prettier@3.9.4:
+    resolution: {integrity: sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  rollup@4.62.2:
+    resolution: {integrity: sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
+    engines: {node: '>=12.0.0'}
+
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@8.3.0:
+    resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==}
+
+  vite-live-preview@0.3.2:
+    resolution: {integrity: sha512-NrmGaAc85qvkx/+6FluiTo9rLnoY+/NOYnuUvcW5Yb5tSJzUxuloXYrCSS1dtxQB9YKUbpQ95JCb0GRuF//JEQ==}
+    hasBin: true
+    peerDependencies:
+      vite: '>=5.2.13'
+
+  vite@7.3.6:
+    resolution: {integrity: sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      lightningcss: ^1.21.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  ws@8.21.0:
+    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+snapshots:
+
+  '@commander-js/extra-typings@12.1.0(commander@12.1.0)':
+    dependencies:
+      commander: 12.1.0
+
+  '@esbuild/aix-ppc64@0.28.1':
+    optional: true
+
+  '@esbuild/android-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/android-arm@0.28.1':
+    optional: true
+
+  '@esbuild/android-x64@0.28.1':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/darwin-x64@0.28.1':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-arm@0.28.1':
+    optional: true
+
+  '@esbuild/linux-ia32@0.28.1':
+    optional: true
+
+  '@esbuild/linux-loong64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.28.1':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.28.1':
+    optional: true
+
+  '@esbuild/linux-s390x@0.28.1':
+    optional: true
+
+  '@esbuild/linux-x64@0.28.1':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.28.1':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/sunos-x64@0.28.1':
+    optional: true
+
+  '@esbuild/win32-arm64@0.28.1':
+    optional: true
+
+  '@esbuild/win32-ia32@0.28.1':
+    optional: true
+
+  '@esbuild/win32-x64@0.28.1':
+    optional: true
+
+  '@penpot/plugin-styles@1.4.1': {}
+
+  '@penpot/plugin-types@1.4.1': {}
+
+  '@rollup/rollup-android-arm-eabi@4.62.2':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-linux-x64-musl@4.62.2':
+    optional: true
+
+  '@rollup/rollup-openbsd-x64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-openharmony-arm64@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-arm64-msvc@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-ia32-msvc@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.62.2':
+    optional: true
+
+  '@rollup/rollup-win32-x64-msvc@4.62.2':
+    optional: true
+
+  '@types/ansi-html@0.0.0': {}
+
+  '@types/debug@4.1.13':
+    dependencies:
+      '@types/ms': 2.1.0
+
+  '@types/estree@1.0.9': {}
+
+  '@types/ms@2.1.0': {}
+
+  '@types/node@26.0.1':
+    dependencies:
+      undici-types: 8.3.0
+
+  '@types/ws@8.18.1':
+    dependencies:
+      '@types/node': 26.0.1
+
+  ansi-html@0.0.9: {}
+
+  chalk@5.6.2: {}
+
+  commander@12.1.0: {}
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  esbuild@0.28.1:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.28.1
+      '@esbuild/android-arm': 0.28.1
+      '@esbuild/android-arm64': 0.28.1
+      '@esbuild/android-x64': 0.28.1
+      '@esbuild/darwin-arm64': 0.28.1
+      '@esbuild/darwin-x64': 0.28.1
+      '@esbuild/freebsd-arm64': 0.28.1
+      '@esbuild/freebsd-x64': 0.28.1
+      '@esbuild/linux-arm': 0.28.1
+      '@esbuild/linux-arm64': 0.28.1
+      '@esbuild/linux-ia32': 0.28.1
+      '@esbuild/linux-loong64': 0.28.1
+      '@esbuild/linux-mips64el': 0.28.1
+      '@esbuild/linux-ppc64': 0.28.1
+      '@esbuild/linux-riscv64': 0.28.1
+      '@esbuild/linux-s390x': 0.28.1
+      '@esbuild/linux-x64': 0.28.1
+      '@esbuild/netbsd-arm64': 0.28.1
+      '@esbuild/netbsd-x64': 0.28.1
+      '@esbuild/openbsd-arm64': 0.28.1
+      '@esbuild/openbsd-x64': 0.28.1
+      '@esbuild/openharmony-arm64': 0.28.1
+      '@esbuild/sunos-x64': 0.28.1
+      '@esbuild/win32-arm64': 0.28.1
+      '@esbuild/win32-ia32': 0.28.1
+      '@esbuild/win32-x64': 0.28.1
+
+  escape-goat@4.0.0: {}
+
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
+  fsevents@2.3.2:
+    optional: true
+
+  fsevents@2.3.3:
+    optional: true
+
+  ms@2.1.3: {}
+
+  nanoid@3.3.15: {}
+
+  p-defer@4.0.1: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@4.0.4: {}
+
+  playwright-core@1.61.1: {}
+
+  playwright@1.61.1:
+    dependencies:
+      playwright-core: 1.61.1
+    optionalDependencies:
+      fsevents: 2.3.2
+
+  postcss@8.5.16:
+    dependencies:
+      nanoid: 3.3.15
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  prettier@3.9.4: {}
+
+  rollup@4.62.2:
+    dependencies:
+      '@types/estree': 1.0.9
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.62.2
+      '@rollup/rollup-android-arm64': 4.62.2
+      '@rollup/rollup-darwin-arm64': 4.62.2
+      '@rollup/rollup-darwin-x64': 4.62.2
+      '@rollup/rollup-freebsd-arm64': 4.62.2
+      '@rollup/rollup-freebsd-x64': 4.62.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.62.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.62.2
+      '@rollup/rollup-linux-arm64-gnu': 4.62.2
+      '@rollup/rollup-linux-arm64-musl': 4.62.2
+      '@rollup/rollup-linux-loong64-gnu': 4.62.2
+      '@rollup/rollup-linux-loong64-musl': 4.62.2
+      '@rollup/rollup-linux-ppc64-gnu': 4.62.2
+      '@rollup/rollup-linux-ppc64-musl': 4.62.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.62.2
+      '@rollup/rollup-linux-riscv64-musl': 4.62.2
+      '@rollup/rollup-linux-s390x-gnu': 4.62.2
+      '@rollup/rollup-linux-x64-gnu': 4.62.2
+      '@rollup/rollup-linux-x64-musl': 4.62.2
+      '@rollup/rollup-openbsd-x64': 4.62.2
+      '@rollup/rollup-openharmony-arm64': 4.62.2
+      '@rollup/rollup-win32-arm64-msvc': 4.62.2
+      '@rollup/rollup-win32-ia32-msvc': 4.62.2
+      '@rollup/rollup-win32-x64-gnu': 4.62.2
+      '@rollup/rollup-win32-x64-msvc': 4.62.2
+      fsevents: 2.3.3
+
+  source-map-js@1.2.1: {}
+
+  tinyglobby@0.2.17:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
+  typescript@5.9.3: {}
+
+  undici-types@8.3.0: {}
+
+  vite-live-preview@0.3.2(vite@7.3.6(@types/node@26.0.1)):
+    dependencies:
+      '@commander-js/extra-typings': 12.1.0(commander@12.1.0)
+      '@types/ansi-html': 0.0.0
+      '@types/debug': 4.1.13
+      '@types/ws': 8.18.1
+      ansi-html: 0.0.9
+      chalk: 5.6.2
+      commander: 12.1.0
+      debug: 4.4.3
+      escape-goat: 4.0.0
+      p-defer: 4.0.1
+      vite: 7.3.6(@types/node@26.0.1)
+      ws: 8.21.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  vite@7.3.6(@types/node@26.0.1):
+    dependencies:
+      esbuild: 0.28.1
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+      postcss: 8.5.16
+      rollup: 4.62.2
+      tinyglobby: 0.2.17
+    optionalDependencies:
+      '@types/node': 26.0.1
+      fsevents: 2.3.3
+
+  ws@8.21.0: {}
diff --git a/plugins/apps/composable-test-suite/pnpm-workspace.yaml b/plugins/apps/composable-test-suite/pnpm-workspace.yaml
new file mode 100644
index 0000000000..c5739b7433
--- /dev/null
+++ b/plugins/apps/composable-test-suite/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+ignoredBuiltDependencies:
+  - esbuild
diff --git a/plugins/apps/composable-test-suite/public/icon.jpg b/plugins/apps/composable-test-suite/public/icon.jpg
new file mode 100644
index 0000000000..9df8dd26a4
Binary files /dev/null and b/plugins/apps/composable-test-suite/public/icon.jpg differ
diff --git a/plugins/apps/composable-test-suite/public/manifest.json b/plugins/apps/composable-test-suite/public/manifest.json
new file mode 100644
index 0000000000..f65b00148a
--- /dev/null
+++ b/plugins/apps/composable-test-suite/public/manifest.json
@@ -0,0 +1,8 @@
+{
+    "name": "Composable Tests",
+    "code": "plugin.js",
+    "icon": "icon.jpg",
+    "version": 2,
+    "description": "Runs the composable component test suite against the current Penpot document.",
+    "permissions": ["content:read", "content:write", "library:read", "library:write"]
+}
diff --git a/plugins/apps/composable-test-suite/src/ci/headless.ts b/plugins/apps/composable-test-suite/src/ci/headless.ts
new file mode 100644
index 0000000000..4de46d4707
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/ci/headless.ts
@@ -0,0 +1,74 @@
+import { createTestSuite, TestRunObserver, TestResult } from "../composable-tests";
+
+// In-sandbox CI entry point. Built as a standalone IIFE bundle (dist/headless.js)
+// and evaluated inside a real Penpot plugin sandbox by the out-of-sandbox driver
+// `ci/run-ci.ts` (note: a different `ci/` directory). It runs the composable test
+// suite without any UI and reports each result through `console.log` markers that
+// the Playwright driver parses. The marker protocol mirrors the one used by the
+// plugin-api-test-suite.
+
+/** What the driver receives for each finished test. */
+interface ReportedResult {
+    /** The composite case identifier, e.g. "MainEditSyncs-2". */
+    identifier: string;
+    /** The test's descriptive name (identifies the variant's choices). */
+    name: string;
+    passed: boolean;
+    durationMs: number;
+    error?: string;
+    /** The applied steps, for diagnosing failures from the CI log. */
+    transcript?: readonly string[];
+}
+
+async function main() {
+    const suite = createTestSuite();
+    const tree = suite.tree();
+
+    // Composite identifiers ("Identifier-N", 1-based) for reporting, and the
+    // id order matching the tree — the same addressing the panel UI uses.
+    const identifierById = new Map<string, string>();
+    const orderedIds: string[] = [];
+    for (const group of tree.groups) {
+        group.tests.forEach((test, i) => {
+            identifierById.set(test.id, `${group.identifier}-${i + 1}`);
+            orderedIds.push(test.id);
+        });
+    }
+
+    // Set by the driver from TEST_FILTER: run only tests whose composite
+    // identifier contains the given substring (case-insensitive), e.g.
+    // "MainEditSyncs" (whole case) or "MainEditSyncs-2" (single variant).
+    const filter = (
+        globalThis as unknown as { __COMPOSABLE_SUITE_FILTER__?: string }
+    ).__COMPOSABLE_SUITE_FILTER__?.toLowerCase();
+    const ids = filter ? orderedIds.filter((id) => identifierById.get(id)!.toLowerCase().includes(filter)) : orderedIds;
+
+    const startedAt = new Map<string, number>();
+    let failed = 0;
+
+    const observer: TestRunObserver = {
+        onTestStarted(id: string): void {
+            startedAt.set(id, Date.now());
+        },
+        onTestFinished(id: string, result: TestResult): void {
+            if (!result.passed) failed++;
+            const reported: ReportedResult = {
+                identifier: identifierById.get(id) ?? id,
+                name: result.name,
+                passed: result.passed,
+                durationMs: Date.now() - (startedAt.get(id) ?? Date.now()),
+                error: result.errorMessage,
+                transcript: result.passed ? undefined : result.transcript,
+            };
+            console.log("__TEST_RESULT__ " + JSON.stringify(reported));
+        },
+    };
+
+    await suite.run(ids, observer);
+    console.log("__TEST_DONE__ " + JSON.stringify({ total: ids.length, failed }));
+}
+
+main().catch((err: unknown) => {
+    const message = err instanceof Error ? (err.stack ?? err.message) : String(err);
+    console.log("__TEST_FATAL__ " + JSON.stringify({ message }));
+});
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases.ts
new file mode 100644
index 0000000000..e9150ec16c
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases.ts
@@ -0,0 +1,23 @@
+import { TestCase } from "./test-suite/TestCase.ts";
+import { createTestCaseCopyOverrideSurvivesMainChange } from "./cases/caseCopyOverrideSurvivesMainChange.ts";
+import { createTestCaseMainEditSyncs } from "./cases/caseMainEditSyncs.ts";
+import { createTestCaseRemoteMainCopySyncNested } from "./cases/caseRemoteMainCopySyncNested.ts";
+import { createTestCaseVariantSwitchPropagates } from "./cases/caseVariantSwitchPropagates.ts";
+import { createTestCaseCopySubheadDeletePreservesSlots } from "./cases/caseCopySubheadDeletePreservesSlots.ts";
+import { createTestCaseMainReorderKeepsCopySlots } from "./cases/caseMainReorderKeepsCopySlots.ts";
+
+/**
+ * All composable test cases currently defined. A factory (not a constant): each
+ * case captures live foundation state and is rebuilt per run, and the runner
+ * further rebuilds the configuration per enumerated variant.
+ */
+export function allCases(): readonly TestCase[] {
+    return [
+        createTestCaseCopyOverrideSurvivesMainChange(),
+        createTestCaseMainEditSyncs(),
+        createTestCaseRemoteMainCopySyncNested(),
+        createTestCaseVariantSwitchPropagates(),
+        createTestCaseCopySubheadDeletePreservesSlots(),
+        createTestCaseMainReorderKeepsCopySlots(),
+    ];
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopyOverrideSurvivesMainChange.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopyOverrideSurvivesMainChange.ts
new file mode 100644
index 0000000000..890a6d08e8
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopyOverrideSurvivesMainChange.ts
@@ -0,0 +1,41 @@
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Color } from "../model/Color";
+import { ShapePropFillColor } from "../model/ShapeProp.ts";
+import { OpChangeProperty } from "../operations/OpChangeProperty";
+import { OpAssert } from "../operations/OpAssert";
+import { OpCreateSimpleComponentWithCopy } from "../operations/OpCreateSimpleComponentWithCopy";
+import { OpSequence } from "../operations/OpSequence.ts";
+
+// the three distinct fill colours the case uses (read-back values are lower-case)
+const BASELINE = new Color("#aaaaaa");
+const OVERRIDE = new Color("#ff0000");
+const MAIN_CHANGE = new Color("#00ff00");
+
+/**
+ * Case B — an override on a copy survives a later change to the main.
+ *
+ * Override the copy's child fill, then change the main's child fill to a
+ * different colour, and assert the copy still shows the override (a touched
+ * property is not overwritten by main propagation).
+ */
+export function createTestCaseCopyOverrideSurvivesMainChange(): TestCase {
+    const fillColor = new ShapePropFillColor();
+    const opCreateComponent = new OpCreateSimpleComponentWithCopy(BASELINE);
+    const opOverrideCopy = new OpChangeProperty(opCreateComponent.roles.copyChild, fillColor, OVERRIDE);
+    return new TestCase(
+        "CopyOverrideSurvivesMainChange",
+        "A component containing a single rectangle is created, plus a copy of it. The copy's " +
+            "rectangle is then given an override: its fill colour is changed directly on the copy. " +
+            "Afterwards the main's rectangle is changed to yet another colour. The copy must keep " +
+            "its own overridden colour — a property touched on the copy is protected from being " +
+            "overwritten by later changes propagating from the main.",
+        new OpSequence(
+            opCreateComponent,
+            opOverrideCopy,
+            new OpChangeProperty(opCreateComponent.roles.mainChild, fillColor, MAIN_CHANGE),
+            new OpAssert("copy child keeps its override after the main changes", (situation) =>
+                opOverrideCopy.assertHasChangedProperty(situation, opCreateComponent.roles.copyChild)
+            )
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopySubheadDeletePreservesSlots.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopySubheadDeletePreservesSlots.ts
new file mode 100644
index 0000000000..2f7d664605
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseCopySubheadDeletePreservesSlots.ts
@@ -0,0 +1,55 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { ShapePropHeight } from "../model/ShapeProp.ts";
+import { OpAssert } from "../operations/OpAssert";
+import { OpSequence } from "../operations/OpSequence.ts";
+import { OpOneOf } from "../operations/OpOneOf.ts";
+import { OpOptional } from "../operations/OpOptional.ts";
+import { OpChangeProperty } from "../operations/OpChangeProperty";
+import { OpCreateNestableComponent } from "../operations/OpCreateNestableComponent";
+import { OpDeleteShape } from "../operations/OpDeleteShape";
+import { ContentCreationStrategySiblingInstances } from "../content-creation/ContentCreationStrategySiblingInstances";
+import { SlotIntegrity } from "../util/SlotIntegrity";
+
+const BASELINE = new Color("#aaaaaa");
+const NESTED_COUNT = 3;
+const LAYOUT = "grid" as const;
+const REFLOW_HEIGHT = 500; // any size change of the grid root forces a reflow
+
+/** Sweeps copy sub-head deletion and grid reflow while preserving alignment with the main. */
+export function createTestCaseCopySubheadDeletePreservesSlots(): TestCase {
+    const content = new ContentCreationStrategySiblingInstances(NESTED_COUNT, BASELINE, LAYOUT);
+    const foundation = new OpCreateNestableComponent(content);
+    // domain vocabulary for the generic roles: the outer component's main and its copy
+    const outerMain = foundation.roles.mainInstance;
+    const outerCopy = foundation.roles.copyInstance;
+
+    // Resolve the copy's boundary sub-heads at apply time.
+    const firstSubhead = (s: Situation): Shape => content.getSibling(s.get(outerCopy), 0);
+    const lastSubhead = (s: Situation): Shape => content.getSibling(s.get(outerCopy), NESTED_COUNT - 1);
+    const deleteFirstSubhead = new OpDeleteShape(firstSubhead, "first copy sub-head");
+    const deleteLastSubhead = new OpDeleteShape(lastSubhead, "last copy sub-head");
+
+    // Resizing the copy root reflows its grid children.
+    const reflowCopy = new OpChangeProperty(outerCopy, new ShapePropHeight(), REFLOW_HEIGHT, "copy root");
+
+    return new TestCase(
+        "CopySubheadDeletePreservesSlots",
+        "A grid component with nested instances and a copy is created; a boundary copy sub-head " +
+            "is optionally deleted and the copy optionally reflowed; remaining copy sub-heads " +
+            "must stay positionally aligned with the main.",
+        new OpSequence(
+            foundation,
+            foundation.createOpInstantiate(),
+            // Optionally delete the first or last copy sub-head.
+            new OpOptional(new OpOneOf(deleteFirstSubhead, deleteLastSubhead)),
+            // Optionally reflow the grid after deletion.
+            new OpOptional(reflowCopy),
+            new OpAssert("every copy sub-head still references its positional slot in the main", (s) => {
+                SlotIntegrity.assertAligned(s.get(outerCopy) as Board, s.get(outerMain) as Board);
+            })
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainEditSyncs.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainEditSyncs.ts
new file mode 100644
index 0000000000..292fd133fd
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainEditSyncs.ts
@@ -0,0 +1,57 @@
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Color } from "../model/Color";
+import { ShapePropFillColor, ShapePropHeight, ShapePropRotation } from "../model/ShapeProp.ts";
+import { Assert } from "../util/Assert.ts";
+import { OpAssert } from "../operations/OpAssert";
+import { OpSequence } from "../operations/OpSequence.ts";
+import { OpOneOf } from "../operations/OpOneOf.ts";
+import { OpOptional } from "../operations/OpOptional.ts";
+import { OpChangeProperty } from "../operations/OpChangeProperty";
+import { OpCreateSimpleComponentWithCopy } from "../operations/OpCreateSimpleComponentWithCopy";
+
+const BASELINE = new Color("#aaaaaa");
+const SYNC_COLOR = new Color("#00ff00");
+const SYNC_HEIGHT = 80; // the rect starts at 50x50
+const ROTATION_DEGREES = 45;
+
+/**
+ * Case C — an edit to the main's rectangle syncs to the copy, also when the copy
+ * is rotated.
+ *
+ * Create a one-rectangle component with a copy, then sweep two choice points:
+ * OPTIONALLY rotate the entire copy root by 45°, and apply ONE of several edits to
+ * the MAIN's rectangle (fill colour, height). Assert that whichever edit was
+ * applied is reflected on the COPY's rectangle. The rotation sweep guards the
+ * regression class where a transformed copy stops receiving main propagation.
+ */
+export function createTestCaseMainEditSyncs(): TestCase {
+    const foundation = new OpCreateSimpleComponentWithCopy(BASELINE);
+    const { mainChild, copyChild, copyRoot } = foundation.roles;
+
+    // optionally rotate the whole copy instance (its root board)
+    const rotateCopy = new OpChangeProperty(copyRoot, new ShapePropRotation(), ROTATION_DEGREES, "copy root");
+
+    // one of several edits to the main's rectangle
+    const mainEdits = [
+        new OpChangeProperty(mainChild, new ShapePropFillColor(), SYNC_COLOR, "main rect"),
+        new OpChangeProperty(mainChild, new ShapePropHeight(), SYNC_HEIGHT, "main rect"),
+    ];
+
+    return new TestCase(
+        "MainEditSyncs",
+        "A component containing a single rectangle is created, plus a copy of it. The copy is " +
+            "optionally rotated by 45° as a whole. Then one of several properties (fill colour, " +
+            "height) is changed on the main's rectangle. The change must propagate to the copy's " +
+            "rectangle — also when the copy was rotated beforehand.",
+        new OpSequence(
+            foundation,
+            new OpOptional(rotateCopy),
+            new OpOneOf(...mainEdits),
+            new OpAssert("the applied main edit is reflected on the copy's rectangle", (s) => {
+                const applied = mainEdits.filter((edit) => s.wasApplied(edit));
+                Assert.that(applied.length === 1, `exactly one main edit should be applied, found ${applied.length}`);
+                applied[0].assertHasChangedProperty(s, copyChild);
+            })
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainReorderKeepsCopySlots.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainReorderKeepsCopySlots.ts
new file mode 100644
index 0000000000..0c7cc9afb1
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseMainReorderKeepsCopySlots.ts
@@ -0,0 +1,41 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { OpAssert } from "../operations/OpAssert";
+import { OpSequence } from "../operations/OpSequence.ts";
+import { OpCreateNestableComponent } from "../operations/OpCreateNestableComponent";
+import { OpReorderShape } from "../operations/OpReorderShape";
+import { ContentCreationStrategySiblingInstances } from "../content-creation/ContentCreationStrategySiblingInstances";
+import { SlotIntegrity } from "../util/SlotIntegrity";
+
+const BASELINE = new Color("#aaaaaa");
+const NESTED_COUNT = 3;
+
+/** Verifies that main-side reordering realigns copies without swap slots. */
+export function createTestCaseMainReorderKeepsCopySlots(): TestCase {
+    // Reorder behavior is independent of layout.
+    const content = new ContentCreationStrategySiblingInstances(NESTED_COUNT, BASELINE);
+    const foundation = new OpCreateNestableComponent(content);
+    // Bind the generic roles to the outer component instances.
+    const outerMain = foundation.roles.mainInstance;
+    const outerCopy = foundation.roles.copyInstance;
+
+    // Resolve the main's first nested sub-head at apply time.
+    const firstMainSubhead = (s: Situation): Shape => content.getSibling(s.get(outerMain), 0);
+
+    return new TestCase(
+        "MainReorderKeepsCopySlots",
+        "A component with nested instances and a copy is created; the first main sub-head is moved " +
+            "to the end; component sync must restore positional alignment without swap slots.",
+        new OpSequence(
+            foundation,
+            foundation.createOpInstantiate(),
+            // Move the main's first sub-head to the end.
+            new OpReorderShape(firstMainSubhead, NESTED_COUNT - 1, "first MAIN sub-head"),
+            new OpAssert("every copy sub-head still references its positional slot in the main", (s) => {
+                SlotIntegrity.assertAligned(s.get(outerCopy) as Board, s.get(outerMain) as Board);
+            })
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseRemoteMainCopySyncNested.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseRemoteMainCopySyncNested.ts
new file mode 100644
index 0000000000..b0836fa2c6
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseRemoteMainCopySyncNested.ts
@@ -0,0 +1,83 @@
+import { Shape } from "@penpot/plugin-types";
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { ShapePropFillColor } from "../model/ShapeProp.ts";
+import { OpChangeProperty } from "../operations/OpChangeProperty";
+import { OpAssert } from "../operations/OpAssert";
+import { OpCreateNestableComponent } from "../operations/OpCreateNestableComponent";
+import { ContentCreationStrategyRectangle } from "../content-creation/ContentCreationStrategyRectangle.ts";
+import { OpSequence } from "../operations/OpSequence.ts";
+import { OpOptional } from "../operations/OpOptional.ts";
+
+// distinct fill colours (read-back values are lower-case)
+const BASELINE = new Color("#aaaaaa");
+const RED = new Color("#ff0000"); // remote edit
+const GREEN = new Color("#00ff00"); // main edit
+const BLUE = new Color("#0000ff"); // copy edit
+
+/**
+ * Case K — the consolidated synchronisation sweep (precedence portion).
+ *
+ * On a freshly created component, sweep DEPTH 0/1/2 (two optional nestings) and
+ * WHICH EDITS were made (three independent optional edits to the remote, main and
+ * copy rect), then assert the override-precedence rule at the copy: a copy
+ * override wins; otherwise a main change; otherwise a remote change; otherwise the
+ * baseline. Propagation is AUTOMATIC — the trajectory contains only the edits, and
+ * the value that surfaces at the copy is what is checked. The edit targets are the
+ * tracked instance roles' rects (resolved via the strategy at the current depth),
+ * so the same composition holds at any depth.
+ *
+ * (The reset checkpoint of the original case is omitted: the Plugin API exposes no
+ * override-reset operation.)
+ */
+export function createTestCaseRemoteMainCopySyncNested(): TestCase {
+    const opCreateComponent = new OpCreateNestableComponent(new ContentCreationStrategyRectangle(BASELINE));
+    const fillColor = new ShapePropFillColor();
+    const { remoteInstance, mainInstance, copyInstance } = opCreateComponent.roles;
+
+    // resolve each instance's rect at the current depth via the strategy
+    const rectOf =
+        (role: typeof remoteInstance) =>
+        (s: Situation): Shape =>
+            opCreateComponent.contentCreator.getRectangle(s.get(role));
+
+    const changeRemote = new OpChangeProperty(rectOf(remoteInstance), fillColor, RED, "remote rect");
+    const changeMain = new OpChangeProperty(rectOf(mainInstance), fillColor, GREEN, "main rect");
+    const changeCopy = new OpChangeProperty(rectOf(copyInstance), fillColor, BLUE, "copy rect");
+
+    // the colour expected at the copy under the precedence rule
+    const expectedAtCopy = (s: Situation): Color => {
+        if (s.wasApplied(changeCopy)) return BLUE;
+        if (s.wasApplied(changeMain)) return GREEN;
+        if (s.wasApplied(changeRemote)) return RED;
+        return BASELINE;
+    };
+
+    return new TestCase(
+        "RemoteMainCopySyncNested",
+        "A component containing a rectangle is created and a copy is instantiated from it. The " +
+            "configuration is optionally nested one or two levels deep: each nesting wraps the " +
+            "copy in a new outer component, whose main becomes the current main, while the " +
+            "originally created main remains as the remote. Any combination of three edits is " +
+            "then applied: colouring the rectangle on the remote, on the current main, and on the " +
+            "copy. The copy's rectangle must show the highest-precedence applied edit — a copy " +
+            "override wins over a main change, which wins over a remote change, which wins over " +
+            "the baseline — at every nesting depth.",
+        new OpSequence(
+            opCreateComponent,
+            opCreateComponent.createOpInstantiate(),
+            new OpOptional(opCreateComponent.createOpMakeNested()),
+            new OpOptional(opCreateComponent.createOpMakeNested()),
+            // sweep which edits were made
+            new OpOptional(changeRemote),
+            new OpOptional(changeMain),
+            new OpOptional(changeCopy),
+            // check the resulting colour
+            new OpAssert("scopy shows the highest-precedence applied edit", (s) => {
+                const copyRect = opCreateComponent.contentCreator.getRectangle(s.get(copyInstance));
+                fillColor.assertEqual(fillColor.read(copyRect), expectedAtCopy(s));
+            })
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/cases/caseVariantSwitchPropagates.ts b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseVariantSwitchPropagates.ts
new file mode 100644
index 0000000000..6a7c6e651f
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/cases/caseVariantSwitchPropagates.ts
@@ -0,0 +1,95 @@
+import { TestCase } from "../test-suite/TestCase.ts";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { ShapePropFillColor } from "../model/ShapeProp.ts";
+import { OpAssert } from "../operations/OpAssert";
+import { OpSequence } from "../operations/OpSequence.ts";
+import { OpOptional } from "../operations/OpOptional.ts";
+import { OpCreateVariantContainer } from "../operations/OpCreateVariantContainer";
+import { OpCreateNestableComponent } from "../operations/OpCreateNestableComponent";
+import { OpSwitchVariant } from "../operations/OpSwitchVariant";
+import { ContentCreationStrategyRectangle } from "../content-creation/ContentCreationStrategyRectangle.ts";
+
+/**
+ * Case M — a variant switch propagates like a swap (the variant-switch flavour of
+ * the swap sweep).
+ *
+ * Build a variant SET of peer members (member i is a rectangle of colour
+ * COLORS[i]) and nest the base member at EVERY level, so each level has a variant
+ * head. Then OPTIONALLY switch the head at each level to a differently-coloured
+ * sibling (a switch at level i selects member i+1, colour SWAP_COLORS[i]) and
+ * assert the colour that surfaces at every level. A switch at level i propagates
+ * OUTWARD to level i and every outer level until a switch at a higher level
+ * overrides it — so the colour at level i is the switch applied at the HIGHEST
+ * index j ≤ i, else the base member's colour.
+ */
+export function createTestCaseVariantSwitchPropagates(): TestCase {
+    const fillColor = new ShapePropFillColor();
+    // the variant members' colours: index 0 is the base member, 1..3 the siblings a
+    // switch can select. swapColors[i] is the colour a switch at level i selects.
+    const baseColor = new Color("#aaaaaa");
+    const swapColors = [new Color("#ff0000"), new Color("#00ff00"), new Color("#0000ff")];
+    const variantColors = [baseColor, ...swapColors]; // variant i has colour COLORS[i]
+    const nestingLevels = 3;
+
+    // the variant set: one rectangle member per colour, addressed by index value
+    const opCreateVariantContainer = new OpCreateVariantContainer(
+        ...variantColors.map((color) => new ContentCreationStrategyRectangle(color))
+    );
+
+    // nest the base member (variant 0) at every level: its instance is the head at
+    // each nesting level, exactly the target a per-level switch acts on
+    const opCreateComponent = new OpCreateNestableComponent(opCreateVariantContainer.createContentCreationStrategy(0));
+
+    // switch[i] switches level i's variant instance to member i+1 (colour SWAP_COLORS[i]).
+    // The nestable op yields the structural nested head; the variant container finds
+    // the variant instance within it — keeping variant knowledge out of the nestable op.
+    const opVariantSwitches = Array.from(
+        { length: nestingLevels },
+        (_unused, i) =>
+            new OpSwitchVariant(
+                (s: Situation) =>
+                    opCreateVariantContainer.getVariantInstance(opCreateComponent.getNestedInstance(s, i)),
+                opCreateVariantContainer.valueForVariant(i + 1)
+            )
+    );
+
+    // the colour expected at level i: the switch applied at the highest j ≤ i, else base
+    const expectedAtLevel = (s: Situation, level: number): Color => {
+        for (let j = level; j >= 0; j--) {
+            if (s.wasApplied(opVariantSwitches[j])) return swapColors[j];
+        }
+        return baseColor;
+    };
+
+    return new TestCase(
+        "VariantSwitchPropagates",
+        "A variant set with four differently coloured rectangle members is created. Its base " +
+            "member is placed inside a component, from which a copy is instantiated and then " +
+            "wrapped in further components, one nesting level at a time — so for each level there " +
+            "is a copy carrying the variant instance at that depth. At each level, that variant " +
+            "instance is optionally switched to a differently coloured member. Each level's " +
+            "rectangle must show the colour selected by the switch applied at the highest level " +
+            "at or below it: a variant switch must propagate through nesting exactly like a " +
+            "component swap.",
+        new OpSequence(
+            // foundations: create the variants, a component with an instance
+            // and nest the instance several times
+            opCreateVariantContainer,
+            opCreateComponent, // creates component with a variant instance
+            opCreateComponent.createOpInstantiate(), // level 0
+            opCreateComponent.createOpMakeNested(), // level 1
+            opCreateComponent.createOpMakeNested(), // level 2
+            // optionally switch the variant to a unique colour at each nesting level
+            ...opVariantSwitches.map((sw) => new OpOptional(sw)),
+            // check the colour that surfaces at every level
+            new OpAssert("each level shows the highest-precedence applied switch", (s) => {
+                for (let level = 0; level < nestingLevels; level++) {
+                    const nestedInstance = opCreateComponent.getNestedInstance(s, level);
+                    const rect = ContentCreationStrategyRectangle.findRectangle(nestedInstance);
+                    fillColor.assertEqual(fillColor.read(rect), expectedAtLevel(s, level));
+                }
+            })
+        )
+    );
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategy.ts b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategy.ts
new file mode 100644
index 0000000000..6773cbb712
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategy.ts
@@ -0,0 +1,18 @@
+import { Board } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation.ts";
+
+/**
+ * A strategy for creating the CONTENT of a component: given the board that will
+ * become a component's root, it fills the board with the component's child shapes.
+ * The abstract contract is just this one step — what a component contains. Anything
+ * needed to locate that content afterwards (e.g. in an instance's subtree) is the
+ * concrete strategy's own affair.
+ *
+ * The current situation is passed in so a strategy may resolve runtime values from
+ * it (e.g. a shape produced by an earlier operation, via a `ShapeTarget`);
+ * strategies that create content from scratch can ignore it.
+ */
+export abstract class ContentCreationStrategy {
+    /** Populates `board` with the component's content, drawing on `situation` as needed. */
+    abstract createContent(situation: Situation, board: Board): void;
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyInstantiateVariantContainer.ts b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyInstantiateVariantContainer.ts
new file mode 100644
index 0000000000..0409912f75
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyInstantiateVariantContainer.ts
@@ -0,0 +1,52 @@
+import { Board, Shape, VariantContainer } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation.ts";
+import { ShapeTarget, resolveTarget } from "../core/ShapeTarget.ts";
+import { ContentCreationStrategy } from "./ContentCreationStrategy.ts";
+
+/**
+ * The name given to the variant-component instance this strategy creates, so it
+ * can be found again as the switch target — including as its image inside each
+ * nested copy (a component instance copies its descendants' names, so the name
+ * propagates through nesting).
+ */
+export const VARIANT_INSTANCE_NAME = "MyComponent";
+
+/**
+ * A content-creation strategy that instantiates one variant of an existing variant
+ * container into the given board. The container is supplied as a `ShapeTarget`
+ * resolved from the situation at apply-time, so this strategy can be constructed
+ * before the container exists (e.g. wired to the op that will create it) and used
+ * once it does. `createContent` instantiates the chosen variant's component,
+ * names it (so it can be located later as the switch head), and appends it to the
+ * board.
+ */
+export class ContentCreationStrategyInstantiateVariantContainer extends ContentCreationStrategy {
+    /**
+     * @param container - resolves the variant container from the situation
+     * @param variantIndex - the 0-based index of the variant to instantiate
+     */
+    constructor(
+        private readonly container: ShapeTarget,
+        private readonly variantIndex: number
+    ) {
+        super();
+    }
+
+    createContent(situation: Situation, board: Board): void {
+        const container = resolveTarget(this.container, situation) as VariantContainer;
+        const variants = container.variants;
+        if (variants === null) {
+            throw new Error("the resolved shape is not a variant container");
+        }
+
+        const components = variants.variantComponents();
+        const component = components[this.variantIndex];
+        if (component === undefined) {
+            throw new Error(`no variant at index ${this.variantIndex} (have ${components.length})`);
+        }
+
+        const instance = component.instance() as Shape;
+        instance.name = VARIANT_INSTANCE_NAME;
+        board.appendChild(instance);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyRectangle.ts b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyRectangle.ts
new file mode 100644
index 0000000000..947218e663
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategyRectangle.ts
@@ -0,0 +1,60 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation.ts";
+import { Color } from "../model/Color.ts";
+import { ShapeUtil } from "../util/ShapeUtil.ts";
+import { ContentCreationStrategy } from "./ContentCreationStrategy.ts";
+
+/**
+ * A content-creation strategy whose component content is a single named rectangle.
+ * It locates that rectangle inside any instance of the component by name, so the
+ * "the rect of this instance" accessor works at any nesting depth (the rect is
+ * found by descending whatever instance is handed in).
+ */
+export class ContentCreationStrategyRectangle extends ContentCreationStrategy {
+    /** The name given to the single rectangle this strategy places in a component. */
+    static readonly RECT_SHAPE_NAME = "Child";
+
+    /**
+     * @param baselineColor - the rectangle's initial fill colour
+     */
+    constructor(private readonly baselineColor: Color) {
+        super();
+    }
+
+    createContent(_situation: Situation, board: Board): void {
+        const rect = penpot.createRectangle();
+        rect.name = ContentCreationStrategyRectangle.RECT_SHAPE_NAME;
+        rect.resize(50, 50);
+        rect.fills = [{ fillColor: this.baselineColor.hex, fillOpacity: this.baselineColor.opacity }];
+        board.appendChild(rect);
+    }
+
+    /**
+     * Returns this strategy's rectangle as it appears inside the given root shape.
+     * Throws if it cannot be found.
+     *
+     * @param instance - the root shape/component instance to search within
+     */
+    static findRectangle(instance: Shape): Shape {
+        const rect = ShapeUtil.findShape(
+            instance,
+            (shape) => shape.name === ContentCreationStrategyRectangle.RECT_SHAPE_NAME
+        );
+        if (rect === null) {
+            throw new Error(
+                `Could not find child "${ContentCreationStrategyRectangle.RECT_SHAPE_NAME}" inside instance "${instance.name}"`
+            );
+        }
+        return rect;
+    }
+
+    /**
+     * Returns this strategy's rectangle as it appears inside the given root shape.
+     * Throws if it cannot be found.
+     *
+     * @param instance - the root shape/component instance to search within
+     */
+    getRectangle(instance: Shape): Shape {
+        return ContentCreationStrategyRectangle.findRectangle(instance);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategySiblingInstances.ts b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategySiblingInstances.ts
new file mode 100644
index 0000000000..7ea25d2da2
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/content-creation/ContentCreationStrategySiblingInstances.ts
@@ -0,0 +1,81 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { ContentCreationStrategy } from "./ContentCreationStrategy";
+
+/** The layout applied to the board holding the sibling instances. */
+export type SiblingLayout = "none" | "flex" | "grid";
+
+/**
+ * A content-creation strategy that fills the board with several SIBLING instances
+ * of one inner component: it creates a small inner component (a board with a
+ * rectangle) and appends `count` instances of it side by side — breadth, in
+ * contrast to the depth-wise wrapping of the nesting operations.
+ *
+ * Used for the swap-slot integrity cases: each sibling instance is a nested
+ * sub-instance head whose `shape-ref` must positionally match the main's children
+ * (see {@link ../util/SlotIntegrity}).
+ *
+ * The `layout` controls how the board arranges the siblings, which determines what
+ * a later structural edit re-flows ("grid" re-runs `reorder-grid-children` on
+ * changes, "flex" only repositions, "none" does nothing). Note that copy-side
+ * deletes have proven safe under every layout (see the case D notes); the layout
+ * is offered to keep the sweep space available, not because it is known to break.
+ */
+export class ContentCreationStrategySiblingInstances extends ContentCreationStrategy {
+    static readonly SIBLING_NAME = "Icon";
+
+    /**
+     * @param count - how many sibling instances of the inner component to append
+     * @param baselineColor - the inner rectangle's fill colour
+     * @param layout - the board layout arranging the siblings (default "none")
+     */
+    constructor(
+        private readonly count: number,
+        private readonly baselineColor: Color,
+        private readonly layout: SiblingLayout = "none"
+    ) {
+        super();
+    }
+
+    createContent(_situation: Situation, board: Board): void {
+        // inner component: a small board with a single rectangle
+        const innerBoard = penpot.createBoard();
+        innerBoard.name = ContentCreationStrategySiblingInstances.SIBLING_NAME;
+        innerBoard.resize(24, 24);
+        const rect = penpot.createRectangle();
+        rect.name = "rect";
+        rect.resize(24, 24);
+        rect.fills = [{ fillColor: this.baselineColor.hex, fillOpacity: this.baselineColor.opacity }];
+        innerBoard.appendChild(rect);
+        const innerComponent = penpot.library.local.createComponent([innerBoard]);
+
+        if (this.layout === "grid") {
+            // a 1-row, N-column grid with each instance in its own cell
+            const grid = board.addGridLayout();
+            while (grid.rows.length < 1) grid.addRow("flex", 1);
+            while (grid.columns.length < this.count) grid.addColumn("flex", 1);
+            for (let i = 0; i < this.count; i++) {
+                grid.appendChild(innerComponent.instance(), 1, i + 1);
+            }
+        } else {
+            // add the flex layout BEFORE the children so they are laid out in order
+            if (this.layout === "flex") board.addFlexLayout();
+            for (let i = 0; i < this.count; i++) {
+                board.appendChild(innerComponent.instance());
+            }
+        }
+    }
+
+    /** Returns the sibling instance at `index` inside a component instance. */
+    getSibling(instance: Board, index: number): Shape {
+        const siblings = (instance.children ?? []).filter(
+            (shape) => shape.name === ContentCreationStrategySiblingInstances.SIBLING_NAME
+        );
+        const sibling = siblings[index];
+        if (sibling === undefined) {
+            throw new Error(`No sibling instance at index ${index} inside "${instance.name}"`);
+        }
+        return sibling;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/DataKey.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/DataKey.ts
new file mode 100644
index 0000000000..34a5620fa7
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/DataKey.ts
@@ -0,0 +1,27 @@
+/**
+ * A typed, identity-based key for arbitrary data held in a situation — the
+ * non-shape analogue of a `Role`. Where a role names a participant shape, a data
+ * key names a piece of operation state that is NOT a shape (e.g. a per-level list
+ * of nested instance heads). Unlike per-op data (keyed by a single operation's
+ * identity), a data key is meant to be SHARED by several cooperating operations
+ * that must read and write one common structure, so the key — not any one op —
+ * is the identity of the data.
+ *
+ * Keys are compared by reference identity (two distinct `DataKey` instances are
+ * different keys, even with the same label). A data key is an internal mechanism
+ * of the op class that owns it: construct it privately and expose typed accessors,
+ * never the key itself. The phantom type parameter `T` records the value type.
+ */
+export class DataKey<T> {
+    /** Phantom marker carrying the value type; never read at runtime. */
+    declare private readonly _valueType: T;
+
+    /**
+     * @param label - a stable, human-readable label (used only in diagnostics)
+     */
+    constructor(public readonly label: string) {}
+
+    toString(): string {
+        return this.label;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/Operation.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/Operation.ts
new file mode 100644
index 0000000000..a8ec0b1ec9
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/Operation.ts
@@ -0,0 +1,53 @@
+import { Situation } from "./Situation";
+
+/**
+ * A single step in a test trajectory. Most operations transform the situation
+ * (an edit, a structural change); some only observe it (an assertion). Reified
+ * as an object (strategy pattern) so steps are composable and self-describing.
+ *
+ * Each operation carries a stable identity assigned at construction. Applying it
+ * records that identity in the situation, so `Situation.wasApplied` can later be
+ * asked whether a particular operation instance ran in the current trajectory —
+ * the basis for branching assertions over an enumerated sweep. (Bind an operation
+ * to a value once and reuse that value, so the identity asked about is the one
+ * that ran.)
+ *
+ * Application is asynchronous because Plugin API mutations and their propagation
+ * may settle asynchronously. An operation mutates the live document and the
+ * situation's bindings in place.
+ */
+export abstract class Operation {
+    /** Source of stable per-instance ids; incremented as each operation is created. */
+    private static nextId = 0;
+
+    /** This operation instance's stable identity. */
+    readonly id: number = Operation.nextId++;
+
+    /** Applies this operation to `situation`, mutating it in place. */
+    abstract applyTo(situation: Situation): Promise<void>;
+
+    /** A short, human-readable representation, recorded in the applied-operation log. */
+    abstract toString(): string;
+
+    /**
+     * Indicates whether applying this operation should be recorded in the
+     * situation's applied-operation log. True for operations that do something;
+     * overridden to false by no-ops (e.g. the skip of an untaken optional branch),
+     * so the log reflects only the operations that were actually applied.
+     */
+    isRecorded(): boolean {
+        return true;
+    }
+
+    /**
+     * Expands this operation into the concrete variants it stands for — every
+     * combination of choices it (and its children) contain, with no branch points
+     * remaining. A plain operation has a single variant: itself. Composites that
+     * introduce choice (a sequence of sub-operations, a branch point) override this
+     * to combine their children's variants. The runner runs each returned variant
+     * against a freshly-built situation.
+     */
+    enumerateVariants(): Operation[] {
+        return [this];
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/Role.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/Role.ts
new file mode 100644
index 0000000000..52ba27014f
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/Role.ts
@@ -0,0 +1,22 @@
+import { Shape } from "@penpot/plugin-types";
+
+/**
+ * A typed, named binding key for a meaningful shape in a situation. A role
+ * identifies a participant of the configuration under test (e.g. the copy's
+ * child shape) independently of its concrete id, so operations and assertions
+ * refer to participants by role rather than by raw handle. The phantom type
+ * parameter `T` records the kind of shape the role is expected to bind.
+ */
+export class Role<T extends Shape = Shape> {
+    /** Phantom marker carrying the role's shape type; never read at runtime. */
+    declare private readonly _shapeType: T;
+
+    /**
+     * @param name - a stable, human-readable role name (used in diagnostics)
+     */
+    constructor(public readonly name: string) {}
+
+    toString(): string {
+        return this.name;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/RoleBundle.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/RoleBundle.ts
new file mode 100644
index 0000000000..5f987dd3e0
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/RoleBundle.ts
@@ -0,0 +1,18 @@
+import { Role } from "./Role";
+
+/**
+ * Marker base class for a bundle of named roles. A concrete bundle declares the
+ * roles a particular configuration provides as `Role` fields; the foundation
+ * operation that creates the configuration owns an instance of the bundle and
+ * binds its roles into the situation, giving a case a typed handle to the
+ * participants it acts on.
+ */
+export abstract class RoleBundle {
+    /**
+     * All roles declared on this bundle. Defaults to every `Role`-valued own
+     * property, so concrete bundles need only declare their roles as fields.
+     */
+    allRoles(): Role[] {
+        return Object.values(this).filter((value): value is Role => value instanceof Role);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/ShapeTarget.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/ShapeTarget.ts
new file mode 100644
index 0000000000..96ef670f85
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/ShapeTarget.ts
@@ -0,0 +1,18 @@
+import { Shape } from "@penpot/plugin-types";
+import { Situation } from "./Situation";
+import { Role } from "./Role";
+
+/**
+ * A way to obtain a shape from a situation at apply-time: either a `Role` (looked
+ * up in the situation) or a function that derives the shape from the situation
+ * (e.g. searching an instance's subtree via a creation strategy). Resolving
+ * late — rather than capturing a fixed handle — lets an operation follow a role
+ * that earlier operations re-point, and lets derived shapes reflect the current
+ * configuration.
+ */
+export type ShapeTarget = Role | ((situation: Situation) => Shape);
+
+/** Resolves `target` to a concrete shape against `situation`. */
+export function resolveTarget(target: ShapeTarget, situation: Situation): Shape {
+    return target instanceof Role ? situation.get(target) : target(situation);
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/core/Situation.ts b/plugins/apps/composable-test-suite/src/composable-tests/core/Situation.ts
new file mode 100644
index 0000000000..ecd3ee7e9d
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/core/Situation.ts
@@ -0,0 +1,136 @@
+import { Shape } from "@penpot/plugin-types";
+import { Role } from "./Role";
+import { DataKey } from "./DataKey";
+
+/**
+ * The mutable state a test trajectory operates on. Carries the role bindings
+ * (meaningful shapes of the configuration, resolved to live Plugin API handles)
+ * and the ordered log of operations applied so far.
+ *
+ * Unlike a pure in-memory model, the situation operates on the LIVE Penpot
+ * document: an operation mutates the document through the Plugin API and updates
+ * the bindings. Role lookup is strict — an unbound role throws diagnostically
+ * rather than returning a nullish value.
+ */
+export class Situation {
+    private static readonly SHAPE_SPACING = 10; // pixels to advance X for next shape
+
+    private readonly roles = new Map<string, Shape>();
+    private readonly appliedLog: string[] = [];
+    private readonly appliedIds = new Set<number>();
+    private readonly opData = new Map<number, unknown>();
+    private readonly keyedData = new Map<DataKey<unknown>, unknown>();
+    private nextShapeX = 0;
+    private nextShapeY = 0;
+
+    constructor(shapePosY: number = 0) {
+        this.nextShapeY = shapePosY;
+    }
+
+    /**
+     * Binds `role` to `shape`, replacing any existing binding. Returns this
+     * situation to allow fluent setup.
+     */
+    bind<T extends Shape>(role: Role<T>, shape: T): this {
+        this.roles.set(role.name, shape);
+        return this;
+    }
+
+    /**
+     * Positions `shape` at the next designated coordinates, then advances the X
+     * coordinate for the next shape.
+     * Shapes are laid out in a horizontal row with a fixed spacing between them.
+     *
+     * @param shape - the shape to position
+     */
+    applyPosAdvanceX(shape: Shape): void {
+        shape.x = this.nextShapeX;
+        shape.y = this.nextShapeY;
+        this.nextShapeX += shape.width + Situation.SHAPE_SPACING; // advance X for next shape
+    }
+
+    /**
+     * Resolves `role` to its bound shape. Throws a diagnostic error naming the
+     * absent role and the roles that are bound, never returning nullish.
+     */
+    get<T extends Shape>(role: Role<T>): T {
+        const shape = this.roles.get(role.name);
+        if (shape === undefined) {
+            const present = Array.from(this.roles.keys()).join(", ");
+            throw new Error(`Unbound role "${role.name}". Bound roles: [${present}]`);
+        }
+        return shape as T;
+    }
+
+    /** Indicates whether `role` is currently bound. */
+    has(role: Role): boolean {
+        return this.roles.has(role.name);
+    }
+
+    /**
+     * Records that an operation described by `description` was applied, appending
+     * it to the ordered log.
+     */
+    recordApplication(description: string): void {
+        this.appliedLog.push(description);
+    }
+
+    /** The ordered transcript of applied operations, for failure diagnostics. */
+    get transcript(): readonly string[] {
+        return this.appliedLog;
+    }
+
+    /**
+     * Marks `operation` as applied in this trajectory (by its stable identity).
+     * Accepts anything carrying an `id`, to avoid a dependency on the operation
+     * class.
+     */
+    markApplied(operation: { id: number }): void {
+        this.appliedIds.add(operation.id);
+    }
+
+    /**
+     * Indicates whether `operation` was applied in this trajectory. Used by
+     * assertions to branch on which optional steps a given enumerated variant
+     * took.
+     */
+    wasApplied(operation: { id: number }): boolean {
+        return this.appliedIds.has(operation.id);
+    }
+
+    /**
+     * Stores operation-specific data for `operation` (keyed by its stable identity),
+     * replacing any previous value. This is the situation's generic per-operation
+     * store; operations are expected to wrap it in typed accessors rather than
+     * callers reading it directly. The value type is the operation's own concern.
+     */
+    setData(operation: { id: number }, value: unknown): void {
+        this.opData.set(operation.id, value);
+    }
+
+    /**
+     * Retrieves the data previously stored for `operation`, or `undefined` if none.
+     * The caller (the owning operation) knows the value's type and narrows it.
+     */
+    getData(operation: { id: number }): unknown {
+        return this.opData.get(operation.id);
+    }
+
+    /**
+     * Stores data under `key`, replacing any previous value. This is the situation's
+     * shared keyed store: several cooperating operations may read and write one
+     * value under a common `DataKey`. The owning op class wraps this in typed
+     * accessors rather than exposing the key. The value type is `T`.
+     */
+    setKeyedData<T>(key: DataKey<T>, value: T): void {
+        this.keyedData.set(key as DataKey<unknown>, value);
+    }
+
+    /**
+     * Retrieves the data stored under `key`, or `undefined` if none. The owning op
+     * class knows the value's type via the key's type parameter.
+     */
+    getKeyedData<T>(key: DataKey<T>): T | undefined {
+        return this.keyedData.get(key as DataKey<unknown>) as T | undefined;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/index.ts b/plugins/apps/composable-test-suite/src/composable-tests/index.ts
new file mode 100644
index 0000000000..74ca4a3912
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/index.ts
@@ -0,0 +1,18 @@
+import { TestSuite } from "./test-suite/TestSuite.ts";
+import { allCases } from "./cases";
+
+/**
+ * Builds the enumerated test suite for the live Penpot document. The suite expands
+ * every case into its concrete variants once (assigning stable ids) and serves
+ * both the tree the UI renders and the runs it requests. Intended to be created
+ * once by the plugin, which then sends its `tree()` to the UI and runs selected
+ * ids on demand.
+ */
+export function createTestSuite(): TestSuite {
+    return new TestSuite(allCases());
+}
+
+export { TestSuite } from "./test-suite/TestSuite.ts";
+export type { TestRunObserver } from "./test-suite/TestRunObserver.ts";
+export type { TestTree, TestGroupInfo, TestInfo } from "./test-suite/TestTree.ts";
+export { TestResult } from "./test-suite/TestResult.ts";
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/model/Color.ts b/plugins/apps/composable-test-suite/src/composable-tests/model/Color.ts
new file mode 100644
index 0000000000..2854433370
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/model/Color.ts
@@ -0,0 +1,24 @@
+/**
+ * An immutable solid colour value. Combines a hex colour string with an opacity,
+ * giving the tests a single comparable value for a shape's solid fill.
+ */
+export class Color {
+    /**
+     * @param hex - the colour as an upper-case hex string (e.g. "#FF5533")
+     * @param opacity - the opacity in [0, 1] (defaults to fully opaque)
+     */
+    constructor(
+        public readonly hex: string,
+        public readonly opacity: number = 1
+    ) {}
+
+    /** Indicates whether this colour equals `other` (same hex, same opacity). */
+    equals(other: Color): boolean {
+        return this.hex === other.hex && this.opacity === other.opacity;
+    }
+
+    /** A human-readable representation, for assertion messages. */
+    toString(): string {
+        return this.opacity === 1 ? this.hex : `${this.hex}@${this.opacity}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/model/ShapeProp.ts b/plugins/apps/composable-test-suite/src/composable-tests/model/ShapeProp.ts
new file mode 100644
index 0000000000..0c90bf7c1c
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/model/ShapeProp.ts
@@ -0,0 +1,139 @@
+import { Shape, Fill } from "@penpot/plugin-types";
+import { Color } from "./Color";
+import { Assert } from "../util/Assert.ts";
+
+/**
+ * A typed, readable and writable property of a shape. Abstracts a single visual
+ * attribute (e.g. the solid fill colour) behind a uniform read/write/compare
+ * interface, so operations and assertions can be generic over the property
+ * rather than hard-coding one attribute. The type parameter `T` is the
+ * property's value type.
+ */
+export interface ShapeProp<T> {
+    /** A short name for the property, for diagnostics (e.g. "fill-color"). */
+    readonly name: string;
+
+    /** Reads the property's current value from `shape`. */
+    read(shape: Shape): T;
+
+    /** Writes `value` as the property's value on `shape`. */
+    write(shape: Shape, value: T): void;
+
+    /** Indicates whether two values of this property are equal. */
+    equals(a: T, b: T): boolean;
+
+    /** Asserts that `actual` equals `expected`, failing with a value-rich message. */
+    assertEqual(actual: T, expected: T): void;
+}
+
+/**
+ * Base class for shape properties supplying the comparison-derived behaviour:
+ * given a subclass's `equals` and `render`, it provides `assertEqual`. Concrete
+ * properties implement only `name`, `read`, `write`, `equals`, and `render`.
+ */
+export abstract class ShapePropBase<T> implements ShapeProp<T> {
+    abstract readonly name: string;
+    abstract read(shape: Shape): T;
+    abstract write(shape: Shape, value: T): void;
+    abstract equals(a: T, b: T): boolean;
+
+    /** Renders a value of this property for assertion messages. */
+    protected abstract render(value: T): string;
+
+    assertEqual(actual: T, expected: T): void {
+        Assert.equal(
+            actual,
+            expected,
+            (a, b) => this.equals(a, b),
+            (v) => this.render(v)
+        );
+    }
+}
+
+/**
+ * The solid fill colour of a shape. Reads and writes the shape's first fill as a
+ * single solid `Color`; intended for shapes whose fill is one solid colour.
+ */
+export class ShapePropFillColor extends ShapePropBase<Color> {
+    readonly name = "fill-color";
+
+    read(shape: Shape): Color {
+        const fills = shape.fills as Fill[];
+        if (!Array.isArray(fills) || fills.length === 0) {
+            throw new Error(`Shape "${shape.name}" has no fills to read a colour from`);
+        }
+        const fill = fills[0];
+        const hex = fill.fillColor;
+        if (hex === undefined) {
+            throw new Error(`Shape "${shape.name}"'s first fill is not a solid colour`);
+        }
+        return new Color(hex, fill.fillOpacity ?? 1);
+    }
+
+    write(shape: Shape, value: Color): void {
+        shape.fills = [{ fillColor: value.hex, fillOpacity: value.opacity }];
+    }
+
+    equals(a: Color, b: Color): boolean {
+        return a.equals(b);
+    }
+
+    protected render(value: Color): string {
+        return value.toString();
+    }
+}
+
+/**
+ * Base class for numeric shape properties, supplying tolerance-based equality
+ * (guarding against floating-point noise in values read back from the document)
+ * and plain-number rendering. Concrete properties implement `name`, `read`, and
+ * `write`.
+ */
+export abstract class ShapePropNumberBase extends ShapePropBase<number> {
+    // Tolerance combining an absolute floor with a magnitude-scaled relative
+    // term, wide enough to absorb float32 geometry noise in values read back.
+    private static readonly ABS_EPSILON = 1e-4;
+    private static readonly REL_EPSILON = 1e-5;
+
+    equals(a: number, b: number): boolean {
+        const tolerance =
+            ShapePropNumberBase.ABS_EPSILON + ShapePropNumberBase.REL_EPSILON * Math.max(Math.abs(a), Math.abs(b));
+        return Math.abs(a - b) <= tolerance;
+    }
+
+    protected render(value: number): string {
+        return String(value);
+    }
+}
+
+/**
+ * The rotation of a shape, in degrees, with respect to its centre. Reads and
+ * writes the shape's `rotation` directly.
+ */
+export class ShapePropRotation extends ShapePropNumberBase {
+    readonly name = "rotation";
+
+    read(shape: Shape): number {
+        return shape.rotation;
+    }
+
+    write(shape: Shape, value: number): void {
+        shape.rotation = value;
+    }
+}
+
+/**
+ * The height of a shape. `height` is read-only in the Plugin API, so writing goes
+ * through `resize`, keeping the current width.
+ */
+export class ShapePropHeight extends ShapePropNumberBase {
+    readonly name = "height";
+
+    read(shape: Shape): number {
+        return shape.height;
+    }
+
+    write(shape: Shape, value: number): void {
+        shape.resize(shape.width, value);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpAssert.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpAssert.ts
new file mode 100644
index 0000000000..3158075b9d
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpAssert.ts
@@ -0,0 +1,42 @@
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { PenpotSync } from "../util/PenpotSync.ts";
+
+/**
+ * An assertion step that observes the situation without changing it. Runs the
+ * supplied assertion function against the situation; the function performs the
+ * checks (via the `Assert` helpers) and throws on failure, which the runner
+ * captures. The inline-assertion analogue of an edit operation, so checks can be
+ * placed at any point in a trajectory.
+ *
+ * To tolerate reads that race ahead of an edit's not-yet-settled propagation, the
+ * assertion is tried once immediately (the fast path, paying no delay when the
+ * document is already consistent); only if it fails is propagation awaited and the
+ * assertion retried once, whose outcome is final.
+ */
+export class OpAssert extends Operation {
+    /**
+     * @param description - a short description of what is asserted
+     * @param assertion - performs the assertions against the situation
+     */
+    constructor(
+        private readonly description: string,
+        private readonly assertion: (situation: Situation) => void
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        try {
+            this.assertion(situation);
+        } catch {
+            // a read may have raced propagation; let it settle and check once more
+            await PenpotSync.awaitPropagation();
+            this.assertion(situation);
+        }
+    }
+
+    toString(): string {
+        return `assert ${this.description}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpChangeProperty.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpChangeProperty.ts
new file mode 100644
index 0000000000..50a60e972a
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpChangeProperty.ts
@@ -0,0 +1,53 @@
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { ShapeTarget, resolveTarget } from "../core/ShapeTarget";
+import { ShapeProp } from "../model/ShapeProp.ts";
+
+/**
+ * Sets a typed property to a given value on the shape a target resolves to. The
+ * edit operation: writes `value` via the `property` strategy onto the shape that
+ * `target` resolves to in the situation (a role, or a function deriving the shape
+ * from the situation). Generic over the property's value type `T`.
+ */
+export class OpChangeProperty<T> extends Operation {
+    /**
+     * @param target - resolves the shape to edit (role or situation-derived)
+     * @param property - the property strategy used to write the value
+     * @param value - the value to write
+     * @param targetLabel - a human-readable name for the edited shape, used in the
+     *     applied-operation log (a function target has no readable name of its own);
+     *     defaults to the target's own string form
+     */
+    constructor(
+        private readonly target: ShapeTarget,
+        private readonly property: ShapeProp<T>,
+        private readonly value: T,
+        private readonly targetLabel: string = String(target)
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const shape = resolveTarget(this.target, situation);
+        this.property.write(shape, this.value);
+    }
+
+    /**
+     * Asserts that the shape `target` resolves to now shows this operation's
+     * property change — i.e. that reading this op's property from that shape
+     * yields the value this op wrote. Lets a case check that an edit arrived on
+     * another shape (e.g. propagated from a main to its copy) without restating
+     * the property or the value.
+     *
+     * @param situation - the situation to resolve `target` against
+     * @param target - resolves the shape expected to show the change
+     */
+    assertHasChangedProperty(situation: Situation, target: ShapeTarget): void {
+        const shape = resolveTarget(target, situation);
+        this.property.assertEqual(this.property.read(shape), this.value);
+    }
+
+    toString(): string {
+        return `change ${this.property.name} of ${this.targetLabel} to ${String(this.value)}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateNestableComponent.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateNestableComponent.ts
new file mode 100644
index 0000000000..a149c109c9
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateNestableComponent.ts
@@ -0,0 +1,230 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation";
+import { Operation } from "../core/Operation";
+import { Role } from "../core/Role";
+import { RoleBundle } from "../core/RoleBundle";
+import { DataKey } from "../core/DataKey";
+import { ShapeUtil } from "../util/ShapeUtil.ts";
+import { ContentCreationStrategy } from "../content-creation/ContentCreationStrategy.ts";
+
+/** The name of the board that becomes the original (innermost) component root. */
+const ORIGINAL_COMPONENT_NAME = "ComponentRoot";
+
+/** The name of the board that wraps a copy to form an outer nesting level. */
+const NESTED_COMPONENT_NAME = "OuterComponentRoot";
+
+/**
+ * The instance roles of a nestable-component configuration. Three component
+ * INSTANCES are tracked, with these meanings as the configuration evolves:
+ *   - `remoteInstance` — the originally created main instance (the fixed origin);
+ *     never re-pointed.
+ *   - `mainInstance` — the CURRENT outermost main; re-pointed to the new outer
+ *     component on each nesting.
+ *   - `copyInstance` — the instance whose deep content reflects propagation; set
+ *     by instantiate, and replaced on each nesting by the new outer instance.
+ * Content shapes (e.g. a child rect) are not roles here — they are found inside a
+ * given instance via the content-creation strategy.
+ */
+class RolesNestableComponent extends RoleBundle {
+    readonly remoteInstance = new Role<Board>("remote-instance");
+    readonly mainInstance = new Role<Board>("main-instance");
+    readonly copyInstance = new Role<Board>("copy-instance");
+}
+
+/**
+ * The mutable per-lineage state of a nestable component, accumulated as the
+ * configuration is built. Created once by the foundation operation and mutated in
+ * place by the operations it vends (instantiate, nest) — they alter this object
+ * rather than replacing it. Held in the situation under the foundation op's own
+ * key, and reached by related ops through the foundation op's accessor.
+ */
+export class NestingData {
+    /**
+     * The per-level copy instances, in nesting order: index 0 is the innermost
+     * (the first instantiated copy), each subsequent entry an outer level that
+     * wraps the one below. Appended to as nesting deepens.
+     */
+    readonly copyInstances: Board[] = [];
+}
+
+/**
+ * Instantiates the current main component and binds the result as the copy, and
+ * appends it as the innermost (level 0) copy of the lineage's nesting data.
+ */
+class OpInstantiateCopy extends Operation {
+    constructor(private readonly parent: OpCreateNestableComponent<ContentCreationStrategy>) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const roles = this.parent.roles;
+        const main = situation.get(roles.mainInstance);
+        const component = main.component();
+        if (component === null) {
+            throw new Error(`"${main.name}" is not a component instance; cannot instantiate a copy`);
+        }
+        const copy = component.instance() as Board;
+        situation.bind(roles.copyInstance, copy);
+        situation.applyPosAdvanceX(copy);
+
+        // the freshly instantiated copy is the innermost (level 0) copy
+        this.parent.getNestingData(situation).copyInstances.push(copy);
+    }
+
+    toString(): string {
+        return "instantiate copy";
+    }
+}
+
+/**
+ * Adds a nesting level around the current copy. Wraps the `copyInstance` in a new
+ * outer board, turns that board into a component, re-points `mainInstance` to the
+ * new (outer) main, then instantiates the new component and binds it as the new
+ * `copyInstance`. `remoteInstance` is left untouched (the fixed origin). The new
+ * outer instance is appended as the next (outer) level's copy.
+ */
+class OpMakeNestedComponent extends Operation {
+    constructor(private readonly parent: OpCreateNestableComponent<ContentCreationStrategy>) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const roles = this.parent.roles;
+        const inner = situation.get(roles.copyInstance);
+
+        // a new outer board containing the current copy, made into a component
+        const outerBoard = penpot.createBoard();
+        outerBoard.name = NESTED_COMPONENT_NAME;
+        outerBoard.appendChild(inner);
+        const outerComponent = penpot.library.local.createComponent([outerBoard]);
+        situation.applyPosAdvanceX(outerComponent.mainInstance());
+
+        // the outer main becomes the current main; remote stays fixed
+        situation.bind(roles.mainInstance, outerComponent.mainInstance() as Board);
+
+        // an instance of the outer component becomes the new copy
+        const outerInstance = outerComponent.instance() as Board;
+        situation.bind(roles.copyInstance, outerInstance);
+
+        // the new outer instance is the copy for the newly added (outer) level
+        this.parent.getNestingData(situation).copyInstances.push(outerInstance);
+    }
+
+    toString(): string {
+        return "make nested component";
+    }
+}
+
+/**
+ * The foundation operation for a component that can be instantiated and nested. As
+ * the first step of a trajectory it creates the component (its content supplied by
+ * a content-creation strategy), binds both `remoteInstance` and `mainInstance` to
+ * its main instance, and initialises the lineage's `NestingData`. It owns the
+ * three instance roles and provides the operations that grow the configuration —
+ * a case obtains them from this op (`op.createOpInstantiate()`,
+ * `op.createOpMakeNested()`). Those operations hold a reference to this op and
+ * mutate its nesting data, so the data's key stays private here. The strategy type
+ * `TStrategy` is preserved so its content accessors are available to the case.
+ *
+ * The lineage's per-level instances are exposed via `getNestedInstanceHead` /
+ * `getNestedInstance`, so a case can address the instance at any nesting level
+ * (e.g. as the target of a variant switch) without knowing how nesting is stored.
+ */
+export class OpCreateNestableComponent<TContentCreator extends ContentCreationStrategy> extends Operation {
+    readonly roles = new RolesNestableComponent();
+
+    /** Private key under which this lineage's (mutable) nesting data is stored. */
+    private readonly nestingDataKey = new DataKey<NestingData>("nesting-data");
+
+    /**
+     * @param contentCreator - creates and locates the component's content
+     */
+    constructor(public readonly contentCreator: TContentCreator) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        // start this lineage's nesting data (mutated in place by related ops)
+        situation.setKeyedData(this.nestingDataKey, new NestingData());
+
+        // create the board, fill it via the strategy, and make it a component
+        const board = penpot.createBoard();
+        board.name = ORIGINAL_COMPONENT_NAME;
+        board.resize(100, 100);
+        this.contentCreator.createContent(situation, board);
+        situation.applyPosAdvanceX(board);
+
+        const component = penpot.library.local.createComponent([board]);
+        const main = component.mainInstance() as Board;
+
+        // remote and main both start at the original main; copy is set by instantiate
+        situation.bind(this.roles.remoteInstance, main);
+        situation.bind(this.roles.mainInstance, main);
+    }
+
+    toString(): string {
+        return "create nestable component";
+    }
+
+    /** An operation that instantiates the current main and binds it as the copy. */
+    createOpInstantiate(): Operation {
+        return new OpInstantiateCopy(this);
+    }
+
+    /** An operation that adds a nesting level around the current copy. */
+    createOpMakeNested(): Operation {
+        return new OpMakeNestedComponent(this);
+    }
+
+    /**
+     * This lineage's nesting data in `situation` — created by this op's application
+     * and mutated by the operations it vends. Throws if this op has not yet run.
+     */
+    getNestingData(situation: Situation): NestingData {
+        const data = situation.getKeyedData(this.nestingDataKey);
+        if (data === undefined) {
+            throw new Error("nesting data not initialised; run the create-nestable-component op first");
+        }
+        return data;
+    }
+
+    /**
+     * @param situation - the situation
+     * @param level - the nesting level to retrieve (0 = initially created instance, least nested)
+     * @return the instance of the originally created component at nesting `level`, i.e. the descendant
+     *   of the copy instance that corresponds to the instance of the originally created component.
+     *   At level 0 this is the copy instance itself; at deeper levels it is the instance nested inside
+     *   that level's copy, surrounded by the outer boards added by the nesting operations.
+     *   Note: This is the shape that directly contains the content creation strategy's content.
+     */
+    getNestedInstance(situation: Situation, level: number): Shape {
+        const copy = this.getCopyInstance(situation, level);
+        // the copy itself is the head at level 0; deeper levels wrap it, so descend
+        // to the (innermost) original component root
+        const head =
+            copy.name === ORIGINAL_COMPONENT_NAME
+                ? copy
+                : ShapeUtil.findShape(copy, (shape) => shape.name === ORIGINAL_COMPONENT_NAME);
+        if (head === null) {
+            throw new Error(`no nested head "${ORIGINAL_COMPONENT_NAME}" found at level ${level}`);
+        }
+        return head;
+    }
+
+    /**
+     * @param situation - the situation
+     * @param level - the nesting level to retrieve (0 = initially created instance, least nested)
+     * @return the copy instance root shape at nesting `level`, i.e. the root of the copy instance that was created
+     *   at that level.
+     *   Note: A copy instance is created by the instantiate operation (first copy) and by each nesting
+     *   operation.
+     */
+    getCopyInstance(situation: Situation, level: number): Board {
+        const copies = this.getNestingData(situation).copyInstances;
+        const copy = copies[level];
+        if (copy === undefined) {
+            throw new Error(`no copy at level ${level} (have ${copies.length})`);
+        }
+        return copy;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateSimpleComponentWithCopy.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateSimpleComponentWithCopy.ts
new file mode 100644
index 0000000000..12b2c5a0e7
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateSimpleComponentWithCopy.ts
@@ -0,0 +1,81 @@
+import { Shape, Board } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation";
+import { Color } from "../model/Color";
+import { Operation } from "../core/Operation";
+import { Role } from "../core/Role";
+import { RoleBundle } from "../core/RoleBundle";
+
+/**
+ * The roles exposed by a "component with a copy" configuration. The participants
+ * that take part in propagation are the CHILD shapes of the main and of the copy
+ * (the component roots are boards); these are named here, along with the copy's
+ * root. The foundation op owns an instance of this bundle and binds its roles.
+ */
+class RolesComponent extends RoleBundle {
+    /** The main component's child shape (the one an edit-to-main targets). */
+    readonly mainChild = new Role<Shape>("main-child");
+
+    /** The copy instance's corresponding child shape. */
+    readonly copyChild = new Role<Shape>("copy-child");
+
+    /** The copy instance's root (the instantiated board). */
+    readonly copyRoot = new Role<Board>("copy-root");
+}
+
+/**
+ * The foundation operation for a "simple component with a copy" configuration: a
+ * one-child component (a board containing a single rectangle) plus one instance of
+ * it. As the first step of a trajectory it creates them and binds the main's and
+ * the copy's child rectangles to its `mainChild` / `copyChild` roles and the
+ * copy's root to `copyRoot`. The child rectangle starts with a known baseline
+ * fill, so a later "value followed" check is distinguishable from coincidence.
+ */
+export class OpCreateSimpleComponentWithCopy extends Operation {
+    readonly roles = new RolesComponent();
+
+    /**
+     * @param baselineColor - the child rectangle's initial fill colour
+     */
+    constructor(private readonly baselineColor: Color) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        // create the board + child rectangle that will become the component
+        const board = penpot.createBoard();
+        board.name = "ComponentRoot";
+        board.resize(100, 100);
+
+        const rect = penpot.createRectangle();
+        rect.name = "Child";
+        rect.resize(50, 50);
+        rect.fills = [{ fillColor: this.baselineColor.hex, fillOpacity: this.baselineColor.opacity }];
+        board.appendChild(rect);
+
+        // turn the board into a component; its main instance is the board itself
+        const component = penpot.library.local.createComponent([board]);
+        const mainRoot = component.mainInstance();
+        situation.applyPosAdvanceX(mainRoot);
+
+        // instantiate a copy of the component on the current page
+        const copyRoot = component.instance();
+        situation.applyPosAdvanceX(copyRoot);
+
+        situation.bind(this.roles.mainChild, this.onlyChildOf(mainRoot));
+        situation.bind(this.roles.copyChild, this.onlyChildOf(copyRoot));
+        situation.bind(this.roles.copyRoot, copyRoot);
+    }
+
+    toString(): string {
+        return "create simple component with a copy";
+    }
+
+    /** Returns the single child of `root`, failing if it does not have exactly one. */
+    private onlyChildOf(root: Shape): Shape {
+        const children = (root as Board).children;
+        if (!children || children.length !== 1) {
+            throw new Error(`Expected "${root.name}" to have exactly one child, found ${children?.length ?? 0}`);
+        }
+        return children[0];
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateVariantContainer.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateVariantContainer.ts
new file mode 100644
index 0000000000..7f9abfc8f0
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpCreateVariantContainer.ts
@@ -0,0 +1,115 @@
+import { Board, Shape, VariantContainer } from "@penpot/plugin-types";
+import { Situation } from "../core/Situation";
+import { Operation } from "../core/Operation";
+import { ShapeUtil } from "../util/ShapeUtil.ts";
+import { ContentCreationStrategy } from "../content-creation/ContentCreationStrategy";
+import {
+    ContentCreationStrategyInstantiateVariantContainer,
+    VARIANT_INSTANCE_NAME,
+} from "../content-creation/ContentCreationStrategyInstantiateVariantContainer";
+import { VariantsUtil } from "../util/VariantsUtil.ts";
+
+/** The single variant property this op defines; its values are 0-based indices. */
+const VARIANT_PROPERTY = "variantIdx";
+
+/**
+ * The foundation operation that creates a variant container. Given one content-
+ * creation strategy per variant, it builds a component from each (its content
+ * supplied by that strategy) and combines them into a variant container, under a
+ * single property whose value is the variant's 0-based index.
+ *
+ * The created container is stored in the situation, keyed by this op; later steps
+ * reach it through this op's `getVariantContainer`. The op is the interface to its
+ * own data — callers ask the op, not the situation's raw store.
+ *
+ * For instantiating a variant of the created container, the op vends a content
+ * strategy via `contentStrategyForVariant`, wired to resolve this container at
+ * apply-time — so a later instantiate step needs nothing but the chosen index.
+ */
+export class OpCreateVariantContainer extends Operation {
+    private readonly variantStrategies: readonly ContentCreationStrategy[];
+
+    /**
+     * @param variantStrategies - one content-creation strategy per variant, in
+     *     index order; each defines the content of that variant's component
+     */
+    constructor(...variantStrategies: ContentCreationStrategy[]) {
+        super();
+        this.variantStrategies = variantStrategies;
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        // build one component per variant, its content supplied by the strategy
+        const mains = this.variantStrategies.map((strategy, index) => {
+            const board = penpot.createBoard();
+            board.name = `Variant ${index}`;
+            board.resize(100, 100);
+            strategy.createContent(situation, board);
+            const component = penpot.library.local.createComponent([board]);
+            return component.mainInstance() as Board;
+        });
+
+        // combine them into a variant container, one property keyed by index
+        const container = VariantsUtil.create(
+            mains.map((shape, index) => ({ shape, properties: { [VARIANT_PROPERTY]: String(index) } }))
+        );
+
+        situation.setData(this, container);
+        situation.applyPosAdvanceX(container);
+    }
+
+    toString(): string {
+        return "create variant container";
+    }
+
+    /**
+     * The variant container this op created, read from `situation`. Throws if this
+     * op has not yet run in the trajectory.
+     */
+    getVariantContainer(situation: Situation): VariantContainer {
+        const container = situation.getData(this) as VariantContainer | undefined;
+        if (container === undefined) {
+            throw new Error("variant container not created yet; run OpCreateVariantContainer first");
+        }
+        return container;
+    }
+
+    /**
+     * The variant-component instance this op's strategy placed, located within
+     * `root` by name. Use it to turn a structural nested head (from the nestable
+     * op) into the actual variant instance to switch:
+     * `variantContainer.getVariantInstance(nestable.getNestedInstanceHead(s, level))`.
+     * Returns `root` itself if it is the variant instance. Throws if none is found.
+     */
+    getVariantInstance(root: Shape): Shape {
+        const instance =
+            root.name === VARIANT_INSTANCE_NAME
+                ? root
+                : ShapeUtil.findShape(root, (shape) => shape.name === VARIANT_INSTANCE_NAME);
+        if (instance === null) {
+            throw new Error(`no variant instance "${VARIANT_INSTANCE_NAME}" found within "${root.name}"`);
+        }
+        return instance;
+    }
+
+    /**
+     * The variant property's position (for `switchVariant`). A single property, so
+     * always position 0.
+     */
+    get variantPropertyPosition(): number {
+        return 0;
+    }
+
+    /** The property value identifying variant `index` (its 0-based index as a string). */
+    valueForVariant(index: number): string {
+        return String(index);
+    }
+
+    /**
+     * Returns a content creation strategy that instantiates variant `index` of this op's
+     * container.
+     */
+    createContentCreationStrategy(index: number): ContentCreationStrategyInstantiateVariantContainer {
+        return new ContentCreationStrategyInstantiateVariantContainer((s) => this.getVariantContainer(s), index);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpDeleteShape.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpDeleteShape.ts
new file mode 100644
index 0000000000..19be311fcd
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpDeleteShape.ts
@@ -0,0 +1,36 @@
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { ShapeTarget, resolveTarget } from "../core/ShapeTarget";
+import { PenpotSync } from "../util/PenpotSync";
+
+/**
+ * Removes the shape a target resolves to from the document, via the Plugin API's
+ * `remove()`. The structural-deletion counterpart to {@link OpChangeProperty}:
+ * resolves `target` against the situation (a role, or a function deriving the
+ * shape) and deletes it.
+ */
+export class OpDeleteShape extends Operation {
+    /**
+     * @param target - resolves the shape to delete (role or situation-derived)
+     * @param targetLabel - a human-readable name for the deleted shape, used in
+     *     the applied-operation log; defaults to the target's own string form
+     */
+    constructor(
+        private readonly target: ShapeTarget,
+        private readonly targetLabel: string = String(target)
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const shape = resolveTarget(this.target, situation);
+        shape.remove();
+        // A delete fires an async `:layout/update` reflow on the parent; let it
+        // settle so any resulting (in)consistency is visible to later steps.
+        await PenpotSync.awaitPropagation();
+    }
+
+    toString(): string {
+        return `delete ${this.targetLabel}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpInstantiateContent.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpInstantiateContent.ts
new file mode 100644
index 0000000000..91df090fc9
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpInstantiateContent.ts
@@ -0,0 +1,37 @@
+import { Board } from "@penpot/plugin-types";
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { Role } from "../core/Role";
+import { ContentCreationStrategy } from "../content-creation/ContentCreationStrategy";
+
+/**
+ * Instantiates content into a fresh board and binds that board to a role. Creates
+ * a board, fills it via the content-creation strategy (which may, for example,
+ * append an instance of an existing component), and binds the board to `target`
+ * so later steps can act on it. A general "place this content somewhere and track
+ * it" step.
+ */
+export class OpInstantiateContent extends Operation {
+    /**
+     * @param strategy - fills the new board with content
+     * @param target - the role to bind the created board to
+     */
+    constructor(
+        private readonly strategy: ContentCreationStrategy,
+        private readonly target: Role<Board>
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const board = penpot.createBoard();
+        board.name = "Content";
+        board.resize(100, 100);
+        this.strategy.createContent(situation, board);
+        situation.bind(this.target, board);
+    }
+
+    toString(): string {
+        return "instantiate content";
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOneOf.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOneOf.ts
new file mode 100644
index 0000000000..0c406063bc
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOneOf.ts
@@ -0,0 +1,32 @@
+import { Operation } from "../core/Operation.ts";
+import { Situation } from "../core/Situation.ts";
+
+/**
+ * A branch point: exactly one of its alternatives is taken. It is not applied
+ * directly — it exists to be ENUMERATED, expanding a composition into one
+ * concrete trajectory per alternative. Applying it directly is a usage error.
+ */
+export class OpOneOf extends Operation {
+    readonly alternatives: readonly Operation[];
+
+    constructor(...alternatives: Operation[]) {
+        super();
+        this.alternatives = alternatives;
+    }
+
+    async applyTo(_situation: Situation): Promise<void> {
+        throw new Error("OneOf must be enumerated, not applied directly");
+    }
+
+    toString(): string {
+        return `one-of(${this.alternatives.map((a) => a.toString()).join(" | ")})`;
+    }
+
+    /**
+     * A branch point's variants are the union of its alternatives' variants (each
+     * alternative is itself expanded, so nested choices flatten out).
+     */
+    override enumerateVariants(): Operation[] {
+        return this.alternatives.flatMap((alternative) => alternative.enumerateVariants());
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOptional.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOptional.ts
new file mode 100644
index 0000000000..e2dee70b3f
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpOptional.ts
@@ -0,0 +1,16 @@
+import { Operation } from "../core/Operation.ts";
+import { OpSkip } from "./OpSkip.ts";
+import { OpOneOf } from "./OpOneOf.ts";
+
+/**
+ * Sweeps "with and without `operation`": a branch point between applying it and
+ * skipping it (a `OneOf` over `[operation, Skip]`). Enumerates to two trajectories,
+ * one including `operation` and one not. The same `operation` instance can then be
+ * queried via `Situation.wasApplied` inside an assertion to branch on which
+ * trajectory ran.
+ */
+export class OpOptional extends OpOneOf {
+    constructor(operation: Operation) {
+        super(operation, new OpSkip());
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpReorderShape.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpReorderShape.ts
new file mode 100644
index 0000000000..ef81be0058
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpReorderShape.ts
@@ -0,0 +1,32 @@
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { ShapeTarget, resolveTarget } from "../core/ShapeTarget";
+
+/**
+ * Reorders the shape a target resolves to within its parent, via the Plugin API's
+ * `setParentIndex`. Used to reorder a sub-head IN THE MAIN of a component, which is
+ * the operation that breaks copies' swap-slot alignment (see {@link ../cases/caseE}).
+ */
+export class OpReorderShape extends Operation {
+    /**
+     * @param target - resolves the shape to reorder (role or situation-derived)
+     * @param toIndex - the new 0-based index within the parent
+     * @param targetLabel - a human-readable name for the reordered shape, for the log
+     */
+    constructor(
+        private readonly target: ShapeTarget,
+        private readonly toIndex: number,
+        private readonly targetLabel: string = String(target)
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const shape = resolveTarget(this.target, situation);
+        shape.setParentIndex(this.toIndex);
+    }
+
+    toString(): string {
+        return `reorder ${this.targetLabel} to index ${this.toIndex}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSequence.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSequence.ts
new file mode 100644
index 0000000000..b123ce5b9c
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSequence.ts
@@ -0,0 +1,45 @@
+import { Situation } from "../core/Situation.ts";
+import { Operation } from "../core/Operation.ts";
+
+/**
+ * An ordered composition of operations. Applies its steps left-to-right against
+ * the same situation, threading the (mutated) situation through each, and marks
+ * each applied step in the situation. The primary composition operator.
+ */
+export class OpSequence extends Operation {
+    readonly steps: readonly Operation[];
+
+    constructor(...steps: Operation[]) {
+        super();
+        this.steps = steps;
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        for (const step of this.steps) {
+            await step.applyTo(situation);
+            if (step.isRecorded()) {
+                situation.markApplied(step);
+                situation.recordApplication(step.toString());
+            }
+        }
+    }
+
+    toString(): string {
+        return `sequence(${this.steps.map((s) => s.toString()).join(", ")})`;
+    }
+
+    /**
+     * A sequence's variants are the cartesian product of its steps' variants: one
+     * concrete sequence per combination, each preserving the original order.
+     */
+    override enumerateVariants(): Operation[] {
+        return cartesianProduct(this.steps.map((step) => step.enumerateVariants())).map(
+            (steps) => new OpSequence(...steps)
+        );
+    }
+}
+
+/** The cartesian product of the given lists, preserving order. */
+function cartesianProduct<T>(lists: T[][]): T[][] {
+    return lists.reduce<T[][]>((acc, list) => acc.flatMap((prefix) => list.map((item) => [...prefix, item])), [[]]);
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSkip.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSkip.ts
new file mode 100644
index 0000000000..e9dbb41ffd
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSkip.ts
@@ -0,0 +1,21 @@
+import { Situation } from "../core/Situation.ts";
+import { Operation } from "../core/Operation.ts";
+
+/**
+ * The identity operation: applies nothing. Used as the "absent" branch of an
+ * optional step, so a sweep can include a variant in which that step did not run.
+ */
+export class OpSkip extends Operation {
+    async applyTo(_situation: Situation): Promise<void> {
+        // intentionally does nothing
+    }
+
+    toString(): string {
+        return "skip";
+    }
+
+    /** A skip did nothing, so it is left out of the applied-operation log. */
+    override isRecorded(): boolean {
+        return false;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSwitchVariant.ts b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSwitchVariant.ts
new file mode 100644
index 0000000000..c4a2009050
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/operations/OpSwitchVariant.ts
@@ -0,0 +1,40 @@
+import { Operation } from "../core/Operation";
+import { Situation } from "../core/Situation";
+import { ShapeTarget, resolveTarget } from "../core/ShapeTarget";
+
+/**
+ * Switches a variant-component copy head to a sibling member. Resolves the
+ * instance to switch from a `ShapeTarget`, then switches it (on the single variant
+ * property, position 0) to the sibling member whose value is `value` — the
+ * `switchVariant` action discovers that sibling within the variant container. The
+ * switch propagates outward across nesting levels via the component watcher,
+ * exactly like a component swap.
+ *
+ * The target is resolved like any operation target (e.g. the nested instance head
+ * at a given level), so this op knows nothing about nesting — it just switches
+ * whatever head it is given.
+ */
+export class OpSwitchVariant extends Operation {
+    /** The single variant property's position (this framework uses one property). */
+    private static readonly PROPERTY_POSITION = 0;
+
+    /**
+     * @param target - resolves the variant-component instance head to switch
+     * @param value - the sibling member's selector value to switch to
+     */
+    constructor(
+        private readonly target: ShapeTarget,
+        private readonly value: string
+    ) {
+        super();
+    }
+
+    async applyTo(situation: Situation): Promise<void> {
+        const head = resolveTarget(this.target, situation);
+        head.switchVariant(OpSwitchVariant.PROPERTY_POSITION, this.value);
+    }
+
+    toString(): string {
+        return `switch variant to ${this.value}`;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/RunnableTest.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/RunnableTest.ts
new file mode 100644
index 0000000000..0367bf3a5f
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/RunnableTest.ts
@@ -0,0 +1,36 @@
+import { Operation } from "../core/Operation.ts";
+import { Situation } from "../core/Situation.ts";
+import { TestResult } from "./TestResult.ts";
+
+/**
+ * One concrete, runnable test: a single enumerated variant of a case, carrying a
+ * stable id (its identity across enumeration, the UI, and run requests), a display
+ * name, and the operation to apply. Running applies the operation to a fresh,
+ * empty situation (so variants do not interfere) and captures any failure as a
+ * failing result. The operation's first steps are responsible for laying the
+ * foundations (creating the starting configuration).
+ */
+export class RunnableTest {
+    /**
+     * @param id - stable opaque identity (used as the UI key and in run requests)
+     * @param name - display name (e.g. "instance #1")
+     * @param operation - the concrete (fully chosen) trajectory to apply
+     */
+    constructor(
+        public readonly id: string,
+        public readonly name: string,
+        private readonly operation: Operation
+    ) {}
+
+    /** Runs this test against a fresh situation, returning its result. */
+    async run(posY: number): Promise<TestResult> {
+        const situation = new Situation(posY);
+        try {
+            await this.operation.applyTo(situation);
+            return TestResult.pass(this.name, situation.transcript);
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            return TestResult.fail(this.name, message, situation.transcript);
+        }
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestCase.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestCase.ts
new file mode 100644
index 0000000000..5858ef1072
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestCase.ts
@@ -0,0 +1,26 @@
+import { Operation } from "../core/Operation.ts";
+
+/**
+ * A complete test: a named operation — the full trajectory, including the step
+ * that lays the foundations (creating the starting configuration), any edits or
+ * structural changes, and the assertions. Running it applies the operation to a
+ * fresh, empty situation.
+ */
+export class TestCase {
+    /**
+     * @param identifier - a meaningful CamelCase case identifier, stating the
+     *     tested behaviour (e.g. "MainEditSyncs")
+     * @param description - what the case tests, in plain, highly understandable
+     *     terms and in three parts, in this order: (1) the situation SETUP — what
+     *     configuration is created, so the reader can picture it; (2) the ACTIONS
+     *     and variations applied to it; (3) the REQUIREMENT that is asserted.
+     *     A few sentences, starting with an upper-case letter.
+     * @param operation - the trajectory to apply, foundations first, including
+     *     assertions
+     */
+    constructor(
+        public readonly identifier: string,
+        public readonly description: string,
+        public readonly operation: Operation
+    ) {}
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestResult.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestResult.ts
new file mode 100644
index 0000000000..41e10ad2b5
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestResult.ts
@@ -0,0 +1,23 @@
+/**
+ * The outcome of running one concrete variant of a test case. An immutable record
+ * carrying the variant's display name, whether it passed, and — on failure — the
+ * error message and the transcript of operations that had been applied.
+ */
+export class TestResult {
+    private constructor(
+        public readonly name: string,
+        public readonly passed: boolean,
+        public readonly errorMessage: string | undefined,
+        public readonly transcript: readonly string[]
+    ) {}
+
+    /** Creates a passing result named `name`. */
+    static pass(name: string, transcript: readonly string[]): TestResult {
+        return new TestResult(name, true, undefined, transcript);
+    }
+
+    /** Creates a failing result named `name` with `errorMessage` and `transcript`. */
+    static fail(name: string, errorMessage: string, transcript: readonly string[]): TestResult {
+        return new TestResult(name, false, errorMessage, transcript);
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestRunObserver.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestRunObserver.ts
new file mode 100644
index 0000000000..7c2b22558b
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestRunObserver.ts
@@ -0,0 +1,16 @@
+import { TestResult } from "./TestResult.ts";
+
+/**
+ * Receives streaming notifications as a selected set of tests runs, addressed by
+ * stable test id, so a UI can update the specific row for each test the moment its
+ * state changes. The set of tests to run is known up front (the UI selected them),
+ * so there is no separate "total" notification — each test reports when it starts
+ * and when it finishes.
+ */
+export interface TestRunObserver {
+    /** Called when the test with id `id` begins running. */
+    onTestStarted(id: string): void;
+
+    /** Called when the test with id `id` finishes, with its result. */
+    onTestFinished(id: string, result: TestResult): void;
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestSuite.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestSuite.ts
new file mode 100644
index 0000000000..a38d98bccb
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestSuite.ts
@@ -0,0 +1,75 @@
+import { TestCase } from "./TestCase.ts";
+import { RunnableTest } from "./RunnableTest.ts";
+import { TestRunObserver } from "./TestRunObserver.ts";
+import { TestTree } from "./TestTree.ts";
+
+/** A group of runnable tests enumerated from one case. */
+interface Group {
+    identifier: string;
+    description: string;
+    tests: RunnableTest[];
+}
+
+/**
+ * The enumerated test suite. On construction it expands every case into its
+ * concrete variants ONCE, assigning each a stable opaque id, and holds them
+ * grouped by case and addressable by id. Both the rendered tree and any run are
+ * served from this single held enumeration, so the ids the UI sees and the ids it
+ * runs are guaranteed to refer to the same tests.
+ *
+ * Running a selected subset streams per-test notifications through a
+ * `TestRunObserver`; each test rebuilds its configuration fresh, so tests do not
+ * interfere and a failure does not stop the rest.
+ */
+export class TestSuite {
+    private readonly groups: Group[];
+    private readonly byId: Map<string, RunnableTest>;
+
+    constructor(cases: readonly TestCase[]) {
+        this.groups = TestSuite.enumerateGroups(cases);
+        this.byId = new Map(this.groups.flatMap((group) => group.tests.map((test) => [test.id, test])));
+    }
+
+    /** The serialisable tree (groups and their tests) for the UI to render. */
+    tree(): TestTree {
+        return {
+            groups: this.groups.map((group) => ({
+                identifier: group.identifier,
+                description: group.description,
+                tests: group.tests.map((test) => ({ id: test.id, name: test.name })),
+            })),
+        };
+    }
+
+    /** All test ids, in enumeration order (e.g. for a "run all"). */
+    allIds(): string[] {
+        return this.groups.flatMap((group) => group.tests.map((test) => test.id));
+    }
+
+    /**
+     * Runs the tests with the given `ids` (unknown ids are skipped), reporting each
+     * test's start and finish through `observer`, in the given order.
+     */
+    async run(ids: readonly string[], observer: TestRunObserver): Promise<void> {
+        let posY = 0;
+        for (const id of ids) {
+            const test = this.byId.get(id);
+            if (test === undefined) continue;
+            observer.onTestStarted(id);
+            const result = await test.run(posY);
+            posY += 150; // advance y-position for next test
+            observer.onTestFinished(id, result);
+        }
+    }
+
+    /** Expands each case into a group of runnable tests with stable ids. */
+    private static enumerateGroups(cases: readonly TestCase[]): Group[] {
+        return cases.map((testCase, caseIndex) => {
+            const operations = testCase.operation.enumerateVariants();
+            const tests = operations.map((operation, i) => {
+                return new RunnableTest(`t${caseIndex}_${i}`, `instance #${i + 1}`, operation);
+            });
+            return { identifier: testCase.identifier, description: testCase.description, tests };
+        });
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestTree.ts b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestTree.ts
new file mode 100644
index 0000000000..41c8f60288
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/test-suite/TestTree.ts
@@ -0,0 +1,26 @@
+/**
+ * The serialisable structure of the enumerated test suite, for the UI to render
+ * before anything runs. Groups correspond to test cases; each group lists its
+ * tests (enumerated variants) by stable id and display name. Ids are opaque — the
+ * UI uses them as keys and in run requests, and never parses them; grouping is
+ * driven by this structure, not by the id format.
+ */
+export interface TestTree {
+    groups: TestGroupInfo[];
+}
+
+/** One group in the tree: a test case and its enumerated tests. */
+export interface TestGroupInfo {
+    /** The case's CamelCase identifier (leads the group header). */
+    identifier: string;
+    /** The case's plain-terms description (shown next to / below the header). */
+    description: string;
+    /** The group's tests, in enumeration order. */
+    tests: TestInfo[];
+}
+
+/** One test in the tree: its stable id and display name. */
+export interface TestInfo {
+    id: string;
+    name: string;
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/util/Assert.ts b/plugins/apps/composable-test-suite/src/composable-tests/util/Assert.ts
new file mode 100644
index 0000000000..8d7f465e7d
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/util/Assert.ts
@@ -0,0 +1,33 @@
+/**
+ * Signals a failed test assertion. Thrown by assertion helpers and caught by the
+ * test runner, which turns it into a failed result.
+ */
+export class AssertionError extends Error {
+    constructor(message: string) {
+        super(message);
+        this.name = "AssertionError";
+    }
+}
+
+/**
+ * Provides assertion helpers for use inside a test's assertion phase. Each helper
+ * throws an `AssertionError` on failure; the runner catches it.
+ */
+export class Assert {
+    /** Asserts that `condition` holds, failing with `message` otherwise. */
+    static that(condition: boolean, message: string): void {
+        if (!condition) {
+            throw new AssertionError(message);
+        }
+    }
+
+    /**
+     * Asserts that `actual` equals `expected` using `equals`, failing with a
+     * message that includes both values (rendered via `render`).
+     */
+    static equal<T>(actual: T, expected: T, equals: (a: T, b: T) => boolean, render: (v: T) => string = String): void {
+        if (!equals(actual, expected)) {
+            throw new AssertionError(`expected ${render(expected)} but was ${render(actual)}`);
+        }
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/util/PenpotSync.ts b/plugins/apps/composable-test-suite/src/composable-tests/util/PenpotSync.ts
new file mode 100644
index 0000000000..a2334ce832
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/util/PenpotSync.ts
@@ -0,0 +1,17 @@
+/**
+ * Timing utilities for the composable tests.
+ */
+export class PenpotSync {
+    /** The fixed settling delay, in milliseconds, used by `awaitPropagation`. */
+    private static readonly PROPAGATION_MS = 200;
+
+    /**
+     * Waits for component-change propagation to settle. Reads can otherwise race
+     * ahead of the propagation a preceding edit triggers. This is a pragmatic
+     * fixed delay; it is intended to be replaced once the Plugin API offers an
+     * explicit "wait for propagation" primitive.
+     */
+    static awaitPropagation(): Promise<void> {
+        return new Promise((resolve) => setTimeout(resolve, PenpotSync.PROPAGATION_MS));
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/util/ShapeUtil.ts b/plugins/apps/composable-test-suite/src/composable-tests/util/ShapeUtil.ts
new file mode 100644
index 0000000000..1811f19143
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/util/ShapeUtil.ts
@@ -0,0 +1,30 @@
+import { Shape } from "@penpot/plugin-types";
+
+/**
+ * Tree-search helpers over the Penpot shape hierarchy.
+ */
+export class ShapeUtil {
+    /**
+     * Returns the first shape in `root`'s subtree (excluding `root` itself) that
+     * satisfies `predicate`, searching depth-first, or `null` if none match.
+     */
+    static findShape(root: Shape, predicate: (shape: Shape) => boolean): Shape | null {
+        const children = ShapeUtil.childrenOf(root);
+        for (const child of children) {
+            if (predicate(child)) {
+                return child;
+            }
+            const found = ShapeUtil.findShape(child, predicate);
+            if (found !== null) {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    /** The children of `shape`, or an empty array if it has none. */
+    private static childrenOf(shape: Shape): Shape[] {
+        const container = shape as { children?: Shape[] };
+        return container.children ?? [];
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/util/SlotIntegrity.ts b/plugins/apps/composable-test-suite/src/composable-tests/util/SlotIntegrity.ts
new file mode 100644
index 0000000000..1f7634a185
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/util/SlotIntegrity.ts
@@ -0,0 +1,35 @@
+import { Board, Shape } from "@penpot/plugin-types";
+import { Assert } from "./Assert";
+
+/** Checks steady-state positional alignment between a component copy and its main. */
+export class SlotIntegrity {
+    /**
+     * Returns copy-child indices whose references differ from the main child at
+     * the same index.
+     */
+    static misalignedIndices(copyRoot: Board, mainRoot: Board): number[] {
+        const copyKids: Shape[] = copyRoot.children ?? [];
+        const mainKids: Shape[] = mainRoot.children ?? [];
+        const bad: number[] = [];
+        copyKids.forEach((child, i) => {
+            const nearMatch = mainKids[i];
+            if (!nearMatch) return; // no positional near match -> no slot required
+            const ref = child.componentRefShape ? child.componentRefShape() : null;
+            if (!ref || ref.id !== nearMatch.id) bad.push(i);
+        });
+        return bad;
+    }
+
+    /**
+     * Asserts that every sub-head of `copyRoot` references its positional slot in
+     * `mainRoot`; fails (listing the offending indices) if any does not.
+     */
+    static assertAligned(copyRoot: Board, mainRoot: Board): void {
+        const bad = SlotIntegrity.misalignedIndices(copyRoot, mainRoot);
+        Assert.that(
+            bad.length === 0,
+            `copy sub-heads must reference their positional slot in the main; ` +
+                `misaligned indices [${bad.join(", ")}]`
+        );
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/composable-tests/util/VariantsUtil.ts b/plugins/apps/composable-test-suite/src/composable-tests/util/VariantsUtil.ts
new file mode 100644
index 0000000000..45cef353ab
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/composable-tests/util/VariantsUtil.ts
@@ -0,0 +1,81 @@
+import { Board, VariantContainer } from "@penpot/plugin-types";
+
+/** One component to combine into a variant container: its board and property values. */
+export interface VariantComponentSpec {
+    /** The main-instance board on the canvas. */
+    shape: Board;
+    /** This component's variant property values, as `{ propertyName: value }`. */
+    properties: Record<string, string>;
+}
+
+/**
+ * Helpers for building variant containers through the Plugin API.
+ */
+export class VariantsUtil {
+    /**
+     * Creates a variant container from a list of main component instances and
+     * configures its property names and values in one call. Encapsulates the
+     * multi-step workflow: combine the components, name the properties, then set
+     * each component's property values.
+     *
+     * @param components - the main-instance boards to combine, each with the
+     *     variant property values that identify it
+     * @returns the newly created variant container
+     */
+    static create(components: readonly VariantComponentSpec[]): VariantContainer {
+        // collect all property names in first-seen order
+        const propNames: string[] = [];
+        for (const { properties } of components) {
+            for (const name of Object.keys(properties)) {
+                if (!propNames.includes(name)) propNames.push(name);
+            }
+        }
+
+        // combine the components into a variant container
+        // (createVariantFromComponents is not in the pinned plugin-types, but exists at runtime)
+        const container = (
+            penpot as unknown as {
+                createVariantFromComponents(shapes: Board[]): VariantContainer;
+            }
+        ).createVariantFromComponents(components.map((c) => c.shape));
+
+        const variants = container.variants;
+        if (variants === null) {
+            throw new Error(
+                "createVariantContainer: the created container has no `variants`; " +
+                    "ensure every provided shape is a main component instance."
+            );
+        }
+
+        // name the properties (createVariantFromComponents starts with exactly one)
+        for (let i = 0; i < propNames.length; i++) {
+            if (i === 0) {
+                variants.renameProperty(0, propNames[0]);
+            } else {
+                variants.addProperty();
+                variants.renameProperty(i, propNames[i]);
+            }
+        }
+
+        // Set each component's property values driven by the INPUT specs, NOT by
+        // variants.variantComponents(): createVariantFromComponents reorders the
+        // variant components unpredictably relative to the input shapes, so iterating
+        // its output and pairing by position writes values onto the wrong members.
+        // Each input shape's id is preserved, so its own component() is the matching
+        // variant component — set its properties directly.
+        for (const { shape, properties } of components) {
+            const comp = shape.component();
+            if (comp === null || !penpot.utils.types.isVariantComponent(comp)) {
+                throw new Error(`source shape "${shape.name}" is not a variant component after combining`);
+            }
+            for (let propIdx = 0; propIdx < propNames.length; propIdx++) {
+                const value = properties[propNames[propIdx]];
+                if (value !== undefined) {
+                    comp.setVariantProperty(propIdx, value);
+                }
+            }
+        }
+
+        return container;
+    }
+}
diff --git a/plugins/apps/composable-test-suite/src/main.ts b/plugins/apps/composable-test-suite/src/main.ts
new file mode 100644
index 0000000000..2013c49e50
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/main.ts
@@ -0,0 +1,387 @@
+// The plugin UI (runs in the iframe; has the DOM, talks to the sandbox via
+// postMessage). It renders the enumerated test tree as selectable, foldable rows
+// grouped by case, and updates each row in place — addressed by stable id — as the
+// sandbox streams test start/finish notifications.
+
+import "./style.css";
+
+// ── theme (plugin-styles colour variables are gated on [data-theme]) ───────────
+function applyTheme(theme: string | null): void {
+    document.documentElement.setAttribute("data-theme", theme === "light" ? "light" : "dark");
+}
+applyTheme(new URLSearchParams(window.location.search).get("theme"));
+
+// ── messages exchanged with the sandbox ────────────────────────────────────────
+interface TestInfo {
+    id: string;
+    name: string;
+}
+interface TestGroupInfo {
+    identifier: string;
+    description: string;
+    tests: TestInfo[];
+}
+interface TestTree {
+    groups: TestGroupInfo[];
+}
+interface ResultMessage {
+    passed: boolean;
+    errorMessage?: string;
+    transcript: string[];
+}
+
+type TestState = "idle" | "scheduled" | "running" | "passed" | "failed";
+
+// ── a single test row ───────────────────────────────────────────────────────────
+class TestRowView {
+    readonly id: string;
+    readonly element: HTMLElement;
+    private readonly checkbox: HTMLInputElement;
+    private readonly circle: HTMLElement;
+    private readonly status: HTMLElement;
+    private readonly details: HTMLElement;
+    private state: TestState = "idle";
+    private expanded = false;
+
+    /**
+     * @param info - the test's wire info (stable id and display name)
+     * @param identifier - the test's composite case identifier (the case's
+     *     identifier plus the 1-based index, e.g. "MainEditSyncs-2"); assigned
+     *     to the checkbox as its DOM id, for direct addressing
+     */
+    constructor(info: TestInfo, identifier: string) {
+        this.id = info.id;
+
+        this.element = document.createElement("div");
+        this.element.className = "row test-row";
+
+        const header = document.createElement("div");
+        header.className = "row-header";
+
+        this.checkbox = document.createElement("input");
+        this.checkbox.type = "checkbox";
+        this.checkbox.className = "checkbox-input";
+        this.checkbox.id = identifier;
+
+        this.circle = document.createElement("span");
+        this.circle.className = "status-circle";
+
+        const name = document.createElement("span");
+        name.className = "row-name body-s";
+        name.textContent = info.name;
+
+        this.status = document.createElement("span");
+        this.status.className = "row-status body-s";
+
+        // clicking the row (but not the checkbox) toggles the details fold
+        header.addEventListener("click", (event) => {
+            if (event.target !== this.checkbox) this.toggle();
+        });
+
+        header.append(this.checkbox, this.circle, name, this.status);
+
+        this.details = document.createElement("div");
+        this.details.className = "row-details";
+        this.details.hidden = true;
+        this.showPlaceholder();
+
+        this.element.append(header, this.details);
+        this.setState("idle");
+    }
+
+    get selected(): boolean {
+        return this.checkbox.checked;
+    }
+
+    set selected(value: boolean) {
+        this.checkbox.checked = value;
+    }
+
+    onSelectionChange(handler: () => void): void {
+        this.checkbox.addEventListener("change", handler);
+    }
+
+    /** Sets the visual state (drives the status circle and the right-side label). */
+    setState(state: TestState): void {
+        this.state = state;
+        this.element.dataset.state = state;
+        this.circle.dataset.state = state;
+        this.status.textContent = state === "scheduled" ? "Pending…" : state === "running" ? "Running…" : "";
+        // a (re)scheduled test has no current result; show the placeholder again
+        if (state === "scheduled") this.showPlaceholder();
+    }
+
+    /** Shows the "not run yet" placeholder in the details fold. */
+    private showPlaceholder(): void {
+        this.details.replaceChildren();
+        const hint = document.createElement("div");
+        hint.className = "details-hint body-s";
+        hint.textContent = "Run this test to see details.";
+        this.details.appendChild(hint);
+    }
+
+    /** Fills the fold with this test's applied steps and any failure message. */
+    setDetails(result: ResultMessage): void {
+        this.setState(result.passed ? "passed" : "failed");
+        this.details.replaceChildren();
+
+        if (!result.passed && result.errorMessage) {
+            const error = document.createElement("div");
+            error.className = "details-error body-s";
+            error.textContent = result.errorMessage;
+            this.details.appendChild(error);
+        }
+
+        const steps = document.createElement("ol");
+        steps.className = "details-steps body-s";
+        for (const step of result.transcript) {
+            const item = document.createElement("li");
+            item.textContent = step;
+            steps.appendChild(item);
+        }
+        this.details.appendChild(steps);
+    }
+
+    isPassed(): boolean {
+        return this.state === "passed";
+    }
+    isFailed(): boolean {
+        return this.state === "failed";
+    }
+    /** Indicates whether the test takes part in a run that is still in flight. */
+    isActive(): boolean {
+        return this.state === "running" || this.state === "scheduled";
+    }
+
+    private toggle(): void {
+        this.expanded = !this.expanded;
+        this.details.hidden = !this.expanded;
+        this.element.dataset.expanded = String(this.expanded);
+    }
+}
+
+// ── a group of rows (one test case) ─────────────────────────────────────────────
+class GroupView {
+    readonly element: HTMLElement;
+    readonly rows: TestRowView[];
+    private readonly checkbox: HTMLInputElement;
+    private readonly circle: HTMLElement;
+    private readonly count: HTMLElement;
+    private readonly passFail: HTMLElement;
+    private readonly caret: HTMLElement;
+    private readonly rowsContainer: HTMLElement;
+    private expanded = false;
+
+    constructor(info: TestGroupInfo, onSelectionChange: () => void) {
+        this.rows = info.tests.map((test, i) => new TestRowView(test, `${info.identifier}-${i + 1}`));
+
+        this.element = document.createElement("div");
+        this.element.className = "group";
+
+        const header = document.createElement("div");
+        header.className = "group-header";
+
+        this.caret = document.createElement("span");
+        this.caret.className = "caret";
+
+        this.checkbox = document.createElement("input");
+        this.checkbox.type = "checkbox";
+        this.checkbox.className = "checkbox-input";
+        this.checkbox.id = info.identifier;
+        this.checkbox.addEventListener("change", () => {
+            for (const row of this.rows) row.selected = this.checkbox.checked;
+            onSelectionChange();
+        });
+
+        this.circle = document.createElement("span");
+        this.circle.className = "status-circle";
+
+        const identifier = document.createElement("span");
+        identifier.className = "group-name body-s";
+        identifier.textContent = info.identifier;
+
+        this.count = document.createElement("span");
+        this.count.className = "group-count body-s";
+        this.count.textContent = `[${info.tests.length} tests]`;
+
+        // passed / failed counts, kept current by refresh()
+        this.passFail = document.createElement("span");
+        this.passFail.className = "group-passfail body-s";
+
+        // clicking the header (but not the checkbox) folds the group open/closed
+        header.addEventListener("click", (event) => {
+            if (event.target !== this.checkbox) this.toggle();
+        });
+
+        header.append(this.caret, this.checkbox, this.circle, identifier, this.count, this.passFail);
+
+        // the full description, shown as its own box in the unfolded section
+        const description = document.createElement("div");
+        description.className = "group-description body-s";
+        description.textContent = info.description;
+
+        this.rowsContainer = document.createElement("div");
+        this.rowsContainer.className = "group-rows";
+        this.rowsContainer.appendChild(description);
+        for (const row of this.rows) {
+            row.onSelectionChange(onSelectionChange);
+            this.rowsContainer.appendChild(row.element);
+        }
+
+        this.element.append(header, this.rowsContainer);
+        this.setExpanded(false);
+        this.refresh();
+    }
+
+    /** Expands or collapses the group's rows. */
+    private toggle(): void {
+        this.setExpanded(!this.expanded);
+    }
+
+    private setExpanded(expanded: boolean): void {
+        this.expanded = expanded;
+        this.rowsContainer.hidden = !expanded;
+        this.element.dataset.expanded = String(expanded);
+    }
+
+    /** Updates the group checkbox, aggregate circle, and count from its rows. */
+    refresh(): void {
+        const selected = this.rows.filter((r) => r.selected).length;
+        this.checkbox.checked = selected === this.rows.length && this.rows.length > 0;
+        this.checkbox.indeterminate = selected > 0 && selected < this.rows.length;
+
+        const passed = this.rows.filter((r) => r.isPassed()).length;
+        const failed = this.rows.filter((r) => r.isFailed()).length;
+        this.passFail.textContent = `${passed} / ${failed}`;
+        // while any of the group's tests is still running or queued, the aggregate
+        // shows "in progress"; the final verdict appears once the run settles
+        const active = this.rows.some((r) => r.isActive());
+        this.circle.dataset.state = active
+            ? "running"
+            : failed > 0
+              ? "failed"
+              : passed === this.rows.length && passed > 0
+                ? "passed"
+                : "idle";
+    }
+}
+
+// ── controller: builds the tree, wires selection and the run buttons ────────────
+class TestPanel {
+    private readonly groups: GroupView[] = [];
+    private readonly rowsById = new Map<string, TestRowView>();
+    private readonly treeEl = document.getElementById("tree") as HTMLElement;
+    private readonly summaryEl = document.getElementById("summary") as HTMLElement;
+    private readonly runAllBtn = document.getElementById("run-all-btn") as HTMLButtonElement;
+    private readonly runSelectedBtn = document.getElementById("run-selected-btn") as HTMLButtonElement;
+    private readonly clearSelectionBtn = document.getElementById("clear-selection-btn") as HTMLButtonElement;
+
+    constructor() {
+        this.runAllBtn.addEventListener("click", () => this.run(this.allIds()));
+        this.runSelectedBtn.addEventListener("click", () => this.run(this.selectedIds()));
+        this.clearSelectionBtn.addEventListener("click", () => this.clearSelection());
+    }
+
+    /** Deselects every test and updates the group aggregates. */
+    private clearSelection(): void {
+        for (const row of this.rowsById.values()) row.selected = false;
+        this.onSelectionChange();
+    }
+
+    /** Renders the enumerated tree (all tests idle, none selected). */
+    render(tree: TestTree): void {
+        this.groups.length = 0;
+        this.rowsById.clear();
+        this.treeEl.replaceChildren();
+
+        for (const groupInfo of tree.groups) {
+            const group = new GroupView(groupInfo, () => this.onSelectionChange());
+            this.groups.push(group);
+            for (const row of group.rows) this.rowsById.set(row.id, row);
+            this.treeEl.appendChild(group.element);
+        }
+        this.updateSummary();
+    }
+
+    markRunning(id: string): void {
+        this.rowsById.get(id)?.setState("running");
+        this.refresh();
+    }
+
+    markFinished(id: string, result: ResultMessage): void {
+        this.rowsById.get(id)?.setDetails(result);
+        this.refresh();
+    }
+
+    runFinished(): void {
+        this.setRunning(false);
+        this.refresh();
+    }
+
+    private run(ids: string[]): void {
+        if (ids.length === 0) return;
+        this.setRunning(true);
+        for (const id of ids) this.rowsById.get(id)?.setState("scheduled");
+        this.refresh();
+        parent.postMessage({ type: "run-tests", ids }, "*");
+    }
+
+    private setRunning(running: boolean): void {
+        this.runAllBtn.disabled = running;
+        this.runSelectedBtn.disabled = running;
+    }
+
+    private allIds(): string[] {
+        return [...this.rowsById.keys()];
+    }
+
+    private selectedIds(): string[] {
+        return [...this.rowsById.values()].filter((r) => r.selected).map((r) => r.id);
+    }
+
+    private onSelectionChange(): void {
+        for (const group of this.groups) group.refresh();
+    }
+
+    private refresh(): void {
+        for (const group of this.groups) group.refresh();
+        this.updateSummary();
+    }
+
+    private updateSummary(): void {
+        const rows = [...this.rowsById.values()];
+        const passed = rows.filter((r) => r.isPassed()).length;
+        const failed = rows.filter((r) => r.isFailed()).length;
+        this.summaryEl.textContent = `${rows.length} tests · ${passed} passed · ${failed} failed`;
+    }
+}
+
+// ── wire up ─────────────────────────────────────────────────────────────────────
+const panel = new TestPanel();
+
+window.addEventListener("message", (event: MessageEvent) => {
+    const data = event.data;
+    if (typeof data !== "object" || data === null) return;
+
+    switch (data.type) {
+        case "theme":
+            applyTheme(data.theme as string);
+            break;
+        case "test-tree":
+            panel.render(data.tree as TestTree);
+            break;
+        case "test-started":
+            panel.markRunning(data.id as string);
+            break;
+        case "test-finished":
+            panel.markFinished(data.id as string, data.result as ResultMessage);
+            break;
+        case "run-complete":
+        case "run-error":
+            panel.runFinished();
+            break;
+    }
+});
+
+// tell the sandbox we are ready to receive the tree
+parent.postMessage({ type: "ready" }, "*");
diff --git a/plugins/apps/composable-test-suite/src/plugin.ts b/plugins/apps/composable-test-suite/src/plugin.ts
new file mode 100644
index 0000000000..c51a015364
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/plugin.ts
@@ -0,0 +1,59 @@
+import { createTestSuite, TestSuite, TestRunObserver, TestResult } from "./composable-tests";
+
+// The plugin sandbox: it has the `penpot` API but no DOM. It enumerates the test
+// suite once, sends the tree to the UI to render, and runs whichever tests the UI
+// selects — forwarding each test's start/finish (addressed by stable id) so the UI
+// can update the matching row.
+
+penpot.ui.open("Composable Tests", `?theme=${penpot.theme}`, { width: 420, height: 640 });
+
+penpot.on("themechange", (theme) => {
+    penpot.ui.sendMessage({ type: "theme", theme });
+});
+
+// enumerate once; the tree the UI renders and the runs it requests share these ids
+const suite: TestSuite = createTestSuite();
+
+/** Sends the enumerated tree for the UI to render (all tests, not yet run). */
+function sendTree(): void {
+    penpot.ui.sendMessage({ type: "test-tree", tree: suite.tree() });
+}
+
+/** A `TestRunObserver` that forwards each test's state change to the UI by id. */
+class UiReportingObserver implements TestRunObserver {
+    onTestStarted(id: string): void {
+        penpot.ui.sendMessage({ type: "test-started", id });
+    }
+
+    onTestFinished(id: string, result: TestResult): void {
+        penpot.ui.sendMessage({
+            type: "test-finished",
+            id,
+            result: {
+                passed: result.passed,
+                errorMessage: result.errorMessage,
+                transcript: [...result.transcript],
+            },
+        });
+    }
+}
+
+penpot.ui.onMessage<{ type?: string; ids?: string[] }>((message) => {
+    if (typeof message !== "object" || message === null) return;
+
+    if (message.type === "ready") {
+        sendTree();
+    } else if (message.type === "run-tests") {
+        const ids = message.ids ?? [];
+        suite
+            .run(ids, new UiReportingObserver())
+            .then(() => penpot.ui.sendMessage({ type: "run-complete" }))
+            .catch((error: unknown) => {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                penpot.ui.sendMessage({ type: "run-error", errorMessage });
+            });
+    }
+});
+
+// in case the UI loaded before this handler was registered, also send the tree now
+sendTree();
diff --git a/plugins/apps/composable-test-suite/src/style.css b/plugins/apps/composable-test-suite/src/style.css
new file mode 100644
index 0000000000..4330de7903
--- /dev/null
+++ b/plugins/apps/composable-test-suite/src/style.css
@@ -0,0 +1,190 @@
+@import "@penpot/plugin-styles/styles.css";
+
+body {
+    margin: 0;
+    padding: 0;
+}
+
+.plugin-container {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-8);
+    padding: var(--spacing-12) var(--spacing-8);
+    box-sizing: border-box;
+    color: var(--foreground-primary);
+    user-select: none;
+    -webkit-user-select: none;
+}
+
+/* ── toolbar + summary ──────────────────────────────────────────── */
+
+.toolbar {
+    display: flex;
+    gap: var(--spacing-8);
+}
+
+.summary {
+    font-weight: 600;
+    color: var(--foreground-secondary);
+}
+
+/* ── tree / groups ──────────────────────────────────────────────── */
+
+.tree {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-8);
+}
+
+.group {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-4);
+}
+
+.group-header,
+.row-header {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-8);
+    padding: var(--spacing-8);
+    border-radius: var(--spacing-8);
+    background-color: var(--background-tertiary);
+}
+
+.group-header {
+    background-color: var(--background-quaternary);
+    font-weight: 600;
+}
+
+.caret {
+    flex: 0 0 auto;
+    width: 8px;
+    color: var(--foreground-secondary);
+    transition: transform 0.1s ease;
+}
+
+.caret::before {
+    content: "▸";
+}
+
+.group[data-expanded="true"] .caret {
+    transform: rotate(90deg);
+}
+
+.row-header {
+    cursor: pointer;
+}
+
+.row-header:hover {
+    background-color: var(--background-quaternary);
+}
+
+.group-rows {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-4);
+    padding-left: var(--spacing-16);
+}
+
+/* the [hidden] attribute must win over the display rules above */
+.group-rows[hidden],
+.row-details[hidden] {
+    display: none;
+}
+
+.row-name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.group-name {
+    flex: 0 0 auto;
+    white-space: nowrap;
+}
+
+/* passed / failed counts, at the right edge of the group header */
+.group-passfail {
+    flex: 0 0 auto;
+    margin-left: auto;
+    font-weight: 400;
+    color: var(--foreground-secondary);
+}
+
+/* the full description in the unfolded section: its own box, wrapping freely
+   and growing to whatever height the text needs */
+.group-description {
+    padding: var(--spacing-8);
+    border-radius: var(--spacing-8);
+    background-color: var(--background-tertiary);
+    color: var(--foreground-secondary);
+    white-space: normal;
+}
+
+.group-count,
+.row-status {
+    flex: 0 0 auto;
+    color: var(--foreground-secondary);
+}
+
+.row-status {
+    font-style: italic;
+}
+
+/* ── status circle ──────────────────────────────────────────────── */
+
+.status-circle {
+    flex: 0 0 auto;
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: var(--background-quaternary);
+    border: 1px solid var(--foreground-secondary);
+}
+
+/* "in progress": the theme's accent (as used by the buttons) — neutral between
+   passed (green) and failed (red); the palette's --warning-500 is a red-orange
+   that reads as a failure */
+.status-circle[data-state="running"] {
+    background-color: var(--accent-primary);
+    border-color: var(--accent-primary);
+}
+
+.status-circle[data-state="passed"] {
+    background-color: var(--success-500);
+    border-color: var(--success-500);
+}
+
+.status-circle[data-state="failed"] {
+    background-color: var(--error-500);
+    border-color: var(--error-500);
+}
+
+/* ── fold-out details ───────────────────────────────────────────── */
+
+.row-details {
+    padding: var(--spacing-8) var(--spacing-8) var(--spacing-8) var(--spacing-24);
+    color: var(--foreground-secondary);
+}
+
+.details-hint {
+    color: var(--foreground-secondary);
+    font-style: italic;
+}
+
+.details-error {
+    color: var(--error-500);
+    white-space: pre-wrap;
+    margin-bottom: var(--spacing-8);
+}
+
+.details-steps {
+    margin: 0;
+    padding-left: var(--spacing-16);
+}
+
+.details-steps li {
+    margin: 0;
+}
diff --git a/plugins/apps/composable-test-suite/tsconfig.json b/plugins/apps/composable-test-suite/tsconfig.json
new file mode 100644
index 0000000000..25d8ea13f3
--- /dev/null
+++ b/plugins/apps/composable-test-suite/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "target": "ES2020",
+        "useDefineForClassFields": true,
+        "module": "ESNext",
+        "lib": ["ES2020", "DOM", "DOM.Iterable"],
+        "skipLibCheck": true,
+        "typeRoots": ["./node_modules/@types", "./node_modules/@penpot"],
+        "types": ["plugin-types"],
+        "moduleResolution": "bundler",
+        "allowImportingTsExtensions": true,
+        "resolveJsonModule": true,
+        "isolatedModules": true,
+        "noEmit": true,
+        "strict": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noFallthroughCasesInSwitch": true
+    },
+    "include": ["src"]
+}
diff --git a/plugins/apps/composable-test-suite/vite.config.headless.ts b/plugins/apps/composable-test-suite/vite.config.headless.ts
new file mode 100644
index 0000000000..e373c5303a
--- /dev/null
+++ b/plugins/apps/composable-test-suite/vite.config.headless.ts
@@ -0,0 +1,24 @@
+import { defineConfig } from "vite";
+
+// Builds the CI test entry (src/ci/headless.ts) as a single self-executing
+// (IIFE) bundle with no import/export statements, so it can be evaluated
+// directly inside the Penpot plugin sandbox via `globalThis.ɵloadPlugin({
+// code })` by the CI driver (ci/run-ci.ts). `emptyOutDir` stays false so this
+// build never wipes the regular plugin outputs in dist/.
+export default defineConfig({
+    base: "./",
+    build: {
+        outDir: "dist",
+        emptyOutDir: false,
+        reportCompressedSize: false,
+        rollupOptions: {
+            input: {
+                headless: "src/ci/headless.ts",
+            },
+            output: {
+                format: "iife",
+                entryFileNames: "[name].js",
+            },
+        },
+    },
+});
diff --git a/plugins/apps/composable-test-suite/vite.config.ts b/plugins/apps/composable-test-suite/vite.config.ts
new file mode 100644
index 0000000000..d8062cc22e
--- /dev/null
+++ b/plugins/apps/composable-test-suite/vite.config.ts
@@ -0,0 +1,36 @@
+import { defineConfig } from "vite";
+import livePreview from "vite-live-preview";
+
+// Builds the plugin sandbox entry (plugin.js) and the UI (index.html) into dist/,
+// alongside the static manifest + icon copied from public/. The live-preview
+// plugin serves the built dist/ (so the manifest's `plugin.js` resolves) and
+// reloads on rebuild, giving a watch-build-serve dev loop via `pnpm start`.
+export default defineConfig({
+    base: "./",
+    plugins: [
+        livePreview({
+            reload: true,
+            config: {
+                build: {
+                    sourcemap: true,
+                },
+            },
+        }),
+    ],
+    build: {
+        rollupOptions: {
+            input: {
+                plugin: "src/plugin.ts",
+                index: "./index.html",
+            },
+            output: {
+                entryFileNames: "[name].js",
+            },
+        },
+    },
+    preview: {
+        // 4202 is the conventional dev port shared by the plugins in this workspace
+        port: 4202,
+        cors: true,
+    },
+});
diff --git a/plugins/apps/contrast-plugin/package.json b/plugins/apps/contrast-plugin/package.json
index 01ea179e5d..dce3ec209f 100644
--- a/plugins/apps/contrast-plugin/package.json
+++ b/plugins/apps/contrast-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/create-palette-plugin/package.json b/plugins/apps/create-palette-plugin/package.json
index 919d3035fc..b558d558e5 100644
--- a/plugins/apps/create-palette-plugin/package.json
+++ b/plugins/apps/create-palette-plugin/package.json
@@ -11,5 +11,6 @@
     "init": "concurrently --kill-others --names build,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/e2e/package.json b/plugins/apps/e2e/package.json
index d6e4bce356..a5b3507429 100644
--- a/plugins/apps/e2e/package.json
+++ b/plugins/apps/e2e/package.json
@@ -6,5 +6,6 @@
   "scripts": {
     "test": "vitest",
     "lint": "eslint ."
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/example-styles/package.json b/plugins/apps/example-styles/package.json
index 8d88f029cd..0f756858b8 100644
--- a/plugins/apps/example-styles/package.json
+++ b/plugins/apps/example-styles/package.json
@@ -10,5 +10,6 @@
     "init": "concurrently --kill-others --names build,serve \"pnpm run watch\" \"pnpm run serve\"",
     "serve": "vite preview",
     "lint": "eslint ."
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/icons-plugin/package.json b/plugins/apps/icons-plugin/package.json
index bed848681c..58e75dc346 100644
--- a/plugins/apps/icons-plugin/package.json
+++ b/plugins/apps/icons-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run build:plugin:watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/lorem-ipsum-plugin/package.json b/plugins/apps/lorem-ipsum-plugin/package.json
index f4935c7790..bc36b0f6e6 100644
--- a/plugins/apps/lorem-ipsum-plugin/package.json
+++ b/plugins/apps/lorem-ipsum-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/plugin-api-test-suite/README.md b/plugins/apps/plugin-api-test-suite/README.md
index c9b0b8cdf5..4de9a3adfb 100644
--- a/plugins/apps/plugin-api-test-suite/README.md
+++ b/plugins/apps/plugin-api-test-suite/README.md
@@ -32,6 +32,10 @@ From `plugins/`:
 - Dev server: `pnpm run start:plugin:api-test-suite` (serves on port 4202).
 - In Penpot: open the Plugin Manager (Ctrl+Alt+P) and install
   `http://localhost:4202/manifest.json`.
+- Alternatively, a one-shot `pnpm --filter plugin-api-test-suite run build` output
+  is served by the devenv alongside the other bundled plugins, at
+  `https://localhost:3449/plugins/plugin-api-test-suite/manifest.json` (no hot
+  reload of the UI there, but the **Reload** button still picks up rebuilt tests).
 - **Hot-reloading tests:** after editing a `*.test.ts`, click **Reload** in the
   plugin UI. It fetches the freshly built test bundle and swaps in your changes —
   no need to close/reopen the plugin. (The dev server rebuilds the bundle on save.)
diff --git a/plugins/apps/plugin-api-test-suite/ci/run-ci.ts b/plugins/apps/plugin-api-test-suite/ci/run-ci.ts
index 41a544d4f3..37f865ac0d 100644
--- a/plugins/apps/plugin-api-test-suite/ci/run-ci.ts
+++ b/plugins/apps/plugin-api-test-suite/ci/run-ci.ts
@@ -17,6 +17,7 @@ import type { CoverageReport, TestResult } from '../src/framework/types';
 //   Optional env: PENPOT_BASE_URL (default https://localhost:3449).
 //   Optional env: TEST_FILTER — run only tests whose group or name contains
 //   the given substring (case-insensitive).
+//   Optional env: RENDER_WASM — force the workspace renderer (`true`/`false`).
 //
 // - MOCKED (`MOCK_BACKEND=1`): serves the prebuilt frontend bundle via the e2e
 //   static server and intercepts every backend RPC with Playwright `page.route`,
@@ -351,6 +352,12 @@ async function main() {
     fileUrl = getFileUrl(file);
   }
 
+  const renderWasm = process.env['RENDER_WASM'];
+  if (renderWasm === 'true' || renderWasm === 'false') {
+    const separator = fileUrl.includes('?') ? '&' : '?';
+    fileUrl += `${separator}wasm=${renderWasm}`;
+  }
+
   const browser = await chromium.launch({
     args: ['--ignore-certificate-errors'],
   });
diff --git a/plugins/apps/plugin-api-test-suite/package.json b/plugins/apps/plugin-api-test-suite/package.json
index 305612633c..91c907367d 100644
--- a/plugins/apps/plugin-api-test-suite/package.json
+++ b/plugins/apps/plugin-api-test-suite/package.json
@@ -17,6 +17,7 @@
     "test:ci:mocked": "pnpm run build:headless && MOCK_BACKEND=1 tsx ci/run-ci.ts"
   },
   "devDependencies": {
-    "playwright": "^1.61.1"
-  }
+    "playwright": "^1.62.1"
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/plugin-api-test-suite/src/generated/api-surface.json b/plugins/apps/plugin-api-test-suite/src/generated/api-surface.json
index 0cbb2f8e1d..5116a2b1ec 100644
--- a/plugins/apps/plugin-api-test-suite/src/generated/api-surface.json
+++ b/plugins/apps/plugin-api-test-suite/src/generated/api-surface.json
@@ -114,7 +114,8 @@
       "uploadMediaData",
       "uploadMediaUrl",
       "version",
-      "viewport"
+      "viewport",
+      "waitForLayoutUpdate"
     ],
     "ContextGeometryUtils": ["center"],
     "ContextTypesUtils": [
@@ -454,6 +455,7 @@
       "switchVariant",
       "tokens",
       "visible",
+      "waitForLayoutUpdate",
       "width",
       "x",
       "y"
@@ -1213,6 +1215,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -1713,6 +1721,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -2312,6 +2326,12 @@
         "kind": "method",
         "type": "VariantContainer",
         "array": false
+      },
+      "waitForLayoutUpdate": {
+        "decl": "Context",
+        "kind": "method",
+        "type": null,
+        "array": false
       }
     },
     "ContextGeometryUtils": {
@@ -2845,6 +2865,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -4087,6 +4113,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -4671,6 +4703,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -6299,6 +6337,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -6620,6 +6664,12 @@
         "kind": "method",
         "type": "VariantContainer",
         "array": false
+      },
+      "waitForLayoutUpdate": {
+        "decl": "Context",
+        "kind": "method",
+        "type": null,
+        "array": false
       }
     },
     "PluginData": {
@@ -7129,6 +7179,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -7657,6 +7713,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -8221,6 +8283,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -8787,6 +8855,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
@@ -11085,6 +11159,12 @@
         "type": null,
         "array": false
       },
+      "waitForLayoutUpdate": {
+        "decl": "ShapeBase",
+        "kind": "method",
+        "type": null,
+        "array": false
+      },
       "getPluginData": {
         "decl": "PluginData",
         "kind": "method",
diff --git a/plugins/apps/plugin-api-test-suite/src/tests/wait-layout.test.ts b/plugins/apps/plugin-api-test-suite/src/tests/wait-layout.test.ts
new file mode 100644
index 0000000000..79c0fb330d
--- /dev/null
+++ b/plugins/apps/plugin-api-test-suite/src/tests/wait-layout.test.ts
@@ -0,0 +1,613 @@
+import { expect, expectReject } from '../framework/expect';
+import { describe, test } from '../framework/registry';
+import type { Board, Font, Group, Shape, Text } from '@penpot/plugin-types';
+import type { TestContext } from '../framework/types';
+
+// waitForLayoutUpdate (context-level and per-shape).
+// The promise must resolve only once the pending reflow work has been applied,
+// so every test asserts the *observable geometry* after awaiting: if the
+// promise settles too early the read-back is stale and the test goes red.
+// Reflow work is scheduled by three pipelines: flex/grid layout updates
+// (buffered ~100ms), wasm text resizes (debounced), and font-change
+// re-measurement. The probes below cover each one, including cascaded reflows
+// (a child resize that must also re-hug its ancestors) and waits racing the
+// font-loading retry loop.
+
+function flexBoard(ctx: TestContext): Board {
+  const b = ctx.penpot.createBoard();
+  ctx.board.appendChild(b);
+  return b;
+}
+
+/** Creates a horizontal flex board with two 50x50 rects and a 10px gap. */
+function flexRow(ctx: TestContext): {
+  board: Board;
+  rects: [Shape, Shape];
+} {
+  const b = flexBoard(ctx);
+  const flex = b.addFlexLayout();
+  flex.dir = 'row';
+  flex.columnGap = 10;
+  const r1 = ctx.penpot.createRectangle();
+  r1.resize(50, 50);
+  flex.appendChild(r1);
+  const r2 = ctx.penpot.createRectangle();
+  r2.resize(50, 50);
+  flex.appendChild(r2);
+  return { board: b, rects: [r1, r2] };
+}
+
+/** Orders the two rects of a flex row by their current x position. */
+function byX(rects: [Shape, Shape]): { left: Shape; right: Shape } {
+  const [a, b] = rects;
+  return a.x <= b.x ? { left: a, right: b } : { left: b, right: a };
+}
+
+/** Font ids already handed out by `unloadedFont`. */
+const claimedFonts = new Set<string>();
+
+/**
+ * Picks an unclaimed font differing from the text's current one, so assigning
+ * it triggers a real (not-yet-loaded) fetch. A font stays cached for the whole
+ * run, so reusing one would drain the pending mark near-instantly.
+ */
+function unloadedFont(ctx: TestContext, t: Text): Font {
+  const all = ctx.penpot.fonts.all;
+  for (let i = all.length - 1; i >= 0; i--) {
+    const f = all[i];
+    if (f.fontId === t.fontId || f.variants.length === 0) continue;
+    if (claimedFonts.has(f.fontId)) continue;
+    claimedFonts.add(f.fontId);
+    return f;
+  }
+  throw new Error('no alternative font available');
+}
+
+/** Picks any font other than the text's current one; may already be loaded. */
+function otherFont(ctx: TestContext, t: Text): Font {
+  const font = ctx.penpot.fonts.all.find(
+    (f) => f.fontId !== t.fontId && f.variants.length > 0,
+  );
+  if (!font) throw new Error('no alternative font available');
+  return font;
+}
+
+function autoWidthText(ctx: TestContext, value: string): Text {
+  const t = ctx.penpot.createText(value);
+  if (!t) throw new Error('createText returned null');
+  ctx.board.appendChild(t);
+  t.growType = 'auto-width';
+  t.fontSize = '36';
+  return t;
+}
+
+describe('WaitForLayoutUpdate', () => {
+  describe('Basics', () => {
+    test('context method returns a promise that resolves', async (ctx) => {
+      const p = ctx.penpot.waitForLayoutUpdate();
+      expect(typeof p.then).toBe('function');
+      const value = await p;
+      expect(value).toBeUndefined();
+    });
+
+    // For the next two, resolving (not rejecting, not hitting the runner
+    // timeout) is itself the behaviour under test, so they have no expects.
+
+    test('a timeout wait resolves via the fast path when nothing is pending', async (ctx) => {
+      // On an already drained pending map the settle signal replays
+      // synchronously, so it beats the deadline and even a 1ms timeout
+      // resolves. Draining is what has to be retried: a pipeline can schedule
+      // fresh work in the instant between the drain and the timed call, and
+      // that is a pending map, not a broken fast path.
+      let resolved = false;
+      for (let i = 0; i < 5 && !resolved; i++) {
+        await ctx.penpot.waitForLayoutUpdate();
+        resolved = await ctx.penpot
+          .waitForLayoutUpdate(1)
+          .then(() => true)
+          .catch(() => false);
+      }
+      expect(resolved).toBe(true);
+    });
+
+    test('shape method resolves for a shape with no pending work', async (ctx) => {
+      const r = ctx.penpot.createRectangle();
+      ctx.board.appendChild(r);
+      await r.waitForLayoutUpdate();
+    });
+
+    test('consecutive waits each track their own pending work', async (ctx) => {
+      // Each call opens a fresh subscription to the pending map, so a wait must
+      // settle on the work scheduled right before it and never carry state from
+      // an earlier, already-resolved wait. Two successive resizes to different
+      // sizes prove it: the second wait has to reflect the second reflow.
+      const { rects } = flexRow(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+
+      const { left, right } = byX(rects);
+      left.resize(120, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(right.x - left.x).toBeCloseTo(130, 0);
+
+      left.resize(70, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(right.x - left.x).toBeCloseTo(80, 0);
+    });
+  });
+
+  describe('Flex reflow', () => {
+    test('sibling is repositioned after awaiting a child resize', async (ctx) => {
+      const { rects } = flexRow(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+
+      const { left, right } = byX(rects);
+      left.resize(120, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(right.x - left.x).toBeCloseTo(130, 0);
+    });
+
+    test('board-level wait settles the reflow of its layout', async (ctx) => {
+      const { board: b, rects } = flexRow(ctx);
+      await b.waitForLayoutUpdate();
+
+      const { left, right } = byX(rects);
+      left.resize(120, 50);
+      // The layout pipeline marks the laid-out board (the parent) as pending,
+      // so the board proxy is the shape-level handle for this reflow.
+      await b.waitForLayoutUpdate();
+      expect(right.x - left.x).toBeCloseTo(130, 0);
+    });
+
+    test('back-to-back resizes settle to the last value', async (ctx) => {
+      // Overlapping operations on the same shapes: the wait must not resolve
+      // after the first one drains while the second is still in flight.
+      const { rects } = flexRow(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+
+      const { left, right } = byX(rects);
+      left.resize(80, 50);
+      left.resize(120, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(right.x - left.x).toBeCloseTo(130, 0);
+    });
+
+    test('grid layout reflow settles child positions', async (ctx) => {
+      const b = flexBoard(ctx);
+      const grid = b.addGridLayout();
+      grid.addRow('fixed', 60);
+      grid.addColumn('fixed', 60);
+      grid.addColumn('fixed', 60);
+      const r1 = ctx.penpot.createRectangle();
+      r1.resize(50, 50);
+      grid.appendChild(r1, 1, 1);
+      const r2 = ctx.penpot.createRectangle();
+      r2.resize(50, 50);
+      grid.appendChild(r2, 1, 2);
+      await ctx.penpot.waitForLayoutUpdate();
+      // Cells are 60px wide, so the second child sits one track further right.
+      expect(Math.abs(r2.x - r1.x)).toBeCloseTo(60, 0);
+    });
+  });
+
+  describe('Hug sizing', () => {
+    test('hug board fits its content after awaiting the initial layout', async (ctx) => {
+      const { board: b } = flexRow(ctx);
+      const flex = b.flex;
+      if (!flex) throw new Error('expected a flex layout on the board');
+      flex.horizontalSizing = 'auto';
+      flex.verticalSizing = 'auto';
+      await ctx.penpot.waitForLayoutUpdate();
+      // 50 + 10 gap + 50, no padding.
+      expect(b.width).toBeCloseTo(110, 0);
+    });
+
+    test('hug board grows after awaiting a child resize', async (ctx) => {
+      const { board: b, rects } = flexRow(ctx);
+      const flex = b.flex;
+      if (!flex) throw new Error('expected a flex layout on the board');
+      flex.horizontalSizing = 'auto';
+      flex.verticalSizing = 'auto';
+      await ctx.penpot.waitForLayoutUpdate();
+
+      const { left } = byX(rects);
+      left.resize(120, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(b.width).toBeCloseTo(180, 0);
+    });
+
+    test('nested hug boards both grow after awaiting a child resize', async (ctx) => {
+      // Cascade probe: the child resize reflows the inner board, whose new
+      // size must then reflow the outer board. The wait has to cover the whole
+      // chain, not just the first reflow round.
+      const outer = flexBoard(ctx);
+      const outerFlex = outer.addFlexLayout();
+      outerFlex.dir = 'row';
+      outerFlex.horizontalSizing = 'auto';
+      outerFlex.verticalSizing = 'auto';
+
+      const inner = ctx.penpot.createBoard();
+      outerFlex.appendChild(inner);
+      const innerFlex = inner.addFlexLayout();
+      innerFlex.dir = 'row';
+      innerFlex.horizontalSizing = 'auto';
+      innerFlex.verticalSizing = 'auto';
+
+      const rect = ctx.penpot.createRectangle();
+      rect.resize(50, 50);
+      innerFlex.appendChild(rect);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(inner.width).toBeCloseTo(50, 0);
+      expect(outer.width).toBeCloseTo(50, 0);
+
+      rect.resize(200, 50);
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(inner.width).toBeCloseTo(200, 0);
+      expect(outer.width).toBeCloseTo(200, 0);
+    });
+
+    test.skipIfMocked(
+      'hug board hugs an auto-width text after a characters change',
+      async (ctx) => {
+        // Cascade probe across pipelines: the text resize is scheduled by the
+        // text pipeline and only then does the board reflow to hug it. Skipped
+        // under a mocked backend: hugging a text depends on real glyph
+        // measurement (no fonts are served), so the text width never grows.
+        const b = flexBoard(ctx);
+        const flex = b.addFlexLayout();
+        flex.horizontalSizing = 'auto';
+        flex.verticalSizing = 'auto';
+        const t = ctx.penpot.createText('hi');
+        if (!t) throw new Error('createText returned null');
+        flex.appendChild(t);
+        t.growType = 'auto-width';
+        await ctx.penpot.waitForLayoutUpdate();
+        const w0 = b.width;
+
+        t.characters = 'a much much much longer text content than before';
+        await ctx.penpot.waitForLayoutUpdate();
+        expect(t.width).toBeGreaterThan(w0);
+        expect(b.width).toBeCloseTo(t.width, 0);
+      },
+    );
+  });
+
+  // Skipped under a mocked backend: every case here asserts that a text is
+  // re-measured (width changes) after a mutation, which depends on real glyph
+  // measurement against fonts the backend serves. Mocked mode serves no fonts,
+  // so the measured width stays put and the assertions can't hold.
+  describe.skipIfMocked('Text', () => {
+    test('auto-width text grows after awaiting a fontSize bump', async (ctx) => {
+      const t = autoWidthText(ctx, 'The quick brown fox');
+      await ctx.penpot.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      t.fontSize = '72';
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(t.width).toBeGreaterThan(w0);
+    });
+
+    test('auto-width text grows after awaiting a characters change', async (ctx) => {
+      const t = autoWidthText(ctx, 'short');
+      await ctx.penpot.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      t.characters = 'short plus a considerably longer tail 0123456789';
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(t.width).toBeGreaterThan(w0);
+    });
+
+    test('shape-level wait covers the text own resize', async (ctx) => {
+      const t = autoWidthText(ctx, 'The quick brown fox');
+      await t.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      t.fontSize = '72';
+      await t.waitForLayoutUpdate();
+      expect(t.width).toBeGreaterThan(w0);
+    });
+
+    test('auto-width text is re-measured after awaiting a font change', async (ctx) => {
+      // Probe for the font-loading window: right after a font change the new
+      // font is typically not loaded yet, and the wait must cover the load +
+      // re-measure, not resolve while the loader is still retrying.
+      const t = autoWidthText(
+        ctx,
+        'The quick brown fox jumps over the lazy dog 0123456789',
+      );
+      await ctx.penpot.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      const font = otherFont(ctx, t);
+      t.fontId = font.fontId;
+      t.fontFamily = font.fontFamily;
+      await ctx.penpot.waitForLayoutUpdate();
+      // A different family practically never yields the same measured width
+      // for a 54-char string at 36px.
+      expect(Math.abs(t.width - w0)).toBeGreaterThan(0.5);
+
+      // The wait covers the *final* geometry: a second wait must find the
+      // text where the first one left it.
+      const settled = t.width;
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(t.width).toBeCloseTo(settled, 0);
+    });
+
+    test('range font change is re-measured after awaiting', async (ctx) => {
+      // Same probe through the text-range pipeline instead of the shape-level
+      // font setter.
+      const t = autoWidthText(
+        ctx,
+        'The quick brown fox jumps over the lazy dog 0123456789',
+      );
+      await ctx.penpot.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      const font = otherFont(ctx, t);
+      const range = t.getRange(0, t.characters.length);
+      range.fontFamily = font.fontFamily;
+      range.fontId = font.fontId;
+      await ctx.penpot.waitForLayoutUpdate();
+      expect(Math.abs(t.width - w0)).toBeGreaterThan(0.5);
+    });
+  });
+
+  // A font applied to a group reaches its text descendants, so the work is
+  // pending on the children and never on the group itself. Skipped under a
+  // mocked backend for the same reason as the Text group: no fonts are served,
+  // so nothing is ever re-measured.
+  describe.skipIfMocked('Groups', () => {
+    /** Groups two auto-width texts and returns the group with its children. */
+    function textGroup(ctx: TestContext): {
+      group: Group;
+      texts: [Text, Text];
+    } {
+      const a = autoWidthText(ctx, 'The quick brown fox');
+      const b = autoWidthText(ctx, 'jumps over the lazy dog');
+      const group = ctx.penpot.group([a, b]);
+      if (!group) throw new Error('group returned null');
+      return { group, texts: [a, b] };
+    }
+
+    /** Groups an auto-width text with a fixed-size one. */
+    function mixedGrowTypeGroup(ctx: TestContext): {
+      group: Group;
+      auto: Text;
+      fixed: Text;
+    } {
+      const auto = autoWidthText(ctx, 'The quick brown fox');
+      const fixed = autoWidthText(ctx, 'jumps over the lazy dog');
+      fixed.resize(400, 80);
+      fixed.growType = 'fixed';
+      const group = ctx.penpot.group([auto, fixed]);
+      if (!group) throw new Error('group returned null');
+      return { group, auto, fixed };
+    }
+
+    /**
+     * The typed signature of `applyToText` takes a `Text`, but the setter also
+     * accepts a container and forwards the change to its text descendants, as
+     * it does for a group selected in the UI.
+     */
+    function applyFontToGroup(font: Font, group: Group): void {
+      font.applyToText(group as unknown as Text);
+    }
+
+    test('context wait covers a font applied to a group', async (ctx) => {
+      const { group, texts } = textGroup(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+      const [w0, w1] = [texts[0].width, texts[1].width];
+
+      const font = otherFont(ctx, texts[0]);
+      applyFontToGroup(font, group);
+      const started = Date.now();
+      await ctx.penpot.waitForLayoutUpdate();
+
+      expect(Math.abs(texts[0].width - w0)).toBeGreaterThan(0.5);
+      expect(Math.abs(texts[1].width - w1)).toBeGreaterThan(0.5);
+      // The wait tracks the text children. Tracking the group id would only
+      // unblock on the internal stuck-timeout, orders of magnitude slower.
+      expect(Date.now() - started).toBeLessThan(5000);
+    });
+
+    test('group wait covers the reflow of its text children', async (ctx) => {
+      const { group, texts } = textGroup(ctx);
+      await group.waitForLayoutUpdate();
+      const w0 = texts[0].width;
+
+      const font = otherFont(ctx, texts[0]);
+      applyFontToGroup(font, group);
+      const started = Date.now();
+      await group.waitForLayoutUpdate();
+
+      expect(Math.abs(texts[0].width - w0)).toBeGreaterThan(0.5);
+      expect(Date.now() - started).toBeLessThan(5000);
+    });
+
+    test('a font on a mixed group re-measures only the auto-width child', async (ctx) => {
+      // A group can hold both grow types, and only the auto ones have geometry
+      // to recompute. A fixed text keeps its box whatever the new glyphs
+      // measure, so the wait settles on the auto child alone.
+      const { group, auto, fixed } = mixedGrowTypeGroup(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+      const [autoW0, fixedW0] = [auto.width, fixed.width];
+
+      const font = otherFont(ctx, auto);
+      applyFontToGroup(font, group);
+      const started = Date.now();
+      await ctx.penpot.waitForLayoutUpdate();
+
+      expect(Math.abs(auto.width - autoW0)).toBeGreaterThan(0.5);
+      expect(fixed.width).toBeCloseTo(fixedW0, 0);
+      expect(Date.now() - started).toBeLessThan(5000);
+    });
+
+    test('board wait covers a pending descendant', async (ctx) => {
+      // The shape-level wait spans the subtree, so a board settles only once
+      // the text nested inside it has been re-measured too.
+      const b = flexBoard(ctx);
+      const t = ctx.penpot.createText('The quick brown fox');
+      if (!t) throw new Error('createText returned null');
+      b.appendChild(t);
+      t.growType = 'auto-width';
+      t.fontSize = '36';
+      await b.waitForLayoutUpdate();
+      const w0 = t.width;
+
+      const font = otherFont(ctx, t);
+      t.fontId = font.fontId;
+      t.fontFamily = font.fontFamily;
+      await b.waitForLayoutUpdate();
+      expect(Math.abs(t.width - w0)).toBeGreaterThan(0.5);
+    });
+  });
+
+  describe('Arguments', () => {
+    test('rejects a non-numeric timeout', async (ctx) => {
+      await expectReject(() =>
+        ctx.penpot.waitForLayoutUpdate('soon' as unknown as number),
+      );
+    });
+
+    test('rejects a non-positive timeout', async (ctx) => {
+      // 0 would mean "reject immediately"; omitting the argument is how a
+      // caller asks for the default.
+      await expectReject(() => ctx.penpot.waitForLayoutUpdate(0));
+      await expectReject(() => ctx.penpot.waitForLayoutUpdate(-1));
+    });
+
+    test('shape method rejects an invalid timeout too', async (ctx) => {
+      const r = ctx.penpot.createRectangle();
+      ctx.board.appendChild(r);
+      await expectReject(() =>
+        r.waitForLayoutUpdate('soon' as unknown as number),
+      );
+    });
+
+    test('an invalid timeout comes back as a rejected promise', async (ctx) => {
+      // `expectReject` accepts a synchronous throw as readily as a rejection,
+      // so a thunk cannot tell the two apart. The signature is `Promise<void>`:
+      // the rejection has to travel on a promise, so call it bare and check
+      // what came back before awaiting it.
+      const r = ctx.penpot.createRectangle();
+      ctx.board.appendChild(r);
+
+      const fromContext = ctx.penpot.waitForLayoutUpdate(-1);
+      expect(fromContext instanceof Promise).toBe(true);
+      await expectReject(fromContext);
+
+      const fromShape = r.waitForLayoutUpdate(0);
+      expect(fromShape instanceof Promise).toBe(true);
+      await expectReject(fromShape);
+    });
+  });
+
+  describe('Timeout', () => {
+    // Pure geometry mutations (resize & co.) are settled synchronously by the
+    // renderer, so right after them nothing is pending and a short-timeout
+    // wait legitimately resolves. The deterministic pending source is a font
+    // change: it marks the text pending until the font is fetched and the
+    // shape re-measured, which can never complete within 1ms. These tests hit
+    // the real backend for the font asset, hence skipIfMocked.
+
+    test.skipIfMocked(
+      'rejects with a timeout error while a font is loading',
+      async (ctx) => {
+        const t = autoWidthText(ctx, 'The quick brown fox');
+        await ctx.penpot.waitForLayoutUpdate();
+
+        // A fresh font change leaves work pending, so a 1ms deadline loses and
+        // the wait rejects. Retried because that work can already have drained
+        // by the time the deadline is set.
+        let rejected = false;
+        for (let i = 0; i < 3 && !rejected; i++) {
+          const font = unloadedFont(ctx, t);
+          t.fontId = font.fontId;
+          t.fontFamily = font.fontFamily;
+          rejected = await ctx.penpot
+            .waitForLayoutUpdate(1)
+            .then(() => false)
+            .catch((e: Error) => /timeout/i.test(e.message));
+        }
+        expect(rejected).toBe(true);
+      },
+    );
+
+    test.skipIfMocked(
+      'shape-level wait also rejects on timeout',
+      async (ctx) => {
+        const t = autoWidthText(ctx, 'The quick brown fox');
+        await ctx.penpot.waitForLayoutUpdate();
+
+        const font = unloadedFont(ctx, t);
+        t.fontId = font.fontId;
+        t.fontFamily = font.fontFamily;
+        await expectReject(t.waitForLayoutUpdate(1), /timeout/i);
+      },
+    );
+
+    test('resolves normally when work settles before the timeout', async (ctx) => {
+      const { rects } = flexRow(ctx);
+      await ctx.penpot.waitForLayoutUpdate();
+
+      const { left, right } = byX(rects);
+      left.resize(120, 50);
+      await ctx.penpot.waitForLayoutUpdate(5000);
+      expect(right.x - left.x).toBeCloseTo(130, 0);
+    });
+
+    test.skipIfMocked(
+      'a rejected wait leaves later waits working',
+      async (ctx) => {
+        const t = autoWidthText(ctx, 'The quick brown fox');
+        await ctx.penpot.waitForLayoutUpdate();
+        const w0 = t.width;
+        const loaded = { fontId: t.fontId, fontFamily: t.fontFamily };
+
+        // A fresh font change leaves work pending, so a 1ms deadline loses and
+        // the wait rejects. Retried because that work can already have drained
+        // by the time the deadline is set.
+        let rejected = false;
+        for (let i = 0; i < 3 && !rejected; i++) {
+          const font = unloadedFont(ctx, t);
+          t.fontId = font.fontId;
+          t.fontFamily = font.fontFamily;
+          rejected = await ctx.penpot
+            .waitForLayoutUpdate(1)
+            .then(() => false)
+            .catch((e: Error) => /timeout/i.test(e.message));
+        }
+        expect(rejected).toBe(true);
+
+        // A later wait still tracks work and still reports settled geometry.
+        // Measured on the loaded font the text started with: one inside its
+        // block period renders no box, so that text can never grow.
+        t.fontId = loaded.fontId;
+        t.fontFamily = loaded.fontFamily;
+        await ctx.penpot.waitForLayoutUpdate(8000);
+        t.characters =
+          'The quick brown fox jumps over the lazy dog 0123456789 and then some';
+        await ctx.penpot.waitForLayoutUpdate(8000);
+        expect(t.width).toBeGreaterThan(w0);
+      },
+    );
+
+    test.skipIfMocked(
+      'per-shape wait is not blocked by another shape pending work',
+      async (ctx) => {
+        const t = autoWidthText(ctx, 'The quick brown fox');
+        const bystander = ctx.penpot.createRectangle();
+        ctx.board.appendChild(bystander);
+        await ctx.penpot.waitForLayoutUpdate();
+
+        const font = unloadedFont(ctx, t);
+        t.fontId = font.fontId;
+        t.fontFamily = font.fontFamily;
+        // The text has pending font work but the bystander does not; its wait
+        // must resolve on the fast path instead of waiting for the font.
+        const started = Date.now();
+        await bystander.waitForLayoutUpdate();
+        expect(Date.now() - started).toBeLessThan(90);
+      },
+    );
+  });
+});
diff --git a/plugins/apps/plugin-api-test-suite/vite.config.ts b/plugins/apps/plugin-api-test-suite/vite.config.ts
index cc031bca49..25c811f49e 100644
--- a/plugins/apps/plugin-api-test-suite/vite.config.ts
+++ b/plugins/apps/plugin-api-test-suite/vite.config.ts
@@ -3,6 +3,10 @@ import { defineConfig } from 'vite';
 
 export default defineConfig({
   root: __dirname,
+  // Emit relative asset URLs in index.html so the built plugin works when served
+  // from a subdirectory (Penpot serves the bundled plugins under `/plugins/...`).
+  // Vite resolves `./` to `/` for the dev server, so `pnpm run dev` is unaffected.
+  base: './',
   server: {
     port: 4202,
     host: '0.0.0.0',
diff --git a/plugins/apps/poc-state-plugin/package.json b/plugins/apps/poc-state-plugin/package.json
index b658551e41..3cdfff436f 100644
--- a/plugins/apps/poc-state-plugin/package.json
+++ b/plugins/apps/poc-state-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/poc-tokens-plugin/package.json b/plugins/apps/poc-tokens-plugin/package.json
index 577c40559f..c30a9e92c9 100644
--- a/plugins/apps/poc-tokens-plugin/package.json
+++ b/plugins/apps/poc-tokens-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "exit 0"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/rename-layers-plugin/package.json b/plugins/apps/rename-layers-plugin/package.json
index ecd20a38b6..fc6c9ffecc 100644
--- a/plugins/apps/rename-layers-plugin/package.json
+++ b/plugins/apps/rename-layers-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/apps/table-plugin/package.json b/plugins/apps/table-plugin/package.json
index 5626e57444..2200694357 100644
--- a/plugins/apps/table-plugin/package.json
+++ b/plugins/apps/table-plugin/package.json
@@ -12,5 +12,6 @@
     "init": "concurrently --kill-others --names plugin,serve \"pnpm run watch\" \"pnpm run serve\"",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/libs/plugin-types/index.d.ts b/plugins/libs/plugin-types/index.d.ts
index cb53532dd6..483cfecca8 100644
--- a/plugins/libs/plugin-types/index.d.ts
+++ b/plugins/libs/plugin-types/index.d.ts
@@ -1350,6 +1350,17 @@ export interface Context {
    * @return The variant container created
    */
   createVariantFromComponents(shapes: Board[]): VariantContainer;
+
+  /**
+   * This method returns a promise that will be resolved when all the
+   * pending layout updates have finished. If no layout work is pending
+   * the promise resolves immediately.
+   * @param timeout Maximum time to wait, in milliseconds. If the timeout
+   * elapses before the layout settles, the promise is rejected. Defaults to
+   * 30000; the promise never waits indefinitely.
+   * @return The promise to be resolved when the layout is updated
+   */
+  waitForLayoutUpdate(timeout?: number): Promise<void>;
 }
 
 /**
@@ -4096,6 +4107,17 @@ export interface ShapeBase extends PluginData {
    * Removes the shape from its parent.
    */
   remove(): void;
+
+  /**
+   * This method returns a promise that will be resolved when the pending
+   * layout updates for this shape and its children have finished. If no layout
+   * work is pending for them the promise resolves immediately.
+   * @param timeout Maximum time to wait, in milliseconds. If the timeout
+   * elapses before the shape's layout settles, the promise is rejected.
+   * Defaults to 30000; the promise never waits indefinitely.
+   * @return The promise to be resolved when the shape's layout is updated
+   */
+  waitForLayoutUpdate(timeout?: number): Promise<void>;
 }
 
 /**
diff --git a/plugins/libs/plugin-types/package.json b/plugins/libs/plugin-types/package.json
index f79cbe7d85..86207557f6 100644
--- a/plugins/libs/plugin-types/package.json
+++ b/plugins/libs/plugin-types/package.json
@@ -6,5 +6,6 @@
   "scripts": {
     "build": "node ../../tools/scripts/build-types.mjs",
     "lint": "tsc -p . --noEmit"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/libs/plugins-runtime/package.json b/plugins/libs/plugins-runtime/package.json
index bd56f9de75..d98d7eeb6b 100644
--- a/plugins/libs/plugins-runtime/package.json
+++ b/plugins/libs/plugins-runtime/package.json
@@ -15,5 +15,6 @@
     "preview": "vite preview",
     "lint": "eslint .",
     "test": "vitest"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/libs/plugins-runtime/src/lib/api/index.ts b/plugins/libs/plugins-runtime/src/lib/api/index.ts
index 6faa7b1925..8956a5124e 100644
--- a/plugins/libs/plugins-runtime/src/lib/api/index.ts
+++ b/plugins/libs/plugins-runtime/src/lib/api/index.ts
@@ -388,6 +388,11 @@ export function createApi(
       checkPermission('content:write');
       return plugin.context.createVariantFromComponents(shapes);
     },
+
+    waitForLayoutUpdate(timeout?: number): Promise<void> {
+      checkPermission('content:read');
+      return plugin.context.waitForLayoutUpdate(timeout);
+    },
   };
 
   return {
diff --git a/plugins/libs/plugins-runtime/src/lib/modal/plugin-modal.ts b/plugins/libs/plugins-runtime/src/lib/modal/plugin-modal.ts
index 53ea472494..6939b8097a 100644
--- a/plugins/libs/plugins-runtime/src/lib/modal/plugin-modal.ts
+++ b/plugins/libs/plugins-runtime/src/lib/modal/plugin-modal.ts
@@ -6,7 +6,8 @@ import { dragHandler } from '../drag-handler.js';
 import modalCss from './plugin.modal.css?inline';
 import { resizeModal } from '../create-modal.js';
 
-const MIN_Z_INDEX = 3;
+const MIN_Z_INDEX = 300;
+const Z_INDEX_VAR = '--z-index-set';
 
 export class PluginModalElement extends HTMLElement {
   constructor() {
@@ -43,7 +44,19 @@ export class PluginModalElement extends HTMLElement {
         return Number(modal.style.zIndex);
       });
 
-    const maxZIndex = Math.max(...zIndexModals, MIN_Z_INDEX);
+    // Read the application z-index scale via the inherited CSS custom property
+    // `--z-index-set` (defined on :root). Custom properties pierce shadow DOM
+    // boundaries, so the value is available even though the modal uses a Shadow
+    // root. Falls back to MIN_Z_INDEX when the variable is unset or unparseable
+    // (e.g. when the runtime is used outside the Penpot app shell).
+    const declared = getComputedStyle(this)
+      .getPropertyValue(Z_INDEX_VAR)
+      .trim();
+    const parsed = Number(declared);
+    const baseZIndex =
+      Number.isFinite(parsed) && parsed > 0 ? parsed : MIN_Z_INDEX;
+
+    const maxZIndex = Math.max(...zIndexModals, baseZIndex);
 
     this.style.zIndex = (maxZIndex + 1).toString();
   }
diff --git a/plugins/libs/plugins-runtime/src/lib/parse-translate.ts b/plugins/libs/plugins-runtime/src/lib/parse-translate.ts
index 1f0081e3c3..bd43466051 100644
--- a/plugins/libs/plugins-runtime/src/lib/parse-translate.ts
+++ b/plugins/libs/plugins-runtime/src/lib/parse-translate.ts
@@ -1,7 +1,7 @@
 export const parseTranslate = (el: HTMLElement | null) => {
   let x = 0;
   let y = 0;
-  if (el && window['DOMMatrixReadOnly']) {
+  if (el instanceof Element && window['DOMMatrixReadOnly']) {
     const cs = window.getComputedStyle(el);
     const matrix = new DOMMatrixReadOnly(cs.transform);
     x = matrix.m41;
diff --git a/plugins/libs/plugins-styles/package.json b/plugins/libs/plugins-styles/package.json
index 2ba002b6f5..890b9fb454 100644
--- a/plugins/libs/plugins-styles/package.json
+++ b/plugins/libs/plugins-styles/package.json
@@ -5,5 +5,6 @@
   "scripts": {
     "build": "node ../../tools/scripts/build-css.mjs",
     "lint": "echo 0"
-  }
+  },
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee"
 }
diff --git a/plugins/package.json b/plugins/package.json
index bfb9f1fcdc..81c5b1ae31 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -3,7 +3,7 @@
   "version": "0.6.0",
   "type": "module",
   "license": "MIT",
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "scripts": {
     "start": "pnpm run start:app:runtime",
     "start:app:runtime": "concurrently --kill-others --names build,server \"pnpm --filter @penpot/plugins-runtime run build:watch\" \"pnpm --filter @penpot/plugins-runtime run preview\"",
@@ -18,8 +18,9 @@
     "start:plugin:colors-to-tokens": "pnpm --filter colors-to-tokens-plugin run init",
     "start:plugin:poc-tokens": "pnpm --filter poc-tokens-plugin run init",
     "start:plugin:api-test-suite": "pnpm --filter plugin-api-test-suite run init",
+    "start:plugin:composable-test-suite": "pnpm --filter composable-test-suite run init",
     "build:runtime": "pnpm --filter @penpot/plugins-runtime build",
-    "build:plugins": "pnpm --parallel --filter './apps/*-plugin' --filter plugin-api-test-suite --filter '!poc-state-plugin' build",
+    "build:plugins": "pnpm --parallel --filter './apps/*-plugin' --filter './apps/*-test-suite' --filter '!poc-state-plugin' build",
     "build:styles-example": "pnpm --filter example-styles build",
     "lint": "pnpm -r --parallel lint",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md,html,css}\"",
@@ -31,26 +32,26 @@
   },
   "private": true,
   "devDependencies": {
-    "@angular-devkit/core": "22.0.4",
-    "@angular-devkit/schematics": "22.0.4",
-    "@angular-eslint/eslint-plugin": "22.0.0",
-    "@angular-eslint/eslint-plugin-template": "22.0.0",
-    "@angular-eslint/template-parser": "22.0.0",
-    "@angular/build": "22.0.4",
-    "@angular/cli": "22.0.4",
-    "@angular/compiler-cli": "22.0.4",
-    "@angular/language-service": "22.0.4",
+    "@angular-devkit/core": "22.1.2",
+    "@angular-devkit/schematics": "22.1.2",
+    "@angular-eslint/eslint-plugin": "22.1.0",
+    "@angular-eslint/eslint-plugin-template": "22.1.0",
+    "@angular-eslint/template-parser": "22.1.0",
+    "@angular/build": "22.1.2",
+    "@angular/cli": "22.1.2",
+    "@angular/compiler-cli": "22.1.0",
+    "@angular/language-service": "22.1.0",
     "@eslint/js": "10.0.1",
-    "@schematics/angular": "22.0.4",
+    "@schematics/angular": "22.1.2",
     "@types/feather-icons": "^4.29.4",
-    "@types/node": "26.0.1",
+    "@types/node": "26.1.2",
     "@types/yargs": "^17.0.35",
-    "@typescript-eslint/eslint-plugin": "8.62.1",
-    "@typescript-eslint/parser": "8.62.1",
-    "@typescript-eslint/utils": "^8.62.1",
-    "@vitest/coverage-v8": "4.1.9",
-    "@vitest/ui": "4.1.9",
-    "concurrently": "^10.0.3",
+    "@typescript-eslint/eslint-plugin": "8.65.0",
+    "@typescript-eslint/parser": "8.65.0",
+    "@typescript-eslint/utils": "^8.65.0",
+    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/ui": "4.1.10",
+    "concurrently": "^10.0.4",
     "dotenv": "^17.4.2",
     "esbuild": "^0.28.1",
     "eslint": "10.6.0",
@@ -60,34 +61,34 @@
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "7.1.1",
     "eslint-plugin-unused-imports": "^4.4.1",
-    "fs-extra": "^11.3.6",
-    "globals": "^17.7.0",
-    "happy-dom": "^20.10.6",
+    "fs-extra": "^11.4.0",
+    "globals": "^17.9.0",
+    "happy-dom": "^20.11.1",
     "jiti": "2.7.0",
-    "jsdom": "~29.1.1",
+    "jsdom": "~30.0.1",
     "jsonc-eslint-parser": "^3.1.0",
-    "prettier": "^3.9.4",
-    "tsx": "^4.22.4",
-    "typedoc": "^0.28.19",
+    "prettier": "^3.9.6",
+    "tsx": "^4.23.5",
+    "typedoc": "^0.28.20",
     "typescript": "6.0.3",
-    "typescript-eslint": "^8.62.1",
-    "vite": "8.1.1",
-    "vite-plugin-checker": "^0.14.4",
+    "typescript-eslint": "^8.65.0",
+    "vite": "8.2.0",
+    "vite-plugin-checker": "^0.14.5",
     "vite-plugin-dts": "5.0.3",
     "vite-plugin-static-copy": "^4.1.1",
-    "vitest": "4.1.9",
-    "yargs": "^18.0.0"
+    "vitest": "4.1.10",
+    "yargs": "^18.1.0"
   },
   "dependencies": {
-    "@angular/common": "22.0.4",
-    "@angular/compiler": "22.0.4",
-    "@angular/core": "22.0.4",
-    "@angular/forms": "22.0.4",
-    "@angular/platform-browser": "22.0.4",
-    "@angular/router": "22.0.4",
-    "axios": "^1.18.1",
+    "@angular/common": "22.1.0",
+    "@angular/compiler": "22.1.0",
+    "@angular/core": "22.1.0",
+    "@angular/forms": "22.1.0",
+    "@angular/platform-browser": "22.1.0",
+    "@angular/router": "22.1.0",
+    "axios": "^1.19.0",
     "feather-icons": "^4.29.2",
-    "puppeteer": "^25.2.1",
+    "puppeteer": "^25.4.0",
     "rxjs": "~7.8.2",
     "ses": "^2.2.0",
     "tslib": "^2.8.1",
diff --git a/plugins/pnpm-lock.yaml b/plugins/pnpm-lock.yaml
index 96379796c5..f1f6bdea00 100644
--- a/plugins/pnpm-lock.yaml
+++ b/plugins/pnpm-lock.yaml
@@ -6,7 +6,9 @@ settings:
 
 overrides:
   '@babel/core@<=7.29.0': ^7.29.1
+  '@hono/node-server@<2.0.5': ^2.0.5
   ajv@>=7.0.0-alpha.0 <8.18.0: ^8.18.0
+  brace-expansion@>=4.0.0 <5.0.9: ^5.0.9
   lodash@<=4.17.23: ^4.17.24
   lodash@>=4.0.0 <=4.17.23: ^4.17.24
   minimatch@>=10.0.0 <10.2.1: ^10.2.1
@@ -17,32 +19,32 @@ importers:
   .:
     dependencies:
       '@angular/common':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+        specifier: 22.1.0
+        version: 22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@angular/compiler':
-        specifier: 22.0.4
-        version: 22.0.4
+        specifier: 22.1.0
+        version: 22.1.0
       '@angular/core':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
+        specifier: 22.1.0
+        version: 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
       '@angular/forms':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+        specifier: 22.1.0
+        version: 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@angular/platform-browser':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))
+        specifier: 22.1.0
+        version: 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))
       '@angular/router':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+        specifier: 22.1.0
+        version: 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       axios:
-        specifier: ^1.18.1
-        version: 1.18.1
+        specifier: ^1.19.0
+        version: 1.19.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)
       feather-icons:
         specifier: ^4.29.2
         version: 4.29.2
       puppeteer:
-        specifier: ^25.2.1
-        version: 25.2.1
+        specifier: ^25.4.0
+        version: 25.4.0
       rxjs:
         specifier: ~7.8.2
         version: 7.8.2
@@ -60,65 +62,65 @@ importers:
         version: 0.16.2
     devDependencies:
       '@angular-devkit/core':
-        specifier: 22.0.4
-        version: 22.0.4(chokidar@5.0.0)
+        specifier: 22.1.2
+        version: 22.1.2(chokidar@5.0.0)
       '@angular-devkit/schematics':
-        specifier: 22.0.4
-        version: 22.0.4(chokidar@5.0.0)
+        specifier: 22.1.2
+        version: 22.1.2(chokidar@5.0.0)
       '@angular-eslint/eslint-plugin':
-        specifier: 22.0.0
-        version: 22.0.0(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: 22.1.0
+        version: 22.1.0(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
       '@angular-eslint/eslint-plugin-template':
-        specifier: 22.0.0
-        version: 22.0.0(@angular-eslint/template-parser@22.0.0(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(@typescript-eslint/types@8.62.1)(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: 22.1.0
+        version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
       '@angular-eslint/template-parser':
-        specifier: 22.0.0
-        version: 22.0.0(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: 22.1.0
+        version: 22.1.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
       '@angular/build':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/compiler-cli@22.0.4(@angular/compiler@22.0.4)(typescript@6.0.3))(@angular/compiler@22.0.4)(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@types/node@26.0.1)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(postcss@8.5.16)(sass-embedded@1.97.3)(terser@5.46.2)(tslib@2.8.1)(tsx@4.22.4)(typescript@6.0.3)(vitest@4.1.9)(yaml@2.9.0)
+        specifier: 22.1.2
+        version: 22.1.2(@angular/compiler-cli@22.1.0(@angular/compiler@22.1.0)(typescript@6.0.3))(@angular/compiler@22.1.0)(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(@types/node@26.1.2)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@10.2.2))(jiti@2.7.0)(less@4.6.4)(postcss@8.5.25)(rollup@4.60.4)(sass-embedded@1.97.3)(supports-color@10.2.2)(terser@5.46.2)(tslib@2.8.1)(tsx@4.23.5)(typescript@6.0.3)(vitest@4.1.10)(yaml@2.9.0)
       '@angular/cli':
-        specifier: 22.0.4
-        version: 22.0.4(@types/node@26.0.1)(chokidar@5.0.0)
+        specifier: 22.1.2
+        version: 22.1.2(@types/node@26.1.2)(chokidar@5.0.0)(supports-color@10.2.2)
       '@angular/compiler-cli':
-        specifier: 22.0.4
-        version: 22.0.4(@angular/compiler@22.0.4)(typescript@6.0.3)
+        specifier: 22.1.0
+        version: 22.1.0(@angular/compiler@22.1.0)(typescript@6.0.3)
       '@angular/language-service':
-        specifier: 22.0.4
-        version: 22.0.4
+        specifier: 22.1.0
+        version: 22.1.0
       '@eslint/js':
         specifier: 10.0.1
-        version: 10.0.1(eslint@10.6.0(jiti@2.7.0))
+        version: 10.0.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       '@schematics/angular':
-        specifier: 22.0.4
-        version: 22.0.4(chokidar@5.0.0)
+        specifier: 22.1.2
+        version: 22.1.2(chokidar@5.0.0)
       '@types/feather-icons':
         specifier: ^4.29.4
         version: 4.29.4
       '@types/node':
-        specifier: 26.0.1
-        version: 26.0.1
+        specifier: 26.1.2
+        version: 26.1.2
       '@types/yargs':
         specifier: ^17.0.35
         version: 17.0.35
       '@typescript-eslint/eslint-plugin':
-        specifier: 8.62.1
-        version: 8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: 8.65.0
+        version: 8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
       '@typescript-eslint/parser':
-        specifier: 8.62.1
-        version: 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: 8.65.0
+        version: 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
       '@typescript-eslint/utils':
-        specifier: ^8.62.1
-        version: 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: ^8.65.0
+        version: 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
       '@vitest/coverage-v8':
-        specifier: 4.1.9
-        version: 4.1.9(vitest@4.1.9)
+        specifier: 4.1.10
+        version: 4.1.10(vitest@4.1.10)
       '@vitest/ui':
-        specifier: 4.1.9
-        version: 4.1.9(vitest@4.1.9)
+        specifier: 4.1.10
+        version: 4.1.10(vitest@4.1.10)
       concurrently:
-        specifier: ^10.0.3
-        version: 10.0.3
+        specifier: ^10.0.4
+        version: 10.0.4
       dotenv:
         specifier: ^17.4.2
         version: 17.4.2
@@ -127,79 +129,104 @@ importers:
         version: 0.28.1
       eslint:
         specifier: 10.6.0
-        version: 10.6.0(jiti@2.7.0)
+        version: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       eslint-config-prettier:
         specifier: 10.1.8
-        version: 10.1.8(eslint@10.6.0(jiti@2.7.0))
+        version: 10.1.8(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       eslint-plugin-import:
         specifier: 2.32.0
-        version: 2.32.0(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))
+        version: 2.32.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)
       eslint-plugin-jsx-a11y:
         specifier: 6.10.2
-        version: 6.10.2(eslint@10.6.0(jiti@2.7.0))
+        version: 6.10.2(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       eslint-plugin-react:
         specifier: 7.37.5
-        version: 7.37.5(eslint@10.6.0(jiti@2.7.0))
+        version: 7.37.5(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       eslint-plugin-react-hooks:
         specifier: 7.1.1
-        version: 7.1.1(eslint@10.6.0(jiti@2.7.0))
+        version: 7.1.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)
       eslint-plugin-unused-imports:
         specifier: ^4.4.1
-        version: 4.4.1(@typescript-eslint/eslint-plugin@8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))
+        version: 4.4.1(@typescript-eslint/eslint-plugin@8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       fs-extra:
-        specifier: ^11.3.6
-        version: 11.3.6
+        specifier: ^11.4.0
+        version: 11.4.0
       globals:
-        specifier: ^17.7.0
-        version: 17.7.0
+        specifier: ^17.9.0
+        version: 17.9.0
       happy-dom:
-        specifier: ^20.10.6
-        version: 20.10.6
+        specifier: ^20.11.1
+        version: 20.11.1
       jiti:
         specifier: 2.7.0
         version: 2.7.0
       jsdom:
-        specifier: ~29.1.1
-        version: 29.1.1
+        specifier: ~30.0.1
+        version: 30.0.1
       jsonc-eslint-parser:
         specifier: ^3.1.0
         version: 3.1.0
       prettier:
-        specifier: ^3.9.4
-        version: 3.9.4
+        specifier: ^3.9.6
+        version: 3.9.6
       tsx:
-        specifier: ^4.22.4
-        version: 4.22.4
+        specifier: ^4.23.5
+        version: 4.23.5
       typedoc:
-        specifier: ^0.28.19
-        version: 0.28.19(typescript@6.0.3)
+        specifier: ^0.28.20
+        version: 0.28.20(typescript@6.0.3)
       typescript:
         specifier: 6.0.3
         version: 6.0.3
       typescript-eslint:
-        specifier: ^8.62.1
-        version: 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+        specifier: ^8.65.0
+        version: 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
       vite:
-        specifier: 8.1.1
-        version: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+        specifier: 8.2.0
+        version: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
       vite-plugin-checker:
-        specifier: ^0.14.4
-        version: 0.14.4(eslint@10.6.0(jiti@2.7.0))(optionator@0.9.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+        specifier: ^0.14.5
+        version: 0.14.5(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(optionator@0.9.4)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
       vite-plugin-dts:
         specifier: 5.0.3
-        version: 5.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.0.1))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.60.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16))
+        version: 5.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.1.2))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.2.2)(rollup@4.60.4)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25))
       vite-plugin-static-copy:
         specifier: ^4.1.1
-        version: 4.1.1(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+        version: 4.1.1(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
       vitest:
-        specifier: 4.1.9
-        version: 4.1.9(@types/node@26.0.1)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(happy-dom@20.10.6)(jsdom@29.1.1)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+        specifier: 4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(happy-dom@20.11.1)(jsdom@30.0.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
       yargs:
-        specifier: ^18.0.0
-        version: 18.0.0
+        specifier: ^18.1.0
+        version: 18.1.0
 
   apps/colors-to-tokens-plugin: {}
 
+  apps/composable-test-suite:
+    dependencies:
+      '@penpot/plugin-styles':
+        specifier: 1.4.2
+        version: 1.4.2
+      '@penpot/plugin-types':
+        specifier: 1.4.2
+        version: 1.4.2
+    devDependencies:
+      playwright:
+        specifier: ^1.62.1
+        version: 1.62.1
+      prettier:
+        specifier: ^3.9.6
+        version: 3.9.6
+      typescript:
+        specifier: ^5.9.3
+        version: 5.9.3
+      vite:
+        specifier: ^8.2.0
+        version: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
+      vite-live-preview:
+        specifier: ^0.4.0
+        version: 0.4.0(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
+
   apps/contrast-plugin: {}
 
   apps/create-palette-plugin: {}
@@ -215,8 +242,8 @@ importers:
   apps/plugin-api-test-suite:
     devDependencies:
       playwright:
-        specifier: ^1.61.1
-        version: 1.61.1
+        specifier: ^1.62.1
+        version: 1.62.1
 
   apps/poc-state-plugin: {}
 
@@ -244,73 +271,17 @@ importers:
 
 packages:
 
-  '@algolia/abtesting@1.18.0':
-    resolution: {integrity: sha512-8siuLG+FIns1AjZ/g2SDVwHz9S+ObacDQISEJvS8XsNei1zl3FXqfqQrBpmrG7ACWCyesXHbicMJtvRbg00FEw==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-abtesting@5.52.0':
-    resolution: {integrity: sha512-wtwPgyPmO7b7sQPVgoK29c1VpfS08DnnJCmxX/oU1pV2DlMRJCzQcLN7JSloYpodyKHwM8+9wOzlAM0co3TDmA==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-analytics@5.52.0':
-    resolution: {integrity: sha512-9KY36bRl4AH7RjqSeDDOKnjsz4IxQFBEOB8/fWmEbdQe+Isbs5jGzVJu9NEPQ1Tgwxlf8Uf07Swj3jZyMNUZ2g==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-common@5.52.0':
-    resolution: {integrity: sha512-3a/qM3dzJqqfTx7Yrw7uGQ98I3Q0rDfb4Vkv0wEzko96l7YQMxfBVz/VbLq2N+c59GweYv6Vhp8mPeqnWJSITw==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-insights@5.52.0':
-    resolution: {integrity: sha512-Rki7ACbMcvbQW0BuM84x9dkGHY47ABmv4jU6tYssat2k02p3mIUms2YOLUAMeknhmnFsj6lb6ZzOXdMWMyc1sA==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-personalization@5.52.0':
-    resolution: {integrity: sha512-96s4Uzc3kk+/f4jJXIVVGWP5XlngOGNQ1x6hW9AT59pOixHlOs5tqJg+ZUS/GQ6h/iYP0ceQcmxDQeLyCLTaDQ==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-query-suggestions@5.52.0':
-    resolution: {integrity: sha512-lqeycNpSPe5Qa0OUWpejVvYQjQWV5nQuLT0a4aq7XzRAvCxprV/6Lf841EygdD2nrFnuS58ok7Au1uOtXzpnkg==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/client-search@5.52.0':
-    resolution: {integrity: sha512-ly1wETVGRo30cx61O7fetESN+ElL9c9K+bD/AVgnT1ar4c6v+/Yqjrhdtu6Fm4D0s4NZP081Isf6tunH1wUXHg==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/ingestion@1.52.0':
-    resolution: {integrity: sha512-U4EeTvgmluRjj39ykZSAd5X+a6LD5m7/mcOWDmB7hqm1R6QY0yT8jLxpNVEjYhzgEN5hcDGW6X67EWQY8KiYGQ==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/monitoring@1.52.0':
-    resolution: {integrity: sha512-FCPnDcILfpTE94u7BVlV4DmnSV5wE3+j25EEF+3dYPrVzkVCSoAHs318oWDGxnxsAgiL4HpL12Jc4XHmw9shpA==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/recommend@5.52.0':
-    resolution: {integrity: sha512-br3DO7n4N8CXwTRbZS0MnB4WQ9YHfNjCwkCEzVR/wek/qNTDQKDb0nROmkFaNZ8ucUqUVKZi074dbwMwRDlK8Q==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/requester-browser-xhr@5.52.0':
-    resolution: {integrity: sha512-b0T/Ca2c9KyEslKsVrGZvbe1UrrKKSdfXhBZ2pbpKahFUzJfziRZ0urbOm7V65O0tO/jwU+Lo/+bIiiyhzGt8w==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/requester-fetch@5.52.0':
-    resolution: {integrity: sha512-ozBT8J/mtD4H4IAojw8QPirlcL2gHrI1BGuZ4/ZXXO/rTE1yQ4VIPJj4mTTbwo4FbkS1MoJsD/DsrqLzhnc4/g==}
-    engines: {node: '>= 14.0.0'}
-
-  '@algolia/requester-node-http@5.52.0':
-    resolution: {integrity: sha512-gyyWcLD22tnabmoit4iukCXuoRc5HYJuUjPSEa8a0D/f/NlRafpWi52AlAaa4Uu/rsl7saHsJFTNjTptWbu2+A==}
-    engines: {node: '>= 14.0.0'}
-
   '@ampproject/remapping@2.3.0':
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
-  '@angular-devkit/architect@0.2200.4':
-    resolution: {integrity: sha512-X/iEQiZ0pRmpjUt11jCM+mtOLRl4XxI9hnM0IC9aAcsm5AzRBb9WY6QIEqOSficjxC/+MI7MGwrerrcP6QN8UA==}
+  '@angular-devkit/architect@0.2201.2':
+    resolution: {integrity: sha512-RRG3JA3hPH0ypbDIyquZt9DDTP5pOMPgqQ/iLSkok1MZdKiOgpk6FGfXCa1ei72SwlX7lnJdq94d6WWdqpbyKg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     hasBin: true
 
-  '@angular-devkit/core@22.0.4':
-    resolution: {integrity: sha512-zA2UJSMAU3su5uJTOn5ul/gCLRcw6/uIQ6EC5v/Ju/ePjgDIw9R3y3MAvWQ4Ibi/fXiq0FVxpF8hE7RUclYmJA==}
+  '@angular-devkit/core@22.1.2':
+    resolution: {integrity: sha512-tF1oEE7KPs8I08HJQmH5e4GkLUB3+MXXy8t6gMJULaLFxZYP9K1oXRFLappMpdm9OIbEXOChk23hrho0By9aYg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       chokidar: ^5.0.0
@@ -318,51 +289,44 @@ packages:
       chokidar:
         optional: true
 
-  '@angular-devkit/schematics@22.0.4':
-    resolution: {integrity: sha512-VRxL1hD/Q3TQglM6EfQ0ksAW4OIvtKyZgtaUpyGsJRfD6tGmLFn7MDnmyyq1ceLX/Clq+3tzH/wN0tF6rcE0jA==}
+  '@angular-devkit/schematics@22.1.2':
+    resolution: {integrity: sha512-Lw6NvW5rfMUl/2dsuWY8l6wlfWCuYBzCYSSqqliLPDco0doGzBliHwY9uxuzuUKZgOl5TvuVyvEo0t3o4Jj4GA==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@angular-eslint/bundled-angular-compiler@22.0.0':
-    resolution: {integrity: sha512-rv15vGDpGW8zZFaLdhQ+iIO1f0bZds/xvuxoX277hFisXp5Kt6FumJNNIb4g/qxq3xsY46a7fD6R7KvGY3smHg==}
+  '@angular-eslint/bundled-angular-compiler@22.1.0':
+    resolution: {integrity: sha512-iOtOQ2jtrtko1rIQo6i+g3ezxGL0lyYv80j4GccFTK1JGh4K+AqYkmaBvfUfNtqoE/7VcKsOoyxaFt6iIpKhaQ==}
 
-  '@angular-eslint/eslint-plugin-template@22.0.0':
-    resolution: {integrity: sha512-y6XL5HJ8C31NpBvkVHpU3bWc+Rk9g1zRtHrs39omhuT29eEUcS3zu47HMFV6tf8rHOI97B2Mstg6qYS5XL9ATg==}
+  '@angular-eslint/eslint-plugin-template@22.1.0':
+    resolution: {integrity: sha512-GK/Mwhwvj+MX6DefD29/IfuYjcai5CsCbYJ6Qb9P6IAzZaQqw+EN+CiXxIwzMnzm2edLcJzAsX8iBk4X7sVi2Q==}
     peerDependencies:
-      '@angular-eslint/template-parser': 22.0.0
+      '@angular-eslint/template-parser': 22.1.0
       '@typescript-eslint/types': ^8.0.0
       '@typescript-eslint/utils': ^8.0.0
       eslint: ^9.0.0 || ^10.0.0
       typescript: '*'
 
-  '@angular-eslint/eslint-plugin@22.0.0':
-    resolution: {integrity: sha512-mKLScPZhqG64ic0KIQoxqSqCdkPwtEZuTOuunvc9lYTw05MJSHRUM2yVFODlCGq97c6BN1F6KBk2I+a+KFnr1g==}
+  '@angular-eslint/eslint-plugin@22.1.0':
+    resolution: {integrity: sha512-nRwdbUiW7vF0gbwtxw2hRGPZYZCNWOTLZKw4HM+I37o5YFIA0CFLtbyRKgZWs6JZCIqzTYSwCyKNsW41Qw0FwQ==}
     peerDependencies:
       '@typescript-eslint/utils': ^8.0.0
       eslint: ^9.0.0 || ^10.0.0
       typescript: '*'
 
-  '@angular-eslint/template-parser@22.0.0':
-    resolution: {integrity: sha512-jU5MKQ24bBB4J99gSSexmUrLm2LvTJZCuCHhNTQ1LavWX4e1lrIxhm+6pJILOm6Cixf8jyNXnHMty6nljX8J+Q==}
+  '@angular-eslint/template-parser@22.1.0':
+    resolution: {integrity: sha512-gcufZLI/Rl2fOWtBk2MgMRkH1t+OrbJGxIsfT0w3pVjKm0zwi7njM/dtPbVjCHzsGhx7szQMvY0i0UwTBVYkSw==}
     peerDependencies:
       eslint: ^9.0.0 || ^10.0.0
       typescript: '*'
 
-  '@angular-eslint/utils@22.0.0':
-    resolution: {integrity: sha512-VFodMojghnPYm+B3U+HRYrqebPMj8NyobNjVzDdY8V5XIBW+4ivOSEINIz81G48rmm/NZKwj56+bJ88bVX4KIw==}
+  '@angular-eslint/utils@22.1.0':
+    resolution: {integrity: sha512-zDPJqgOxlkG20UJWsVDSvnEtC2MfIP0+yKMaQUBL+2nrEknV/fVLrz7ApnerWiDrGTcAms5si49KV10MarMpRA==}
     peerDependencies:
       '@typescript-eslint/utils': ^8.0.0
       eslint: ^9.0.0 || ^10.0.0
       typescript: '*'
 
-  '@angular/animations@22.0.4':
-    resolution: {integrity: sha512-drb9ndon6J+t6Do72zdIRZWbmkaCovExXtvwY5f/4dTlXcvLCTPtf//02wn0fn6zq9oUUWISu6MHU9gZ6Cqwwg==}
-    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
-    deprecated: '@angular/animations is deprecated. Use `animate.enter` and `animate.leave` instead. For more information see: https://v22.angular.dev/guide/animations.'
-    peerDependencies:
-      '@angular/core': 22.0.4
-
-  '@angular/build@22.0.4':
-    resolution: {integrity: sha512-hst/KhP5mMPajY32l7qmyW/5fuqrMHCjHEeNhMMNqP82+j8jPBFfMEL26AH9w2kIIdKGpC3WKN5JgLotyFD7tQ==}
+  '@angular/build@22.1.2':
+    resolution: {integrity: sha512-DE/3o17JTel4EBt2BA4DqJYeBBuz5Ef/kf1jL9YZTyJu4SrLr/HI79K14jFr0VRIxzcqG92FdIzfLDxbOesQsg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       '@angular/compiler': ^22.0.0
@@ -372,12 +336,13 @@ packages:
       '@angular/platform-browser': ^22.0.0
       '@angular/platform-server': ^22.0.0
       '@angular/service-worker': ^22.0.0
-      '@angular/ssr': ^22.0.4
+      '@angular/ssr': ^22.1.2
       istanbul-lib-instrument: ^6.0.0
       karma: ^6.4.0
       less: ^4.2.0
       ng-packagr: ^22.0.0
       postcss: ^8.4.0
+      rollup: ^4.0.0
       tailwindcss: ^2.0.0 || ^3.0.0 || ^4.0.0
       tslib: ^2.3.0
       typescript: '>=6.0 <6.1'
@@ -405,43 +370,45 @@ packages:
         optional: true
       postcss:
         optional: true
+      rollup:
+        optional: true
       tailwindcss:
         optional: true
       vitest:
         optional: true
 
-  '@angular/cli@22.0.4':
-    resolution: {integrity: sha512-3eJy6VoNlgskKFzvqy3AJsYXFRhSBLLGObF2iTpJymsukuxWUen7hlVVVWrO5++bW1LEgd6PTCCD5fdT2UuRiA==}
+  '@angular/cli@22.1.2':
+    resolution: {integrity: sha512-gzB+iuZzB507DAkZb9s5+Jw8QRzOBolUhHEuAKH74xF6oWlEP5JdexfTgti45SjXaKKqeYpODJFnUmSQQJRhxA==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     hasBin: true
 
-  '@angular/common@22.0.4':
-    resolution: {integrity: sha512-ibHINcvajoXfKfb4aGdLx8aOFkUOadAYF9/Yy4j2C1gQdLS6uXOCPFD9+W9zWf8OeMhL0H+i+5KeNlh6XbGaZw==}
+  '@angular/common@22.1.0':
+    resolution: {integrity: sha512-67L8AS00egxwEKnoMhNDxy+TY+eKOwvwa+os0Odq8nLm7+Qh7JnMVeub8hfncpenOFqlC/RUjO2W9H7Gd2veNA==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      '@angular/core': 22.0.4
+      '@angular/core': 22.1.0
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@angular/compiler-cli@22.0.4':
-    resolution: {integrity: sha512-UmZRpw3pStRmH3ZOLg3BfyGaTxu/aqL00U1eoE3yfsUea25zJLU+gC4vx3NYtHzYKQu84wX3gTZXhLuuYYTa8w==}
+  '@angular/compiler-cli@22.1.0':
+    resolution: {integrity: sha512-jL89dbzkrV8AeLaxedBgT7ErMnbfi2dvwDJuCrUgm3eCNfbcOpGbNxzH+wDgvbRg2Lhj11/u3JPbW50xA6rvvg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     hasBin: true
     peerDependencies:
-      '@angular/compiler': 22.0.4
+      '@angular/compiler': 22.1.0
       typescript: '>=6.0 <6.1'
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@angular/compiler@22.0.4':
-    resolution: {integrity: sha512-PvbsPr3d0OHm90vgq1v+0oPP/oHNuCcZQAhhD3fhHlx3DTxf6nkjUqBulzdJ6d5QwDsy378pwf8+dpGquFzbGQ==}
+  '@angular/compiler@22.1.0':
+    resolution: {integrity: sha512-WCmuPnuXgqnqrkbrwqQRyldi1k3rlzNLVDl8ntINF7XWuJh0KfQLEkRK0FCCmBztWJkbGug4RBVnKTWlKhRzCQ==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
 
-  '@angular/core@22.0.4':
-    resolution: {integrity: sha512-QTGwZcnc6dBhGPMID8DvwRQdHMvpqV0vXDX8jSdmVDiWDsFUjbe9AUFTHEizDm+wnmxOrCQ0DHkgmHICuh0GpA==}
+  '@angular/core@22.1.0':
+    resolution: {integrity: sha512-X5UaMuOCI4HAvSQIs3QtM+5e0Cni16DRaHUIL3BIBd4ZQNnSH3pZ25TsKQ8Jlu/3hAQ9rzV278kNQcecooGJ7g==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      '@angular/compiler': 22.0.4
+      '@angular/compiler': 22.1.0
       rxjs: ^6.5.3 || ^7.4.0
       zone.js: ~0.15.0 || ~0.16.0
     peerDependenciesMeta:
@@ -450,82 +417,99 @@ packages:
       zone.js:
         optional: true
 
-  '@angular/forms@22.0.4':
-    resolution: {integrity: sha512-MId7Dcxl2/i/ztvf3sJggFBNOqR+btHfolEMRruqdD+o9b+eq/U3Yu0+4FQls1yJ84Lk75C5H6sN1Pc7kzNVgw==}
+  '@angular/forms@22.1.0':
+    resolution: {integrity: sha512-nWlSM/pPp78Sx/fBM/tFEgZxdfZe50LkCE2/hkO22Fi1UM2maGc43LDsu/s6l0q9hFep4Wj+xa30KXDBS7Cn8A==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      '@angular/common': 22.0.4
-      '@angular/core': 22.0.4
-      '@angular/platform-browser': 22.0.4
+      '@angular/common': 22.1.0
+      '@angular/core': 22.1.0
+      '@angular/platform-browser': 22.1.0
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@angular/language-service@22.0.4':
-    resolution: {integrity: sha512-os/30s+drTMnKa4sc8O5iK9WI02z6Lg8gMu5Ob1KwjOctB1Be+BLvuDC0JLM5SbJSd/yld1/jbxGfcYoHcqHbw==}
+  '@angular/language-service@22.1.0':
+    resolution: {integrity: sha512-5J+j17o9rvJEiTVotsQfHprPCgKrHhYxz+SpiV25p5mG2qOJ9vX465o/ODbFpRapK8eyHqd/HkPRaGafu3nZkg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
 
-  '@angular/platform-browser@22.0.4':
-    resolution: {integrity: sha512-lkl8ZIydRsMKb5PMIpVizKmOWzk7fQRmjQMjvLIW733M2OgpEpfYMohzsBVop6oaRImG6Row5uBBSu1j4adGzg==}
+  '@angular/platform-browser@22.1.0':
+    resolution: {integrity: sha512-gqUYDUiPfwbaLYdH8WLnOLl3feo3OcNpnMO08HBHaUdi4TLNkC28xwa9fC6ANyYD22QZ5A3abSg8fmR6upWMwg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      '@angular/animations': 22.0.4
-      '@angular/common': 22.0.4
-      '@angular/core': 22.0.4
+      '@angular/animations': 22.1.0
+      '@angular/common': 22.1.0
+      '@angular/core': 22.1.0
     peerDependenciesMeta:
       '@angular/animations':
         optional: true
 
-  '@angular/router@22.0.4':
-    resolution: {integrity: sha512-Kh236EphzUPNVt9w5Gv5hKJoQAMlo4fvAJ5E4E7vogFD36WM0ebt1COfYN3uATZel+4RehQg2VR45uepPI9HNA==}
+  '@angular/router@22.1.0':
+    resolution: {integrity: sha512-42Bs0g+tV2gE70Lqnt+VD/+DWbvWwQcg8QgXkTIu3A504tYknrZG/wmvki2AJGyZhmyQ46B4pfXLG4WDP8MFSA==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      '@angular/common': 22.0.4
-      '@angular/core': 22.0.4
-      '@angular/platform-browser': 22.0.4
+      '@angular/common': 22.1.0
+      '@angular/core': 22.1.0
+      '@angular/platform-browser': 22.1.0
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@asamuzakjp/css-color@5.1.11':
-    resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+  '@asamuzakjp/css-color@6.0.5':
+    resolution: {integrity: sha512-mbhpPMmnw/kwW19aRNmSUl1QzLbdGo1SCuE49BT98MNwqF6zaHb3o2owssFc/PEO/4t2UjqtCNwocuDtJornzA==}
+    engines: {node: ^22.13.0 || >=24.0.0}
 
-  '@asamuzakjp/dom-selector@7.1.1':
-    resolution: {integrity: sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-
-  '@asamuzakjp/generational-cache@1.0.1':
-    resolution: {integrity: sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==}
-    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
-
-  '@asamuzakjp/nwsapi@2.3.9':
-    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+  '@asamuzakjp/dom-selector@8.3.0':
+    resolution: {integrity: sha512-UJLfKXBhrc8i1vH2eJXuYQMwlsLKWFw3O+CPqXSuVEiikeAim3UgrfWX0k4tA/X8cRFM8iZ7OaqBokFGbYusdg==}
+    engines: {node: ^22.13.0 || >=24.0.0}
 
   '@babel/code-frame@7.29.7':
     resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@8.0.0':
+    resolution: {integrity: sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/compat-data@7.29.7':
     resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@8.0.0':
+    resolution: {integrity: sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/core@7.29.7':
     resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@8.0.1':
+    resolution: {integrity: sha512-5FgxM4dLQpMJHSiVATk8foW263dVHQHBVpXYiimNECVWG01f4nFyEbQixeT6Mwvg7TayREJ2gpKl3o2RoMdnqw==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/generator@7.29.7':
     resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-annotate-as-pure@7.27.3':
-    resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==}
-    engines: {node: '>=6.9.0'}
+  '@babel/generator@8.0.0':
+    resolution: {integrity: sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
+  '@babel/helper-annotate-as-pure@8.0.0':
+    resolution: {integrity: sha512-NSpMkMsvvZqzThJ0p1B02cbtA2ObEyfBvq950bmNkyxsxvcxwhvvCB036rKhlEnuBBo30bOrk13u3FzlKSoRrw==}
+    engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-compilation-targets@7.29.7':
     resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@8.0.0':
+    resolution: {integrity: sha512-JwculLABZvyPvyLBpwU/E/IbH2uM3mnxNtIJpxnIfb24y1PrdVxK5Dqjle4DpgqpGRnwgC7G8IkzPdSXZrO1Ew==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/helper-globals@7.29.7':
     resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-globals@8.0.0':
+    resolution: {integrity: sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/helper-module-imports@7.29.7':
     resolution: {integrity: sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==}
     engines: {node: '>=6.9.0'}
@@ -544,35 +528,72 @@ packages:
     resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@8.0.0':
+    resolution: {integrity: sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/helper-validator-identifier@7.29.7':
     resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@8.0.4':
+    resolution: {integrity: sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/helper-validator-option@7.29.7':
     resolution: {integrity: sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@8.0.0':
+    resolution: {integrity: sha512-U4Dybxh4WESWHt5XhBeExi4DrY0/DNK1aHpQbsrQXCUbFHuMweT0TpLEWKvaraV2Y6fS+ZXunsZ8zIuZIgvF2Q==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/helpers@7.29.7':
     resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helpers@8.0.0':
+    resolution: {integrity: sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/parser@7.29.7':
     resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@8.0.4':
+    resolution: {integrity: sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+    hasBin: true
+
   '@babel/template@7.29.7':
     resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@8.0.0':
+    resolution: {integrity: sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/traverse@7.29.7':
     resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@8.0.4':
+    resolution: {integrity: sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@babel/types@7.29.7':
     resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.29.8':
+    resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@8.0.4':
+    resolution: {integrity: sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==}
+    engines: {node: ^22.18.0 || >=24.11.0}
+
   '@bcoe/v8-coverage@1.0.2':
     resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
     engines: {node: '>=18'}
@@ -581,22 +602,22 @@ packages:
     resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
     hasBin: true
 
-  '@bufbuild/protobuf@2.12.1':
-    resolution: {integrity: sha512-BvAMfS6LrgZiryOAZ4pBYucu4wG/Ei/9o9DZ9akbREnMLbPJiom2i8b9C8IsKErQoiKqVhrerzt3kOT/RrzLHg==}
+  '@bufbuild/protobuf@2.13.0':
+    resolution: {integrity: sha512-acq7c49vxfm1ggJ95P70TX7ABDM0vxr1SYD3BB0o0jnBLB4OAqeHyKuN+cD3w80gXEDQ2zxHpR6CUeA+O/aU9g==}
 
-  '@csstools/color-helpers@6.0.2':
-    resolution: {integrity: sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==}
+  '@csstools/color-helpers@6.1.0':
+    resolution: {integrity: sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==}
     engines: {node: '>=20.19.0'}
 
-  '@csstools/css-calc@3.2.1':
-    resolution: {integrity: sha512-DtdHlgXh5ZkA43cwBcAm+huzgJiwx3ZTWVjBs94kwz2xKqSimDA3lBgCjphYgwgVUMWatSM0pDd8TILB1yrVVg==}
+  '@csstools/css-calc@3.3.0':
+    resolution: {integrity: sha512-c5ihYsPkdG6JCkU2zTMm4+k6r7RXuGxtWYhu5DHMIiF1FHzrfmHL5so11AoFpUv/tu61xfcmT4AmKoFfMPoqdQ==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-color-parser@4.1.1':
-    resolution: {integrity: sha512-eZ5XOtyhK+mggRafYUWzA0tvaYOFgdY8AkgQiCJF9qNAePnUo/zmsqqYubBBb3sQ8uNUaSKTY9s9klfRaAXL0g==}
+  '@csstools/css-color-parser@4.1.10':
+    resolution: {integrity: sha512-UZhQLIUyJaaMepqehrCODwCg2KW25vFvLWBmqYFaPclYvvxzj/sG8LBOhBFCp11i9uE7t1EyS+RAoV9tztPFyw==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
@@ -608,8 +629,8 @@ packages:
     peerDependencies:
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.4':
-    resolution: {integrity: sha512-wgsqt92b7C7tQhIdPNxj0n9zuUbQlvAuI1exyzeNrOKOi62SD7ren8zqszmpVREjAOqg8cD2FqYhQfAuKjk4sw==}
+  '@csstools/css-syntax-patches-for-csstree@1.1.7':
+    resolution: {integrity: sha512-fQ+05118eQS1cofO3aJpB5efgpBZMvIzwr/sbC8kDLVA5XLG8q1kJV5yzrUAI1f7lvhPnm8fgIjzFB8/O/5Dig==}
     peerDependencies:
       css-tree: ^3.2.1
     peerDependenciesMeta:
@@ -623,12 +644,27 @@ packages:
   '@emnapi/core@1.11.1':
     resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==}
 
+  '@emnapi/core@1.11.2':
+    resolution: {integrity: sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==}
+
+  '@emnapi/core@1.11.3':
+    resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==}
+
   '@emnapi/runtime@1.11.1':
     resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==}
 
+  '@emnapi/runtime@1.11.2':
+    resolution: {integrity: sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==}
+
+  '@emnapi/runtime@1.11.3':
+    resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==}
+
   '@emnapi/wasi-threads@1.2.2':
     resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==}
 
+  '@emnapi/wasi-threads@1.2.3':
+    resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==}
+
   '@endo/cache-map@1.1.0':
     resolution: {integrity: sha512-owFGshs/97PDw9oguZqU/px8Lv1d0KjAUtDUiPwKHNXRVUE/jyettEbRoTbNJR1OaI8biMn6bHr9kVJsOh6dXw==}
 
@@ -638,312 +674,156 @@ packages:
   '@endo/immutable-arraybuffer@1.1.2':
     resolution: {integrity: sha512-u+NaYB2aqEugQ3u7w3c5QNkPogf8q/xGgsPaqdY6pUiGWtYiTiFspKFcha6+oeZhWXWQ23rf0KrUq0kfuzqYyQ==}
 
-  '@esbuild/aix-ppc64@0.27.2':
-    resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
   '@esbuild/aix-ppc64@0.28.1':
     resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.27.2':
-    resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm64@0.28.1':
     resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.27.2':
-    resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.28.1':
     resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.27.2':
-    resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.28.1':
     resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.27.2':
-    resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-arm64@0.28.1':
     resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.27.2':
-    resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.28.1':
     resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.27.2':
-    resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-arm64@0.28.1':
     resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.27.2':
-    resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.28.1':
     resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.27.2':
-    resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm64@0.28.1':
     resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.27.2':
-    resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-arm@0.28.1':
     resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.27.2':
-    resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.28.1':
     resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.27.2':
-    resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.28.1':
     resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.27.2':
-    resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.28.1':
     resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.27.2':
-    resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.28.1':
     resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.27.2':
-    resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.28.1':
     resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.27.2':
-    resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.28.1':
     resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.27.2':
-    resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.28.1':
     resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.27.2':
-    resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
   '@esbuild/netbsd-arm64@0.28.1':
     resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.27.2':
-    resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/netbsd-x64@0.28.1':
     resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.27.2':
-    resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
   '@esbuild/openbsd-arm64@0.28.1':
     resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.27.2':
-    resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/openbsd-x64@0.28.1':
     resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openharmony-arm64@0.27.2':
-    resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@esbuild/openharmony-arm64@0.28.1':
     resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/sunos-x64@0.27.2':
-    resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.28.1':
     resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.27.2':
-    resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-arm64@0.28.1':
     resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.27.2':
-    resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.28.1':
     resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.27.2':
-    resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.28.1':
     resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==}
     engines: {node: '>=18'}
@@ -998,19 +878,15 @@ packages:
       '@noble/hashes':
         optional: true
 
-  '@gar/promise-retry@1.0.3':
-    resolution: {integrity: sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   '@gerrit0/mini-shiki@3.23.0':
     resolution: {integrity: sha512-bEMORlG0cqdjVyCEuU0cDQbORWX+kYCeo0kV1lbxF5bt4r7SID2l9bqsxJEM0zndaxpOUT7riCyIVEuqq/Ynxg==}
 
   '@harperfast/extended-iterable@1.0.3':
     resolution: {integrity: sha512-sSAYhQca3rDWtQUHSAPeO7axFIUJOI6hn1gjRC5APVE1a90tuyT8f5WIgRsFhhWA7htNkju2veB9eWL6YHi/Lw==}
 
-  '@hono/node-server@1.19.14':
-    resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
-    engines: {node: '>=18.14.1'}
+  '@hono/node-server@2.0.12':
+    resolution: {integrity: sha512-eWpQYr67tqJLeaSUl0Q+TquuYfUdTibpOJlUMV2FfUP7+KqCC5TufnwnlXL6mobZBJbGAYRd7ZvEBDCbLInjhg==}
+    engines: {node: '>=20'}
     peerDependencies:
       hono: ^4
 
@@ -1047,15 +923,6 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/confirm@6.0.12':
-    resolution: {integrity: sha512-h9FgGun3QwVYNj5TWIZZ+slii73bMoBFjPfVIGtnFuL4t8gBiNDV9PcSfIzkuxvgquJKt9nr1QzszpBzTbH8Og==}
-    engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'}
-    peerDependencies:
-      '@types/node': '>=18'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-
   '@inquirer/confirm@6.1.1':
     resolution: {integrity: sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==}
     engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
@@ -1132,9 +999,9 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/prompts@8.4.2':
-    resolution: {integrity: sha512-XJmn/wY4AX56l1BRU+ZjDrFtg9+2uBEi4JvJQj82kwJDQKiPgSn4CEsbfGGygS4Gw6rkL4W18oATjfVfaqub2Q==}
-    engines: {node: '>=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0'}
+  '@inquirer/prompts@8.5.2':
+    resolution: {integrity: sha512-IYR/3C/paEVVQYQvdDlFZVjRCJVYHHON0XXMH91KO9GSxs0TdKYWlUdvfQl2EfAHDxUaN3IBffkE/BDTh5nJ6g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
     peerDependencies:
       '@types/node': '>=18'
     peerDependenciesMeta:
@@ -1177,10 +1044,6 @@ packages:
       '@types/node':
         optional: true
 
-  '@isaacs/fs-minipass@4.0.1':
-    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
-    engines: {node: '>=18.0.0'}
-
   '@istanbuljs/schema@0.1.6':
     resolution: {integrity: sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==}
     engines: {node: '>=8'}
@@ -1204,45 +1067,45 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@listr2/prompt-adapter-inquirer@4.2.3':
-    resolution: {integrity: sha512-Co9U3AJ3LW0J8XBHjVoNKA79dMAyFt8EZH3OaKTMcDTj8r+6kG3vSUPq/eGLHT7P0iK3uLaFfhdFYd3033P24g==}
+  '@listr2/prompt-adapter-inquirer@4.2.4':
+    resolution: {integrity: sha512-/KRI2DMD7JGSYaREF0Ygl7AefJ/2ase4Gc5cBiKqT5l4tFjsSJfhFGcc5nSkgl0Sp9LkCQNzl/cqbVJYP2L3dw==}
     engines: {node: '>=22.13.0'}
     peerDependencies:
       '@inquirer/prompts': '>= 3 < 9'
       listr2: 10.2.1
 
-  '@lmdb/lmdb-darwin-arm64@3.5.4':
-    resolution: {integrity: sha512-Kk4Kz3iyu1QiLsLZBS9Af1eSKUC8VR2T+/jyE2iAyuGw2VwK08pp5iTbZnXn6sWu0LogO/RFktMxOjiDA2sS3w==}
+  '@lmdb/lmdb-darwin-arm64@3.5.6':
+    resolution: {integrity: sha512-mY5FG4TjPAkY4P0w+OhHaUka5mDh2TX2WKYIwuKzJ1zeW3VvRgxdam/lGJTquI+bthTx5CSHDW+BAQCnNAzkEA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@lmdb/lmdb-darwin-x64@3.5.4':
-    resolution: {integrity: sha512-BEe5Rp3trn26oxoXOVL5HVDoiYmjUDwr8NRPkBOdUdCSBEorKI+7JrZLRKAdxO+G6cGQLgseXk0gR7qIQa7aGw==}
+  '@lmdb/lmdb-darwin-x64@3.5.6':
+    resolution: {integrity: sha512-foa+pwitysO8k+xhs7psBFfTKnVgR69NlZRRTHaFVDqphh7AdGpLeyRzKw/ofatr/sN6TiHRRW6mmop0ZrrppQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@lmdb/lmdb-linux-arm64@3.5.4':
-    resolution: {integrity: sha512-cUXEengO8o60v1SWerJTH4/RH4U3+9jC0/4njp2Z9NdmvaGzhKsbRM2wpXuRYrN8tytsoJCg0SvWEWwHAwLbCA==}
+  '@lmdb/lmdb-linux-arm64@3.5.6':
+    resolution: {integrity: sha512-HmiyFFdJa38s1heCMSooSPaBSFTHJ3C+ERPp28xAPlDX1YiALJVOgbry065nXd8Y7KISWjnw05zpG1RX8IfftA==}
     cpu: [arm64]
     os: [linux]
 
-  '@lmdb/lmdb-linux-arm@3.5.4':
-    resolution: {integrity: sha512-SGbFR7816uBcTHc2ZY4S6WyOkl9bICnzqTQd2Mv4V/j24cfds88xx2nC6cm/y8zGQL7Ds31YF/5NGxjgcdM5Hw==}
+  '@lmdb/lmdb-linux-arm@3.5.6':
+    resolution: {integrity: sha512-QR4YRyR5h5Z8eGXrNQjiyo2NNDfqi3tCc9dQG5Is1blCt+qWw1ZoBWhlWAr5d+jshkifMIJjVHzHGKbkKzF8Tw==}
     cpu: [arm]
     os: [linux]
 
-  '@lmdb/lmdb-linux-x64@3.5.4':
-    resolution: {integrity: sha512-Gxq8jpgOWXwd0PUR+c9R2Ik1/uBnGd5GMIIzRRDqABCkvmjtC3KWcyhesV9jSPCz759isl0NlbsstZ2oyvk8lA==}
+  '@lmdb/lmdb-linux-x64@3.5.6':
+    resolution: {integrity: sha512-ADzCuCF2cTNiX9kDScqcz1fjnAkxPpQNneV3KFTdV3wWtVlI2sTGzySoMTgDpinkMMFj1NTJlxA6XR8fwc4hlA==}
     cpu: [x64]
     os: [linux]
 
-  '@lmdb/lmdb-win32-arm64@3.5.4':
-    resolution: {integrity: sha512-pKv1DJ1bPZAaHkdFsSz5IDfUG8x9vntgquXF9/Dm2xuupcIe/EkLzylpoBxppFVK5vzbV561Dq26jNY2fIMA7g==}
+  '@lmdb/lmdb-win32-arm64@3.5.6':
+    resolution: {integrity: sha512-J7A9aEQsQiv0TYtBGL7NDIPp2lOS8nnl+zm4sWZm1xlsTTaQ4PgD096Adzdrk27rw3UxCkDXdCUa4ax41oztBQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@lmdb/lmdb-win32-x64@3.5.4':
-    resolution: {integrity: sha512-JF1BmLCm9kGEVZgYmJq43zeQVdHVgAJnTi/NURWEsy6L1ZrrlSmdltS+D17QN4LODwf+1LMXAA9auIZVXtWwzw==}
+  '@lmdb/lmdb-win32-x64@3.5.6':
+    resolution: {integrity: sha512-1g7G0knRX2iV/voDu54yxrGqw5Dk0w2oIYb7dgJq8IkOi+m7wbD8Q3QpPFjh0C01G58S88dqGn03len6UPCXsg==}
     cpu: [x64]
     os: [win32]
 
@@ -1433,244 +1296,529 @@ packages:
   '@napi-rs/wasm-runtime@1.0.7':
     resolution: {integrity: sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw==}
 
-  '@napi-rs/wasm-runtime@1.1.6':
-    resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
+  '@napi-rs/wasm-runtime@1.2.2':
+    resolution: {integrity: sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
     peerDependencies:
-      '@emnapi/core': ^1.7.1
-      '@emnapi/runtime': ^1.7.1
+      '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.3
+      '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.3
 
-  '@npmcli/agent@4.0.2':
-    resolution: {integrity: sha512-EUEuWAxnL07Sp5/iC/1X6Xj+XThUvnbei9zfRWZdEXa7lss9RTHMhAHBeg+MZ5To9s/gGaSI+UwZTPdYMvKSeg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/fs@5.0.0':
-    resolution: {integrity: sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/git@7.0.2':
-    resolution: {integrity: sha512-oeolHDjExNAJAnlYP2qzNjMX/Xi9bmu78C9dIGr4xjobrSKbuMYCph8lTzn4vnW3NjIqVmw/f8BCfouqyJXlRg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/installed-package-contents@4.0.0':
-    resolution: {integrity: sha512-yNyAdkBxB72gtZ4GrwXCM0ZUedo9nIbOMKfGjt6Cu6DXf0p8y1PViZAKDC8q8kv/fufx0WTjRBdSlyrvnP7hmA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-    hasBin: true
-
-  '@npmcli/node-gyp@5.0.0':
-    resolution: {integrity: sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/package-json@7.0.5':
-    resolution: {integrity: sha512-iVuTlG3ORq2iaVa1IWUxAO/jIp77tUKBhoMjuzYW2kL4MLN1bi/ofqkZ7D7OOwh8coAx1/S2ge0rMdGv8sLSOQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/promise-spawn@9.0.1':
-    resolution: {integrity: sha512-OLUaoqBuyxeTqUvjA3FZFiXUfYC1alp3Sa99gW3EUDz3tZ3CbXDdcZ7qWKBzicrJleIgucoWamWH1saAmH/l2Q==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/redact@4.0.0':
-    resolution: {integrity: sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@npmcli/run-script@10.0.4':
-    resolution: {integrity: sha512-mGUWr1uMnf0le2TwfOZY4SFxZGXGfm4Jtay/nwAa2FLNAKXUoUwaGwBMNH36UHPtinWfTSJ3nqFQr0091CxVGg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@oxc-project/types@0.137.0':
-    resolution: {integrity: sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==}
-
-  '@parcel/watcher-android-arm64@2.5.6':
-    resolution: {integrity: sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
+  '@oxc-parser/binding-android-arm-eabi@0.142.0':
+    resolution: {integrity: sha512-ZiRGDutGsv1G6bL/ozy/koC0Sv39T1DqyoC4KD1DOy9ZoACm1O5UWhEK2c02Qdk+4lfLVkvFa/mQ0fm/4h1BtQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
     os: [android]
 
-  '@parcel/watcher-darwin-arm64@2.5.6':
-    resolution: {integrity: sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@parcel/watcher-darwin-x64@2.5.6':
-    resolution: {integrity: sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@parcel/watcher-freebsd-x64@2.5.6':
-    resolution: {integrity: sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@parcel/watcher-linux-arm-glibc@2.5.6':
-    resolution: {integrity: sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-arm-musl@2.5.6':
-    resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-linux-arm64-glibc@2.5.6':
-    resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-arm64-musl@2.5.6':
-    resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-linux-x64-glibc@2.5.6':
-    resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-x64-musl@2.5.6':
-    resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-win32-arm64@2.5.6':
-    resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@parcel/watcher-win32-ia32@2.5.6':
-    resolution: {integrity: sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@parcel/watcher-win32-x64@2.5.6':
-    resolution: {integrity: sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [win32]
-
-  '@parcel/watcher@2.5.6':
-    resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
-    engines: {node: '>= 10.0.0'}
-
-  '@polka/url@1.0.0-next.29':
-    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
-
-  '@puppeteer/browsers@3.0.5':
-    resolution: {integrity: sha512-xYXNuEQmHNIPWWcbL/skf2KF7seyp7c1xmKFRk3wmdFx7VwBsKVrtOLKs8ecaezsKPsWeF1YsgwIiElAscaryA==}
-    engines: {node: '>=22.12.0'}
-    hasBin: true
-    peerDependencies:
-      proxy-agent: '>=8.0.1'
-    peerDependenciesMeta:
-      proxy-agent:
-        optional: true
-
-  '@rolldown/binding-android-arm64@1.1.3':
-    resolution: {integrity: sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==}
+  '@oxc-parser/binding-android-arm64@0.142.0':
+    resolution: {integrity: sha512-WZkvGRLNQTz8lR9zP5nLjUdlroRCopBu3g9zF1p/laE6DzT1UbQo8Rdz5MWhaJUPYg/6gp+jo7HUgsyKaN1FtQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
-    resolution: {integrity: sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==}
+  '@oxc-parser/binding-darwin-arm64@0.142.0':
+    resolution: {integrity: sha512-l4khS8LQOOVYsGRVARo1gSaCT/aBSceUVXgtovWc2+drnxVuDr082WA3OCHVdVzIz5JIrP/y9CWsSKxBDNmYGg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.1.3':
-    resolution: {integrity: sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==}
+  '@oxc-parser/binding-darwin-x64@0.142.0':
+    resolution: {integrity: sha512-QBsNF3nqlXmcH2B1YOPqQYmCJoy4HuIjUxGbBO/k5JAJUl68ghU2psRY2zPk+RyBaWqKP/qfL4oaFgEMCdwskA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
-    resolution: {integrity: sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==}
+  '@oxc-parser/binding-freebsd-x64@0.142.0':
+    resolution: {integrity: sha512-b7Q7m4Cqc6XqNhri3R+QhU+GVy646Pn+bkdhrDdWym/Fdi0ZUa+d73H9dm5H91JtbtAQ/z1d8XKMW3oOV8a4tQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
-    resolution: {integrity: sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==}
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.142.0':
+    resolution: {integrity: sha512-3riVS5IhdH3uCZj1Y9ftDQlR0dvLsIlw/edrRqk8JhgNd5K0XSs+UBtgh50N13CAlW9/TXj6sVGXaKNBocd0Yg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
-    resolution: {integrity: sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==}
+  '@oxc-parser/binding-linux-arm-musleabihf@0.142.0':
+    resolution: {integrity: sha512-NmXUOpgpTSkhl795TiXmWppTwmSJ92RC1qvD6e4XOF+slgmo3e6Ah+kEu+6AN8s7NAOEwqGmir58MgSQSWmBSA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.142.0':
+    resolution: {integrity: sha512-gc0EXsKtXgerujmU2Bql3u1L1HsSQ2774R83idq/FoNMPVV/RY/1ErFsvnit7KoiP/sLvzQixeUo4Ut0ic0wmw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
-    resolution: {integrity: sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==}
+  '@oxc-parser/binding-linux-arm64-musl@0.142.0':
+    resolution: {integrity: sha512-F2XvmWSE0uWpie+jHKKIFgdVOe9ypGhkEZxKx5DuW215K6cbAC274yYaPkcM7EqY4Df3Weyhpcz3lsURyH2LVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
-    resolution: {integrity: sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==}
+  '@oxc-parser/binding-linux-ppc64-gnu@0.142.0':
+    resolution: {integrity: sha512-wLMbT21U/QxknQsk+VvNF0b9D2/aGWhcaQQQ+VYlE8FwD5+GoWZIPPXNzyHmkYyhm0KB3itL+TBavjMatqNnYA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
-    resolution: {integrity: sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==}
+  '@oxc-parser/binding-linux-riscv64-gnu@0.142.0':
+    resolution: {integrity: sha512-+G8F/4ckwT7FCJV4H2bt09xEzJbjNCfuL4Sp1AYNaFtFMVtgIGMuJlteT82U+K0UIZ/DzAR/LDlMFnEuajG7Kw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.142.0':
+    resolution: {integrity: sha512-hTsHtTLxMAfCo+rpF5K3qZJKW2NpPN/CHd4mYB3y7XlSdspHkd2gehDIofP64AacA9nWQw2tY3O7wR6UY8IVOA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.142.0':
+    resolution: {integrity: sha512-6y7qYY3TCUDYjqswImdTGl92y+KA/80twALegQPN27kfY+bG7Ib1+L3jbmrCZQx6wrVnai9IPsEZp07I0hx7JQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
-    resolution: {integrity: sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==}
+  '@oxc-parser/binding-linux-x64-gnu@0.142.0':
+    resolution: {integrity: sha512-i69kAWU+2LgoH5bR+zWiiu+UzAw7Oxkwv7COeJTeY19pn4e70nKQcr9Pm6cL2Z0Z54d+gl9qADlK/0yyuCPiBA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
-    resolution: {integrity: sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==}
+  '@oxc-parser/binding-linux-x64-musl@0.142.0':
+    resolution: {integrity: sha512-4SQs678MmjYVrmhAgCWD4o0vpaFszXw9xLX5p2Z9MMFcltxiLkA88wQjh80YHjPrXtpyZ2CWI5m+1yNKM0m2Pw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
-    resolution: {integrity: sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==}
+  '@oxc-parser/binding-openharmony-arm64@0.142.0':
+    resolution: {integrity: sha512-YHpx9N7Ln3a++Tc8rv+H7mrK1zyJQOAwCFg8LZ3lTs1T5afGWeZrLPhPT9HLnIwSjCyJqPWVMIrMxbjcmBr2oQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
-    resolution: {integrity: sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==}
+  '@oxc-parser/binding-wasm32-wasi@0.142.0':
+    resolution: {integrity: sha512-3pLDyY3+oogW73RM5uehNgAiR/Xfb7fvO2Q1Z1gIqZ2+50XDVQmBVlRkHXZTU4gKnQHpwETNsYQVsJ3joVB2iA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [wasm32]
 
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
-    resolution: {integrity: sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==}
+  '@oxc-parser/binding-win32-arm64-msvc@0.142.0':
+    resolution: {integrity: sha512-Had/VeVY28Oyb0K+Q4FV8KCzoBycIh93oDK6pCbya9lkzdq+ikMHMgBubsdqqlybjJmQRawCQRrnBRHyQwYvcQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
-    resolution: {integrity: sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==}
+  '@oxc-parser/binding-win32-ia32-msvc@0.142.0':
+    resolution: {integrity: sha512-GGi3+YphVHavvgs6gum2UXoNCqzHAmPt/nXkn8ZQZstV2Q1qZD1Mn8fz/nWrDkefHQtrG/+1/XrbMxsBTo6Svw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxc-parser/binding-win32-x64-msvc@0.142.0':
+    resolution: {integrity: sha512-Ny/Wv4Us1LGC/ljwNTp+Hx3r/pH15EFfeDF0p+n898gt+TtRd6C9SccHcuUhDiNTb8s5tt7jdeAMDRQZ4Vq6hg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@oxc-project/types@0.139.0':
+    resolution: {integrity: sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==}
+
+  '@oxc-project/types@0.140.0':
+    resolution: {integrity: sha512-h5LUOzGArYemnW1NMz/DuuQhBi96J6JL2Bk8zE4kvqxB5Sg3jxmCiH4uyOWHDkiKSt5vWlG4FIwCR/DbstcNRQ==}
+
+  '@oxc-project/types@0.142.0':
+    resolution: {integrity: sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==}
+
+  '@parcel/watcher-android-arm64@2.6.0':
+    resolution: {integrity: sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.6.0':
+    resolution: {integrity: sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.6.0':
+    resolution: {integrity: sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.6.0':
+    resolution: {integrity: sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
+    resolution: {integrity: sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-arm-musl@2.6.0':
+    resolution: {integrity: sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-linux-arm64-glibc@2.6.0':
+    resolution: {integrity: sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-arm64-musl@2.6.0':
+    resolution: {integrity: sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-linux-x64-glibc@2.6.0':
+    resolution: {integrity: sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@parcel/watcher-linux-x64-musl@2.6.0':
+    resolution: {integrity: sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@parcel/watcher-win32-arm64@2.6.0':
+    resolution: {integrity: sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.6.0':
+    resolution: {integrity: sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.6.0':
+    resolution: {integrity: sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==}
+    engines: {node: '>= 10.0.0'}
+
+  '@penpot/plugin-styles@1.4.2':
+    resolution: {integrity: sha512-/Rn6xy80W+mxAi6j5/SOiNY8P0qHMB1WW+j+nyZajecFSnVGPzSWOiMcIDH+Jtsz7Xpmd5AICpgVM0xjechQig==}
+
+  '@penpot/plugin-types@1.4.2':
+    resolution: {integrity: sha512-O8wU6RSYE8bIVU7g8cSTYi32ppxs3R13dq7X3Nn9tmDaJjBOKOBpVLuoRPIp3fJC65fv8/7om0sdrtFoL5v19g==}
+
+  '@polka/url@1.0.0-next.29':
+    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
+
+  '@puppeteer/browsers@3.0.6':
+    resolution: {integrity: sha512-B/gKoqlFkzhvzsI6jo9K1cZz9o5ypviVv/xu8CwA4grZzyVwN+XfkT+tu8T1zrauuEXv6VhS2oGX+6NL95WcKA==}
+    engines: {node: '>=22.12.0'}
+    hasBin: true
+    peerDependencies:
+      proxy-agent: '>=8.0.1'
+      yauzl: ^2.10.0 || ^3.4.0
+    peerDependenciesMeta:
+      proxy-agent:
+        optional: true
+      yauzl:
+        optional: true
+
+  '@rolldown/binding-android-arm64@1.1.5':
+    resolution: {integrity: sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@rolldown/binding-android-arm64@1.2.0':
+    resolution: {integrity: sha512-9yB1l95IrJuNGDFdOYe79vdApdz6WWBCObE+rQ2LUliYUlcyFwSYIb2xb5/Ifw7dAtMy2ZqNyd8QTSOc7duAKw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@rolldown/binding-android-arm64@1.2.2':
+    resolution: {integrity: sha512-l7x215OGvo1s52JWmR8U/DAVzEDWBCIbTm28aeJV/WDTSHgcKXaZTuBT0hJMs5NggilfJTW3clZVvd24yfKJxA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@rolldown/binding-darwin-arm64@1.1.5':
+    resolution: {integrity: sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-arm64@1.2.0':
+    resolution: {integrity: sha512-pexNaW9ACLUOaBITOpU6qVu4VrsOFIjTv6bzgu0YUATo4eUJx0V605PxwZfndpPOn0ilqGqvGQ0M8UW0IE24jg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-arm64@1.2.2':
+    resolution: {integrity: sha512-9u9Xv6c1AJZT0FfwH5vrMG5Jjcwhc1MlyrPu0XfTqkzsmqfks2M6W/o5XwAJgVVN/jHpqqngC1WevHKKTIUtIA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-x64@1.1.5':
+    resolution: {integrity: sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-x64@1.2.0':
+    resolution: {integrity: sha512-NqKYaq0355ZmNMG4QGpxtEDxsc7tGDhjhCm4PpE0cwnBW+5Il95LJyq414niEiaKLVjnVHBEjSo1wngKxJNiFw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-x64@1.2.2':
+    resolution: {integrity: sha512-9W1mbGZAfW3oqd85bhBkmpyHCCzL1TeG/zFFP3vg7b0rlly8cxOcre5nXwz+LHazCwac2MNWgPdPCHndABjpWQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rolldown/binding-freebsd-x64@1.1.5':
+    resolution: {integrity: sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rolldown/binding-freebsd-x64@1.2.0':
+    resolution: {integrity: sha512-3vPoHzh6eBTz9IbB0/qZdSr0Qeks2echn+I4cHu2joV74VriPDdldswksEDzrl1mBB+oPRi+67+3Ib59paxIPQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rolldown/binding-freebsd-x64@1.2.2':
+    resolution: {integrity: sha512-0p1lhiCSCyaerFwtrdZQUx7NqGk6LQnaRKWX7tFQqwQgvX0rjM15cIkm3pax1UpEakK14C4mOxx/jSqCBdBRqQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.1.5':
+    resolution: {integrity: sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.0':
+    resolution: {integrity: sha512-E6NNefZ1bUVmKJq2tJkf45J4Zyczj7qm9rUT7NY+Xo2474Y13qWAwc2tvBt0BAVbmtXR1llkxXg0Ou1jbDf2SQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.2':
+    resolution: {integrity: sha512-e+cOJXrJ2L3zx6YzqPg+f6Wbk3V1cKB8bOhbaYdVYN3DdquzNdRAmrbETz1qnt5yp/c7JNlNjmITiA2cVneQ7w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm64-gnu@1.1.5':
+    resolution: {integrity: sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-arm64-gnu@1.2.0':
+    resolution: {integrity: sha512-D+TgkdgM1vu+7/Fpf8+v0ARW+RXEP9Ccazgm8zQ4JFFd9Q7SrYQ2TakU5S5ihazQDgpKyAgZDOcIFsvoHmTZ8w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-arm64-gnu@1.2.2':
+    resolution: {integrity: sha512-JsSMsj6sNat/MuhG5fnBD7QgbtpHKVe30x5/bAVirDHdhoQRXJkF6xc0Jqk8O4fiCUQAzMOoH9wZi3m60c8wtg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-arm64-musl@1.1.5':
+    resolution: {integrity: sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-arm64-musl@1.2.0':
+    resolution: {integrity: sha512-wUqdwJBbAv0APN87GecstdMUtLjjNTs0hBALpxETD73mccFxdmt/XeizXDtN5RAlBwNKmI+Tg+blect2G+8IeQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-arm64-musl@1.2.2':
+    resolution: {integrity: sha512-B5G/zJdHaoJn9vD50eGHWkiWfmq8Uhi3IiLPJTzmZTrAalk1bztUikSXo0qga18ibE0IXboyeMUnhPjhAJ45wQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-ppc64-gnu@1.1.5':
+    resolution: {integrity: sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-ppc64-gnu@1.2.0':
+    resolution: {integrity: sha512-9DtF35qR9/NrfhM4oxLplCzVVjE+KKm8Pjemi0i/sdhAWkUasjmSo8WTTubNJClhSHCfyk2yeyoXDQEDPtDAAw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-ppc64-gnu@1.2.2':
+    resolution: {integrity: sha512-6mC/awzKka8W6EoekjegpfGkjz8jXWDX63pqu/HYVpyKtZfu65Jsh4QAH3Kej3CAv/c1oGX7psTmFEbr0mDxLA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-s390x-gnu@1.1.5':
+    resolution: {integrity: sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-s390x-gnu@1.2.0':
+    resolution: {integrity: sha512-RzuHrBh8X8Hntd2N4VR02QGEciq/9JhcZoTpR/Cee6otRrlILGCf3cg2ygHuih+ZebUnWmMrDX6ITI85btO6rQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-s390x-gnu@1.2.2':
+    resolution: {integrity: sha512-412MX9fJLdA1IK28EZnc8jYv2HRTleOZgfLQumJ5zy7OeJLZlg/CETwFaXjNmGVxG51cFHpKLqb5LKvBC+HsHA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-gnu@1.1.5':
+    resolution: {integrity: sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-gnu@1.2.0':
+    resolution: {integrity: sha512-MK7L0018jjh1jR3mh21G2j1zAVcpscJBlPo2z19pRjv2XOYGRhaV4LyiD8HO6nCDdZln9IFgCMIV5yt4E3klGQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-gnu@1.2.2':
+    resolution: {integrity: sha512-Q/+HI/ToJafZ1iCqGgVQXUEkIjufHCTF0gBQ2a5o3cg7GJ2h0qyq3nvvSmU+bGda2/7ygXpTY4TM6gO9OhQ0ZA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-musl@1.1.5':
+    resolution: {integrity: sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-x64-musl@1.2.0':
+    resolution: {integrity: sha512-gyrxLQ9NfGb/9LoVnC4kb9miUghw1mghnkfYvNHSnVIXriabnfgGPUP4RLcJm87q3KgYz4FYUG8IDiWUT+CpSw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-x64-musl@1.2.2':
+    resolution: {integrity: sha512-ZKp/w41n6wCvxzxQHtQSbuphfX3Y4cCvbjkKHusrLx4lh+JWLTU7StSltO/DKARISzbj368d+qUaCjI8K2wzXw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-openharmony-arm64@1.1.5':
+    resolution: {integrity: sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rolldown/binding-openharmony-arm64@1.2.0':
+    resolution: {integrity: sha512-/6VFMQGRmrhP77KXDC+StIxGzcNp5JOIyYtw0CQ8gPlzhpiIRucYfoM5FaFamHd5BJYIdH86yfP46l1p3WdrFA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rolldown/binding-openharmony-arm64@1.2.2':
+    resolution: {integrity: sha512-pxE6xD4KS3eAROkKK5yrhB9/3+vhlhVGMvlQLbdpzrBGDbKrnzx3RLwPaHvasLo6jgaiBLn7e04Df9C4tYhjmA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rolldown/binding-wasm32-wasi@1.1.5':
+    resolution: {integrity: sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [wasm32]
+
+  '@rolldown/binding-wasm32-wasi@1.2.0':
+    resolution: {integrity: sha512-rwdbUL465kisF24WEJLvP3JrEG6E5GRuIHt5wpMwHGERtHe4Wm2CIvtf5gTBgr2tGOHKh5NdKEAFS2VkOPE91g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [wasm32]
+
+  '@rolldown/binding-win32-arm64-msvc@1.1.5':
+    resolution: {integrity: sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rolldown/binding-win32-arm64-msvc@1.2.0':
+    resolution: {integrity: sha512-+5suHwRiKGmhwyUaNT8a5QbrBvLFh2DbO910TEmGRH1aSxwrCezodvGQnulv4uiWEIv1Kq4ypRsJ5+O+ry1DiA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rolldown/binding-win32-arm64-msvc@1.2.2':
+    resolution: {integrity: sha512-4MqEue5re+xIZzAWsB8sj0P1kqZySWqIuN4t6QaIO/YA6SFwySOLruvWQFzfmqk8LBK2P30KCSJwf6mJCZZ5/A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rolldown/binding-win32-x64-msvc@1.1.5':
+    resolution: {integrity: sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@rolldown/binding-win32-x64-msvc@1.2.0':
+    resolution: {integrity: sha512-WfFv6/qGufotqBSBzBYwgpCkJBk8Nj7697LL9vTz/XWc67e0r3oewu8iMRwQj3AUL45GVD7wVsPjCsAAtW66Wg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@rolldown/binding-win32-x64-msvc@1.2.2':
+    resolution: {integrity: sha512-NweNxxD0Nf9t8v7kodun45Ijp3EIwYY+uydPP6qBEYvfBqhIjN6dZMzlQja3tqX/aLs3F3Uz+AxDpKgRhpOZQg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -1687,277 +1835,139 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.60.2':
-    resolution: {integrity: sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw==}
-    cpu: [arm]
-    os: [android]
-
   '@rollup/rollup-android-arm-eabi@4.60.4':
     resolution: {integrity: sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.60.2':
-    resolution: {integrity: sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg==}
-    cpu: [arm64]
-    os: [android]
-
   '@rollup/rollup-android-arm64@4.60.4':
     resolution: {integrity: sha512-GxxTKApUpzRhof7poWvCJHRF51C67u1R7D6DiluBE8wKU1u5GWE8t+v81JvJYtbawoBFX1hLv5Ei4eVjkWokaw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.60.2':
-    resolution: {integrity: sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA==}
-    cpu: [arm64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-arm64@4.60.4':
     resolution: {integrity: sha512-tua0TaJxMOB1R0V0RS1jFZ/RpURFDJIOR2A6jWwQeawuFyS4gBW+rntLRaQd0EQ4bd6Vp44Z2rXW+YYDBsj6IA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.60.2':
-    resolution: {integrity: sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g==}
-    cpu: [x64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-x64@4.60.4':
     resolution: {integrity: sha512-CSKq7MsP+5PFIcydhAiR1K0UhEI1A2jWXVKHPCBZ151yOutENwvnPocgVHkivu2kviURtCEB6zUQw0vs8RrhMg==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.60.2':
-    resolution: {integrity: sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw==}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@rollup/rollup-freebsd-arm64@4.60.4':
     resolution: {integrity: sha512-+O8OkVdyvXMtJEciu2wS/pzm1IxntEEQx3z5TAVy4l32G0etZn+RsA48ARRrFm6Ri8fvqPQfgrvNxSjKAbnd3g==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.60.2':
-    resolution: {integrity: sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ==}
-    cpu: [x64]
-    os: [freebsd]
-
   '@rollup/rollup-freebsd-x64@4.60.4':
     resolution: {integrity: sha512-Iw3oMskH3AfNuhU0MSN7vNbdi4me/NiYo2azqPz/Le16zHSa+3RRmliCMWWQmh4lcndccU40xcJuTYJZxNo/lw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.2':
-    resolution: {integrity: sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg==}
-    cpu: [arm]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
     resolution: {integrity: sha512-EIPRXTVQpHyF8WOo219AD2yEltPehLTcTMz2fn6JsatLYSzQf00hj3rulF+yauOlF9/FtM2WpkT/hJh/KJFGhA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.2':
-    resolution: {integrity: sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw==}
-    cpu: [arm]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-arm-musleabihf@4.60.4':
     resolution: {integrity: sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.2':
-    resolution: {integrity: sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-arm64-gnu@4.60.4':
     resolution: {integrity: sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-musl@4.60.2':
-    resolution: {integrity: sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-arm64-musl@4.60.4':
     resolution: {integrity: sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.2':
-    resolution: {integrity: sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A==}
-    cpu: [loong64]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-loong64-gnu@4.60.4':
     resolution: {integrity: sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-loong64-musl@4.60.2':
-    resolution: {integrity: sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q==}
-    cpu: [loong64]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-loong64-musl@4.60.4':
     resolution: {integrity: sha512-nbJnQ8a3z1mtmrwImCYhc6BGpThAyYVRQxw9uKSKG4wR6aAYno9sVjJ0zaZcW9BPJX1GbrDPf+SvdWjgTuDmnw==}
     cpu: [loong64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.2':
-    resolution: {integrity: sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw==}
-    cpu: [ppc64]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-ppc64-gnu@4.60.4':
     resolution: {integrity: sha512-2EU6acNrQLd8tYvo/LXW535wupT3m6fo7HKo6lr7ktQoItxTyOL1ZCR/GfGCuXl2vR+zmfI6eRXkSemafv+iVg==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.2':
-    resolution: {integrity: sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ==}
-    cpu: [ppc64]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-ppc64-musl@4.60.4':
     resolution: {integrity: sha512-WeBtoMuaMxiiIrO2IYP3xs6GMWkJP2C0EoT8beTLkUPmzV1i/UcOSVw1d5r9KBODtHKilG5yFxsGRnBbK3wJ4A==}
     cpu: [ppc64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.2':
-    resolution: {integrity: sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A==}
-    cpu: [riscv64]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-riscv64-gnu@4.60.4':
     resolution: {integrity: sha512-FJHFfqpKUI3A10WrWKiFbBZ7yVbGT4q4B5o1qKFFojqpaYoh9LrQgqWCmmcxQzVSXYtyB5bzkXrYzlHTs21MYA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.2':
-    resolution: {integrity: sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ==}
-    cpu: [riscv64]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-riscv64-musl@4.60.4':
     resolution: {integrity: sha512-mcEl6CUT5IAUmQf1m9FYSmVqCJlpQ8r8eyftFUHG8i9OhY7BkBXSUdnLH5DOf0wCOjcP9v/QO93zpmF1SptCCw==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.2':
-    resolution: {integrity: sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA==}
-    cpu: [s390x]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-s390x-gnu@4.60.4':
     resolution: {integrity: sha512-ynt3JxVd2w2buzoKDWIyiV1pJW93xlQic1THVLXilz429oijRpSHivZAgp65KBu+cMcgf1eVVjdnTLvPxgCuoQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.60.2':
-    resolution: {integrity: sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ==}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
   '@rollup/rollup-linux-x64-gnu@4.60.4':
     resolution: {integrity: sha512-Boiz5+MsaROEWDf+GGEwF8VMHGhlUoQMtIPjOgA5fv4osupqTVnJteQNKJwUcnUog2G55jYXH7KZFFiJe0TEzQ==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-musl@4.60.2':
-    resolution: {integrity: sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw==}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
   '@rollup/rollup-linux-x64-musl@4.60.4':
     resolution: {integrity: sha512-+qfSY27qIrFfI/Hom04KYFw3GKZSGU4lXus51wsb5EuySfFlWRwjkKWoE9emgRw/ukoT4Udsj4W/+xxG8VbPKg==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-openbsd-x64@4.60.2':
-    resolution: {integrity: sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg==}
-    cpu: [x64]
-    os: [openbsd]
-
   '@rollup/rollup-openbsd-x64@4.60.4':
     resolution: {integrity: sha512-VpTfOPHgVXEBeeR8hZ2O0F3aSso+JDWqTWmTmzcQKted54IAdUVbxE+j/MVxUsKa8L20HJhv3vUezVPoquqWjA==}
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.60.2':
-    resolution: {integrity: sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q==}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@rollup/rollup-openharmony-arm64@4.60.4':
     resolution: {integrity: sha512-IPOsh5aRYuLv/nkU51X10Bf75Bsf6+gZdx1X+QP5QM6lIJFHHqbHLG0uJn/hWthzo13UAc2umiUorqZy3axoZg==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.2':
-    resolution: {integrity: sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ==}
-    cpu: [arm64]
-    os: [win32]
-
   '@rollup/rollup-win32-arm64-msvc@4.60.4':
     resolution: {integrity: sha512-4QzE9E81OohJ/HKzHhsqU+zcYYojVOXlFMs1DdyMT6qXl/niOH7AVElmmEdUNHHS/oRkc++d5k6Vy85zFs0DEw==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.2':
-    resolution: {integrity: sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg==}
-    cpu: [ia32]
-    os: [win32]
-
   '@rollup/rollup-win32-ia32-msvc@4.60.4':
     resolution: {integrity: sha512-zTPgT1YuHHcd+Tmx7h8aml0FWFVelV5N54oHow9SLj+GfoDy/huQ+UV396N/C7KpMDMiPspRktzM1/0r1usYEA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.60.2':
-    resolution: {integrity: sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA==}
-    cpu: [x64]
-    os: [win32]
-
   '@rollup/rollup-win32-x64-gnu@4.60.4':
     resolution: {integrity: sha512-DRS4G7mi9lJxqEDezIkKCaUIKCrLUUDCUaCsTPCi/rtqaC6D/jjwslMQyiDU50Ka0JKpeXeRBFBAXwArY52vBw==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.60.2':
-    resolution: {integrity: sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA==}
-    cpu: [x64]
-    os: [win32]
-
   '@rollup/rollup-win32-x64-msvc@4.60.4':
     resolution: {integrity: sha512-QVTUovf40zgTqlFVrKA1uXMVvU2QWEFWfAH8Wdc48IxLvrJMQVMBRjuQyUpzZCDkakImib9eVazbWlC6ksWtJw==}
     cpu: [x64]
@@ -2064,10 +2074,16 @@ packages:
   '@rushstack/ts-command-line@5.1.7':
     resolution: {integrity: sha512-Ugwl6flarZcL2nqH5IXFYk3UR3mBVDsVFlCQW/Oaqidvdb/5Ota6b/Z3JXWIdqV3rOR2/JrYoAHanWF5rgenXA==}
 
-  '@schematics/angular@22.0.4':
-    resolution: {integrity: sha512-P3V3tkqIR+n0GJSv0ibf34/zMtKbFp6kaTjBe5cm/RyXuHbmdaPYjk8PNphkGMypDtWCof1RtNnW/hl832Wnew==}
+  '@schematics/angular@22.1.2':
+    resolution: {integrity: sha512-52udja/QGSNH5geSnL4JWFOEfx8M7tqf7LNXz8byjki4VshVOkKHTawQcL4YbJfo3MfwwXm4AsoadMOk8EST2w==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
+  '@seahax/deep-copy@0.1.0':
+    resolution: {integrity: sha512-Ux88qw9ypPbqszDGwj0JvP8FP017MV3ck7jnkit+0i3mecTkqhYiCUqy3exbxhGFBu07zrUS6yPRUWVct1eSMQ==}
+
+  '@seahax/semaphore@0.5.1':
+    resolution: {integrity: sha512-q6SXYYbE6X+LDcq2h2yCgE+pCWJumNP3XCZkztdG4S4tiig9akMZGp8TsfU/EIRcHWPdnQ3BA8/NAvdDYdF/NQ==}
+
   '@shikijs/engine-oniguruma@3.23.0':
     resolution: {integrity: sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==}
 
@@ -2083,44 +2099,12 @@ packages:
   '@shikijs/vscode-textmate@10.0.2':
     resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
 
-  '@sigstore/bundle@4.0.0':
-    resolution: {integrity: sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@sigstore/core@3.2.1':
-    resolution: {integrity: sha512-qRsxPnCrbC/puegGxKuynfnxgLiHqWStrSjxkoB4YKqq3Z3s4cyZyj42ZdWFAEblNP65C+rBH8EuREHIXoi83g==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@sigstore/protobuf-specs@0.5.1':
-    resolution: {integrity: sha512-/ScWUhhoFasJsSRGTVBwId1loQjjnjAfE4djL6ZhrXRpNCmPTnUKF5Jokd58ILseOMjzET3UrMOtJPS9sYeI0g==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
-  '@sigstore/sign@4.1.1':
-    resolution: {integrity: sha512-Hf4xglukg0XXQ2RiD5vSoLjdPe8OBUPA8XeVjUObheuDcWdYWrnH/BNmxZCzkAy68MzmNCxXLeurJvs6hcP2OQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@sigstore/tuf@4.0.2':
-    resolution: {integrity: sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  '@sigstore/verify@3.1.1':
-    resolution: {integrity: sha512-qv7+G3J2cc6wwFj3yKvXOamzqhMwSk1ogPGmhpS8iXllcPrJaIIBA+4HbttlHVu1pqWTdmaCH/WE7UOC51kdoA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
   '@swc/helpers@0.5.18':
     resolution: {integrity: sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==}
 
-  '@tufjs/canonical-json@2.0.0':
-    resolution: {integrity: sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-
-  '@tufjs/models@4.1.0':
-    resolution: {integrity: sha512-Y8cK9aggNRsqJVaKUlEYs4s7CvQ1b1ta2DVPyAimb0I2qhzjNk+A+mxvll/klL0RlfuIUei8BF7YWiua4kQqww==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   '@tybys/wasm-util@0.10.3':
     resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
 
@@ -2151,17 +2135,23 @@ packages:
   '@types/feather-icons@4.29.4':
     resolution: {integrity: sha512-cvwI455PWx/gJ33XDTIZOdauRy+XCxZggkOT/tAQYZLdySPFATD4RnDC9mxOnCIEaK9kwPm3zZigkAsMkhXb5w==}
 
+  '@types/gensync@1.0.5':
+    resolution: {integrity: sha512-MbsRCT7mTikHwKZ0X+LVUTLRrZZRLipTuXEO9qOYO+zmjMVk81axyClMROf6uoPD9MRVu46bx8zoR0Ad9q3NAg==}
+
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
+  '@types/jsesc@2.5.1':
+    resolution: {integrity: sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
   '@types/json5@0.0.29':
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
-  '@types/node@26.0.1':
-    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
@@ -2178,63 +2168,63 @@ packages:
   '@types/yargs@17.0.35':
     resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==}
 
-  '@typescript-eslint/eslint-plugin@8.62.1':
-    resolution: {integrity: sha512-4EQM77WgVNxj7OkL/5b/D/xZsw00G577+UriYTC7JF5opcF3T2AuoeY7ueLaZgSVjSgCS6yOAJB5bRGLPSJUzA==}
+  '@typescript-eslint/eslint-plugin@8.65.0':
+    resolution: {integrity: sha512-IEgob78X12rHpUmtcwFsXhZdVGJtwTVP8FiCLZkR6GlYVrl2PcuB+KhCE5BlVC/eQpQnu8WXRtkHZuPar+gCRA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.62.1
+      '@typescript-eslint/parser': ^8.65.0
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/parser@8.62.1':
-    resolution: {integrity: sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==}
+  '@typescript-eslint/parser@8.65.0':
+    resolution: {integrity: sha512-CZ4nMxWwgu1HEEFNkeaCptra9QCtkmKdgf3sWh1rl1trIhmxLilgTV4cwcbQ4wemnT4sWQN8CaKOmdYx+g2gMA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/project-service@8.62.1':
-    resolution: {integrity: sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==}
+  '@typescript-eslint/project-service@8.65.0':
+    resolution: {integrity: sha512-SxnPhbTsGahizDgbu7oqFH/xVtzIqMd/s+WtnSxNxJZJpLbdT5IPdzg8EZxO3+PoKahXmwJLeNQOpKJb3/bi7Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/scope-manager@8.62.1':
-    resolution: {integrity: sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==}
+  '@typescript-eslint/scope-manager@8.65.0':
+    resolution: {integrity: sha512-Esbl8OSYiVxBokYgWPf7VVWg/BE798wXhimnn9ML9Pt5qoDf8bfQlgjlKXR/k98+AcNzlLKYrpCcrcuZ9DZLgg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.62.1':
-    resolution: {integrity: sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==}
+  '@typescript-eslint/tsconfig-utils@8.65.0':
+    resolution: {integrity: sha512-j6GzGqCiRdA7Qhur2VVmKZAkBLfnHFQfx4TaJGL9RMveZqCo48jSHHO0DTgizEnGhtWnqmbtCUSrqSkdiY/0Hg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/type-utils@8.62.1':
-    resolution: {integrity: sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==}
+  '@typescript-eslint/type-utils@8.65.0':
+    resolution: {integrity: sha512-YjaZ7PRI5qY7ax2L3PbvX0rRyGtipAReCWs0mhhDBHjH/vl0g0BonaGXrKdKpMbIIsMIwDgbk/xzkBTyAltS5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/types@8.62.1':
-    resolution: {integrity: sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==}
+  '@typescript-eslint/types@8.65.0':
+    resolution: {integrity: sha512-JSSwWNy+H0E/01jJEM+hrX6N0OFDzFzeIhHFSAS01tlVaevpG8cFyYRPhS5yjGOvBUx3sqQHVMjCL1CAZZMxBg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.62.1':
-    resolution: {integrity: sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==}
+  '@typescript-eslint/typescript-estree@8.65.0':
+    resolution: {integrity: sha512-JboAE2swaYt4tb1fHhHTABE2K+OLy09XfcTbhnk4Pw96f9dd2e9iYsJ28gBggHlo5z5x1rkyWvcPoTuNTd4oGg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/utils@8.62.1':
-    resolution: {integrity: sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==}
+  '@typescript-eslint/utils@8.65.0':
+    resolution: {integrity: sha512-gXiwIHsYreboxeJucHKPvgwl7dXt50mF8s1/c00cP/WoVTyWKFdtfhRWwZiXYFU5H2O8vVoSLNrexFZjYS/SGA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/visitor-keys@8.62.1':
-    resolution: {integrity: sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==}
+  '@typescript-eslint/visitor-keys@8.65.0':
+    resolution: {integrity: sha512-8C71BQkGjiMmXtop7pHVJu1l2NNShFdkCyD6a2ezzs5vU/L3LRtb69EtcteFwz0mYMPzIgOw0n6OV4VBUWZd7A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vitejs/plugin-basic-ssl@2.3.0':
@@ -2243,20 +2233,20 @@ packages:
     peerDependencies:
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  '@vitest/coverage-v8@4.1.9':
-    resolution: {integrity: sha512-G9/lgqibheLVBDRuya45EbsEXTYcWoSG+TLg7i2axuzx0Eq62eXn+aWXyaVdV5vKvFSWd6ywcX8hA7la9Pvu8g==}
+  '@vitest/coverage-v8@4.1.10':
+    resolution: {integrity: sha512-IM49HmthevbgAO4anp1hwtoT9wYe59w0LR00gr+eagHE+ZJ5lK4sLPeO0ubgoJcwLk6dehU3R24N+FbEEKDc8g==}
     peerDependencies:
-      '@vitest/browser': 4.1.9
-      vitest: 4.1.9
+      '@vitest/browser': 4.1.10
+      vitest: 4.1.10
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
 
-  '@vitest/expect@4.1.9':
-    resolution: {integrity: sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==}
+  '@vitest/expect@4.1.10':
+    resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==}
 
-  '@vitest/mocker@4.1.9':
-    resolution: {integrity: sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==}
+  '@vitest/mocker@4.1.10':
+    resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2266,25 +2256,25 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.9':
-    resolution: {integrity: sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==}
+  '@vitest/pretty-format@4.1.10':
+    resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==}
 
-  '@vitest/runner@4.1.9':
-    resolution: {integrity: sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==}
+  '@vitest/runner@4.1.10':
+    resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==}
 
-  '@vitest/snapshot@4.1.9':
-    resolution: {integrity: sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==}
+  '@vitest/snapshot@4.1.10':
+    resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==}
 
-  '@vitest/spy@4.1.9':
-    resolution: {integrity: sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==}
+  '@vitest/spy@4.1.10':
+    resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==}
 
-  '@vitest/ui@4.1.9':
-    resolution: {integrity: sha512-U/cRvtqfEPj27FI1n9cyUvi4vXXdcLhjJiI+InYKdk8hP4VrS6RXOjGL7rfFaeBc37iRKANsR6eEzIoC7lmgBQ==}
+  '@vitest/ui@4.1.10':
+    resolution: {integrity: sha512-EOUqfXHTXtpSHsyLHH40ts3Ue+hRhSGwzwzMlK0dTEOLSDYyOXLyr5JDGmHQWhN2DYI30gw6dVx3cdgM9FZl+Q==}
     peerDependencies:
-      vitest: 4.1.9
+      vitest: 4.1.10
 
-  '@vitest/utils@4.1.9':
-    resolution: {integrity: sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==}
+  '@vitest/utils@4.1.10':
+    resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==}
 
   '@volar/language-core@2.4.28':
     resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
@@ -2294,6 +2284,11 @@ packages:
 
   '@volar/typescript@2.4.28':
     resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
   '@webassemblyjs/ast@1.14.1':
     resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
@@ -2346,13 +2341,6 @@ packages:
   '@xtuc/long@4.2.2':
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
 
-  '@yarnpkg/lockfile@1.1.0':
-    resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==}
-
-  abbrev@4.0.0:
-    resolution: {integrity: sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   accepts@2.0.0:
     resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
     engines: {node: '>= 0.6'}
@@ -2378,14 +2366,15 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.18.0:
+    resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
 
-  agent-base@7.1.4:
-    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
-    engines: {node: '>= 14'}
-
   agent-base@9.0.0:
     resolution: {integrity: sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==}
     engines: {node: '>= 20'}
@@ -2428,10 +2417,6 @@ packages:
   ajv@8.20.0:
     resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
 
-  algoliasearch@5.52.0:
-    resolution: {integrity: sha512-0ZzY9mjqV7gop/AH8pIBiAS8giXP7WcSiUfoFYIzYAK9QC5c37E4SIVtJVBMwlURc0/uNt2o4RcNRvdHa4CJ5w==}
-    engines: {node: '>= 14.0.0'}
-
   ansi-escapes@7.3.0:
     resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==}
     engines: {node: '>=18'}
@@ -2497,8 +2482,8 @@ packages:
   ast-types-flow@0.0.8:
     resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
 
-  ast-v8-to-istanbul@1.0.4:
-    resolution: {integrity: sha512-0bC0/4bTSrnwdhU3IsZDwEdojvuPrSg59OYZfKsLRtJZ0u8VBx9DebfqqG8bRdCC0I7vjgxmPi41P0lpkhJHtA==}
+  ast-v8-to-istanbul@1.0.5:
+    resolution: {integrity: sha512-UPAgKJFSEGMWSDr3LX4tqnAb4f7KGT8O40Tyx8wbYmmZ/yn58lNCm8h3svs3eXgiGd5AXxz8NDOvXWvicq+rJA==}
 
   async-function@1.0.0:
     resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
@@ -2515,8 +2500,8 @@ packages:
     resolution: {integrity: sha512-KunSNx+TVpkAw/6ULfhnx+HWRecjqZGTOyquAoWHYLRSdK1tB5Ihce1ZW+UY3fj33bYAFWPu7W/GRSmmrCGuxA==}
     engines: {node: '>=4'}
 
-  axios@1.18.1:
-    resolution: {integrity: sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==}
+  axios@1.19.0:
+    resolution: {integrity: sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==}
 
   axobject-query@4.1.0:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
@@ -2529,13 +2514,13 @@ packages:
     resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
     engines: {node: 18 || 20 || >=22}
 
-  baseline-browser-mapping@2.10.40:
-    resolution: {integrity: sha512-BSSLZ9/Cjjv7Gtj5B68ZzXcXUg8iOf3fme+FCuh8rC/Go+Kmh8cox7M3A8dolou16s64QjLPOSdngh7GxXvkSw==}
+  baseline-browser-mapping@2.11.11:
+    resolution: {integrity: sha512-/yImnXwyTvgMkhgekLHok/Rx5vO6E0BmStWlSqKWMVm2a2ITuZ1Tn+9bgLS+gZRdZmWtd8nxuhHpdmCUOWsTQQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  beasties@0.4.2:
-    resolution: {integrity: sha512-NvcGjG/7AVUAfRbvrJmHunDQS9uHnE6Q/7AkaPr8oKE8HjOlpjRG5075z/th2Tmlezk3VlaaS8+X9I1RwHJMQw==}
+  beasties@0.4.3:
+    resolution: {integrity: sha512-fIIeLOcbAB/K1kb1HBVJoiq1alHL4RCYBSo5e7HzrNkkgMggXR1Vqt/Z9JWnkfe/qdCo66Ux3QRwZioAIBdWRA==}
     engines: {node: '>=18.0.0'}
 
   bidi-js@1.0.3:
@@ -2552,19 +2537,19 @@ packages:
   boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
-  brace-expansion@1.1.15:
-    resolution: {integrity: sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==}
+  brace-expansion@1.1.18:
+    resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==}
 
-  brace-expansion@5.0.7:
-    resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.28.4:
-    resolution: {integrity: sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==}
+  browserslist@4.28.7:
+    resolution: {integrity: sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -2579,10 +2564,6 @@ packages:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
 
-  cacache@20.0.4:
-    resolution: {integrity: sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
@@ -2595,8 +2576,8 @@ packages:
     resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
     engines: {node: '>= 0.4'}
 
-  caniuse-lite@1.0.30001799:
-    resolution: {integrity: sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==}
+  caniuse-lite@1.0.30001806:
+    resolution: {integrity: sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==}
 
   chai@6.2.2:
     resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
@@ -2621,16 +2602,12 @@ packages:
     resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==}
     engines: {node: '>= 20.19.0'}
 
-  chownr@3.0.0:
-    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
-    engines: {node: '>=18'}
-
   chrome-trace-event@1.0.4:
     resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
     engines: {node: '>=6.0'}
 
-  chromium-bidi@16.0.1:
-    resolution: {integrity: sha512-J63PGu/9PpeCwLIcKYyzWP6yaVL5pxuBc0shlYCYM8BaAkmlwiQboXO1iNbOgSDbVklEyYFfNEcHD8oOAWacUA==}
+  chromium-bidi@17.0.2:
+    resolution: {integrity: sha512-5v9GQFhTktFvotn/OFNJBmKLKRAb6n9r0bVCwf7sHgWc3/JryK0bj1nn93L3pHFrfgcsu6Be6EWsDi+1XHTGDg==}
     engines: {node: '>=20.19.0 <22.0.0 || >=22.12.0'}
     peerDependencies:
       devtools-protocol: '*'
@@ -2674,8 +2651,8 @@ packages:
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  concurrently@10.0.3:
-    resolution: {integrity: sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==}
+  concurrently@10.0.4:
+    resolution: {integrity: sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==}
     engines: {node: '>=22'}
     hasBin: true
 
@@ -2799,8 +2776,8 @@ packages:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
-  devtools-protocol@0.0.1638949:
-    resolution: {integrity: sha512-mXwg4Fqnv0WR4iuAT/gYUmctNkjILwXFHyZ+m7Ty1dfr0ezZt2U3gnrrJTfRobJTHoXf+IbuFvFITzLrLFjwJA==}
+  devtools-protocol@0.0.1653615:
+    resolution: {integrity: sha512-pGVkY3T/qXxAp2nFPodwYqOevk6ncNMSmvL8QfRCx5ZWGd6Vor7AFNmyaA8Zs6uJyP1QAfjuLandCgvSix1BNA==}
 
   diff@8.0.4:
     resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
@@ -2834,8 +2811,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.381:
-    resolution: {integrity: sha512-n9Wa6yB+vDsGuA8AKbl/0z7HbvWqt5jxIdvr1IUicd0ryPrk7/xzwqLv8D9AbbvZ6avVNtXYLTfmgFHkwkyelg==}
+  electron-to-chromium@1.5.399:
+    resolution: {integrity: sha512-lEcqhErbHjXRvd41rnWLpzbyU/IXfIYo7QwaFWmxGeLiLyY2TBCdHnWY88vB+p3ubnihRypDm66panXl7TylLA==}
 
   emoji-regex@10.6.0:
     resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
@@ -2843,12 +2820,16 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
+  empathic@2.0.1:
+    resolution: {integrity: sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q==}
+    engines: {node: '>=14'}
+
   encodeurl@2.0.0:
     resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
     engines: {node: '>= 0.8'}
 
-  enhanced-resolve@5.24.1:
-    resolution: {integrity: sha512-7DdUaTjmNwMcH2gLr1qycesKII3BK4RLy/mdAb7x10Lq7bR4aNKHt1BR1ZALSv0rPM/hF5wYF0PhGop/rJm8vw==}
+  enhanced-resolve@5.24.4:
+    resolution: {integrity: sha512-GVoi+ICHocoOIU7qVVM48wOJziRsqrsyqlI0Ce0LdowRn6v3bcH2zUa9kp85ncx0nwIb9/HOCOLS3fdThDG/XQ==}
     engines: {node: '>=10.13.0'}
 
   entities@4.5.0:
@@ -2863,10 +2844,6 @@ packages:
     resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==}
     engines: {node: '>=20.19.0'}
 
-  env-paths@2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: '>=6'}
-
   environment@1.1.0:
     resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
     engines: {node: '>=18'}
@@ -2891,8 +2868,8 @@ packages:
     resolution: {integrity: sha512-HVLACW1TppGYjJ8H6/jqH/pqOtKRw6wMlrB23xfExmFWxFquAIWCmwoLsOyN96K4a5KbmOf5At9ZUO3GZbetAw==}
     engines: {node: '>= 0.4'}
 
-  es-module-lexer@2.2.0:
-    resolution: {integrity: sha512-3lGxdTXCLfe1MYfTz1y2ksAAUM4NAOP6rPEjxGJVKO7TZ5+tvHCaQWGpC4Y3IXvW3ece0Cz1cIP4FWBxOnGCTQ==}
+  es-module-lexer@2.3.1:
+    resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==}
 
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
@@ -2914,11 +2891,6 @@ packages:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
-  esbuild@0.27.2:
-    resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   esbuild@0.28.1:
     resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
     engines: {node: '>=18'}
@@ -2928,6 +2900,10 @@ packages:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
 
+  escape-goat@4.0.0:
+    resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==}
+    engines: {node: '>=12'}
+
   escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
@@ -3081,11 +3057,8 @@ packages:
     resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==}
     engines: {node: '>=12.0.0'}
 
-  exponential-backoff@3.1.3:
-    resolution: {integrity: sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==}
-
-  express-rate-limit@8.5.2:
-    resolution: {integrity: sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==}
+  express-rate-limit@8.6.1:
+    resolution: {integrity: sha512-0D493aP61w0TJ2A0wy27riRsO7FMQ7FK+KUHOKCSfPvYo0R55aiC6emCVgFUeShH0fq0ICPVzNcgoS+BsbXQCA==}
     engines: {node: '>= 16'}
     peerDependencies:
       express: '>= 4.11'
@@ -3112,11 +3085,8 @@ packages:
   fast-string-width@3.0.2:
     resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
 
-  fast-uri@3.1.2:
-    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
-
-  fast-uri@3.1.3:
-    resolution: {integrity: sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==}
+  fast-uri@3.1.5:
+    resolution: {integrity: sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==}
 
   fast-wrap-ansi@0.2.2:
     resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
@@ -3156,8 +3126,8 @@ packages:
     resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
     engines: {node: '>=16'}
 
-  flatted@3.4.2:
-    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+  flatted@3.4.3:
+    resolution: {integrity: sha512-/zipXxyO6rGvuNGDiULY9MvEGSkb2gaG4GGH4ygMi0ZZzyMHdUZBmntJmx5x1G2VuPytCwGN4xsJP6cw+sK+vQ==}
 
   follow-redirects@1.16.0:
     resolution: {integrity: sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==}
@@ -3188,9 +3158,9 @@ packages:
     resolution: {integrity: sha512-w8ZNZr2mKIc7qeNaQ9AVPT1+iFaI+Avd4xudVOvdDJ8VytREi1Ft5Ih7hd9jjehod8vAM5GMsfQ/TpPf4EyoEA==}
     engines: {node: '>=14.14'}
 
-  fs-minipass@3.0.3:
-    resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  fs-extra@11.4.0:
+    resolution: {integrity: sha512-EQsFzMUJkCKGr1ePqlYADkIUmHW1s3ZXr5Yqy6wbGrfUCphpl2maM/kyOIRA2HpP3AaFQTZXD4ldjek+nccddA==}
+    engines: {node: '>=14.14'}
 
   fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
@@ -3251,12 +3221,8 @@ packages:
   glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
 
-  glob@13.0.6:
-    resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
-    engines: {node: 18 || 20 || >=22}
-
-  globals@17.7.0:
-    resolution: {integrity: sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==}
+  globals@17.9.0:
+    resolution: {integrity: sha512-m/MvAW61QVU5VDNF1Vj8axt016h8w7L5TU1e9zlab7XIttAT2YAlCwl75K1fOqvMM9apmD7lbCIRhpfkhmxhCg==}
     engines: {node: '>=18'}
 
   globalthis@1.0.4:
@@ -3270,8 +3236,8 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
-  happy-dom@20.10.6:
-    resolution: {integrity: sha512-6QD0ilzDDt93tX44y8tbmZdAcdTRYDhUP+Asgi6pC8Pp5IA3cvaZGyoVN/EGtlq9ziT65iPuBBn3ASLr6hCgVw==}
+  happy-dom@20.11.1:
+    resolution: {integrity: sha512-XSt8tMzbW9ymE7687xztkO1ckR7qJNQ3LywY9vlYGhGi3zXrGBHuUo2Cl1ztZaICW+1eAGdkLbj6iwVqDT33kg==}
     engines: {node: '>=20.0.0'}
 
   has-bigints@1.1.0:
@@ -3311,13 +3277,13 @@ packages:
   hermes-parser@0.25.1:
     resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==}
 
-  hono@4.12.27:
-    resolution: {integrity: sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==}
+  hono@4.12.34:
+    resolution: {integrity: sha512-GqXJqY/xJkJmuloTrnV1ZEXG3fqte+VjkUqoRNZXcrUidiUOP4fMSIHHY4tsqZBK++kVyWmt/AAfSUuy57/eSA==}
     engines: {node: '>=16.9.0'}
 
-  hosted-git-info@9.0.3:
-    resolution: {integrity: sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
+  hosted-git-info@10.1.1:
+    resolution: {integrity: sha512-DeOnSPAvOndYKfw075gt8yZzQ7S2hNztw34zBTfhIzLhmBTswIBg5/y+pqu/VD5cYWm5goAFTusDmUEmKZ0PEQ==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
 
   html-encoding-sniffer@6.0.0:
     resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
@@ -3329,47 +3295,32 @@ packages:
   htmlparser2@10.1.0:
     resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
 
-  http-cache-semantics@4.2.0:
-    resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==}
-
   http-errors@2.0.1:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
 
-  http-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
-    engines: {node: '>= 14'}
-
   https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
-  https-proxy-agent@7.0.6:
-    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
-    engines: {node: '>= 14'}
-
-  https-proxy-agent@9.0.0:
-    resolution: {integrity: sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==}
+  https-proxy-agent@9.1.0:
+    resolution: {integrity: sha512-ag87y7cJJ9/3+GxFr8Oy4O5faDsGRGnBGsJj/YjOSsSx/5eadKLYTMPlzuR6obgoCDDm0abAAZitXXQkMOPSpA==}
     engines: {node: '>= 20'}
 
   iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
 
-  iconv-lite@0.7.2:
-    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+  iconv-lite@0.7.3:
+    resolution: {integrity: sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==}
     engines: {node: '>=0.10.0'}
 
-  ignore-walk@8.0.0:
-    resolution: {integrity: sha512-FCeMZT4NiRQGh+YkeKMtWrOmBgWjHjMJ26WQWrRQyoyzqevdaGSakUaJW5xQYmjLlUVk2qUnCjYVBax9EKKg8A==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   ignore@5.3.2:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
 
-  ignore@7.0.5:
-    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+  ignore@7.0.6:
+    resolution: {integrity: sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==}
     engines: {node: '>= 4'}
 
   image-size@0.5.5:
@@ -3384,6 +3335,9 @@ packages:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
 
+  import-meta-resolve@4.2.0:
+    resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -3391,16 +3345,12 @@ packages:
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  ini@6.0.0:
-    resolution: {integrity: sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   internal-slot@1.1.0:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
-  ip-address@10.2.0:
-    resolution: {integrity: sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==}
+  ip-address@10.4.0:
+    resolution: {integrity: sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ==}
     engines: {node: '>= 12'}
 
   ipaddr.js@1.9.1:
@@ -3539,10 +3489,6 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  isexe@4.0.0:
-    resolution: {integrity: sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==}
-    engines: {node: '>=20'}
-
   istanbul-lib-coverage@3.2.2:
     resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
     engines: {node: '>=8'}
@@ -3574,8 +3520,8 @@ packages:
   jju@1.4.0:
     resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
 
-  jose@6.2.3:
-    resolution: {integrity: sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==}
+  jose@6.2.8:
+    resolution: {integrity: sha512-Bsdjwm3Qsd/P0jR+BHDe3LytDfY7WBq2HmCCLIwuVRHMuEC9ae7/R474GIUdF1NgCyZjzVo/A9DOiOBtXq8ZoQ==}
 
   js-tokens@10.0.0:
     resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==}
@@ -3583,11 +3529,11 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  jsdom@29.1.1:
-    resolution: {integrity: sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
+  jsdom@30.0.1:
+    resolution: {integrity: sha512-52v7mUVUfNQVYYqE1lcdaymWL0njO7lTLUog6ZvW2U5KsbiLk/GnZlVJ+qx0xfNJZ6Gn+KSpPNE52vurbxZwrA==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
     peerDependencies:
-      canvas: ^3.0.0
+      canvas: ^3.2.3
     peerDependenciesMeta:
       canvas:
         optional: true
@@ -3600,10 +3546,6 @@ packages:
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
-  json-parse-even-better-errors@5.0.0:
-    resolution: {integrity: sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
@@ -3635,10 +3577,6 @@ packages:
   jsonfile@6.2.1:
     resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==}
 
-  jsonparse@1.3.1:
-    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
-    engines: {'0': node >= 0.2.0}
-
   jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
     engines: {node: '>=4.0'}
@@ -3665,93 +3603,93 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
-  lightningcss-android-arm64@1.32.0:
-    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+  lightningcss-android-arm64@1.33.0:
+    resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [android]
 
-  lightningcss-darwin-arm64@1.32.0:
-    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
+  lightningcss-darwin-arm64@1.33.0:
+    resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.32.0:
-    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
+  lightningcss-darwin-x64@1.33.0:
+    resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-freebsd-x64@1.32.0:
-    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+  lightningcss-freebsd-x64@1.33.0:
+    resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
-    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+  lightningcss-linux-arm-gnueabihf@1.33.0:
+    resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.32.0:
-    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+  lightningcss-linux-arm64-gnu@1.33.0:
+    resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-arm64-musl@1.32.0:
-    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
+  lightningcss-linux-arm64-musl@1.33.0:
+    resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-linux-x64-gnu@1.32.0:
-    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+  lightningcss-linux-x64-gnu@1.33.0:
+    resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-x64-musl@1.32.0:
-    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
+  lightningcss-linux-x64-musl@1.33.0:
+    resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-win32-arm64-msvc@1.32.0:
-    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+  lightningcss-win32-arm64-msvc@1.33.0:
+    resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.32.0:
-    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+  lightningcss-win32-x64-msvc@1.33.0:
+    resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.32.0:
-    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+  lightningcss@1.33.0:
+    resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
     engines: {node: '>= 12.0.0'}
 
   lilconfig@3.1.3:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
     engines: {node: '>=14'}
 
-  linkify-it@5.0.1:
-    resolution: {integrity: sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==}
+  linkify-it@5.0.2:
+    resolution: {integrity: sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==}
 
-  listr2@10.2.1:
-    resolution: {integrity: sha512-7I5knELsJKTUjXG+A6BkKAiGkW1i25fNa/xlUl9hFtk15WbE9jndA89xu5FzQKrY5llajE1hfZZFMILXkDHk/Q==}
+  listr2@10.2.2:
+    resolution: {integrity: sha512-JtNtbZj8q5BnDMR7trpwvwk3RIrANtIVzEUm8w7amp6xelLgyuq+4WZoTH913XaQAoH/cNdYhaNzBPA2U3xbDw==}
     engines: {node: '>=22.13.0'}
 
-  lmdb@3.5.4:
-    resolution: {integrity: sha512-9FKQA6G1MMtqNxfxvSBNXD/axeG2QRjYbNh0/ykRL5xYcRbCm2vXq7B9bhc7nSuKdHzr8/BHIwfPuYYH1UsXXw==}
+  lmdb@3.5.6:
+    resolution: {integrity: sha512-j3uE8ReKNyUWDjhfEFSJqE/1DLtfTR5Z8yFzVHvBjAk37wNg7HdScjcv8ttPHRvrdgPQMPWxFFI0SsdBzI5lBw==}
     hasBin: true
 
   loader-runner@4.3.2:
@@ -3781,8 +3719,8 @@ packages:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
-  lru-cache@11.5.1:
-    resolution: {integrity: sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==}
+  lru-cache@11.5.2:
+    resolution: {integrity: sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==}
     engines: {node: 20 || >=22}
 
   lru-cache@5.1.1:
@@ -3798,6 +3736,9 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
+  magic-string@1.0.0:
+    resolution: {integrity: sha512-CGvjzMN08iv6w1mm4/x3Gh1hLb4VnyRUA15FFpl6CsCIGGoe36k7kY5KNz9QDbSBN5I/fWHM6ZlIkUTa5xdUEA==}
+
   magicast@0.5.3:
     resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==}
 
@@ -3809,12 +3750,8 @@ packages:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
     engines: {node: '>=10'}
 
-  make-fetch-happen@15.0.6:
-    resolution: {integrity: sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  markdown-it@14.2.0:
-    resolution: {integrity: sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==}
+  markdown-it@14.3.0:
+    resolution: {integrity: sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==}
     hasBin: true
 
   math-intrinsics@1.1.0:
@@ -3824,11 +3761,11 @@ packages:
   mdn-data@2.27.1:
     resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
 
-  mdurl@2.0.0:
-    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
+  mdurl@2.1.0:
+    resolution: {integrity: sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==}
 
-  media-typer@1.1.0:
-    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+  media-typer@1.1.1:
+    resolution: {integrity: sha512-yz3xRaG20c6/BOzvYoDaGtPmGscs7YivItZEEqe6GbwNfHuxu9YNmvnEkMzKldAGY4/80pRcQRZSEnhquk9XuQ==}
     engines: {node: '>= 0.8'}
 
   merge-descriptors@2.0.0:
@@ -3867,52 +3804,24 @@ packages:
     resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.6:
+    resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.5:
     resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
 
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  minipass-collect@2.0.1:
-    resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minipass-fetch@5.0.2:
-    resolution: {integrity: sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  minipass-flush@1.0.7:
-    resolution: {integrity: sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==}
-    engines: {node: '>= 8'}
-
-  minipass-pipeline@1.2.4:
-    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
-    engines: {node: '>=8'}
-
-  minipass-sized@2.0.0:
-    resolution: {integrity: sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==}
-    engines: {node: '>=8'}
-
-  minipass@3.3.6:
-    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: '>=8'}
-
-  minipass@7.1.3:
-    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minizlib@3.1.0:
-    resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
-    engines: {node: '>= 18'}
-
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
   mlly@1.8.2:
     resolution: {integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==}
 
-  modern-tar@0.7.6:
-    resolution: {integrity: sha512-sweCIVXzx1aIGTCdzcMlSZt1h8k5Tmk08VNAuRk3IU28XamGiOH5ypi11g6De2CH7PhYqSSnGy2A/EFhbWnVKg==}
+  modern-tar@0.7.7:
+    resolution: {integrity: sha512-t9VmxaqrmANnEOBhpSDI6HD192Ge48k8vmWqQQL7hSFEqHEYwZbbsu49+aKLWZeRvFs3j1pMhXOqqF4kPlvjkQ==}
     engines: {node: '>=18.0.0'}
 
   mrmime@2.0.1:
@@ -3933,8 +3842,8 @@ packages:
     resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==}
     engines: {node: ^20.17.0 || >=22.9.0}
 
-  nanoid@3.3.15:
-    resolution: {integrity: sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==}
+  nanoid@3.3.16:
+    resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -3967,51 +3876,17 @@ packages:
     resolution: {integrity: sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==}
     hasBin: true
 
-  node-gyp@12.4.0:
-    resolution: {integrity: sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-    hasBin: true
-
-  node-releases@2.0.50:
-    resolution: {integrity: sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==}
+  node-releases@2.0.51:
+    resolution: {integrity: sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==}
     engines: {node: '>=18'}
 
-  nopt@9.0.0:
-    resolution: {integrity: sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-    hasBin: true
-
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
-  npm-bundled@5.0.0:
-    resolution: {integrity: sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-install-checks@8.0.0:
-    resolution: {integrity: sha512-ScAUdMpyzkbpxoNekQ3tNRdFI8SJ86wgKZSQZdUxT+bj0wVFpsEMWnkXP0twVe1gJyNF5apBWDJhhIbgrIViRA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-normalize-package-bin@5.0.0:
-    resolution: {integrity: sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-package-arg@13.0.2:
-    resolution: {integrity: sha512-IciCE3SY3uE84Ld8WZU23gAPPV9rIYod4F+rc+vJ7h7cwAJt9Vk6TVsK60ry7Uj3SRS3bqRRIGuTp9YVlk6WNA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-packlist@10.0.4:
-    resolution: {integrity: sha512-uMW73iajD8hiH4ZBxEV3HC+eTnppIqwakjOYuvgddnalIw2lJguKviK1pcUJDlIWm1wSJkchpDZDSVVsZEYRng==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-pick-manifest@11.0.3:
-    resolution: {integrity: sha512-buzyCfeoGY/PxKqmBqn1IUJrZnUi1VVJTdSSRPGI60tJdUhUoSQFhs0zycJokDdOznQentgrpf8LayEHyyYlqQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
-  npm-registry-fetch@19.1.1:
-    resolution: {integrity: sha512-TakBap6OM1w0H73VZVDf44iFXsOS3h+L4wVMXmbWOQroZgFhMch0juN6XSzBNlD965yIKvWg2dfu7NSiaYLxtw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
+  npm-package-arg@14.0.0:
+    resolution: {integrity: sha512-69XQh3k+dtGa1p+7RaR57IuG3rCko96xr/nUfN4yDYBXbTYICiWcOpsFKLN2GtGE9cyIljE+f1exnaYt9MvM+Q==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
 
   npm-run-path@6.0.0:
     resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
@@ -4052,8 +3927,8 @@ packages:
     resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
     engines: {node: '>= 0.4'}
 
-  obug@2.1.3:
-    resolution: {integrity: sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==}
+  obug@2.1.4:
+    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
     engines: {node: '>=12.20.0'}
 
   on-finished@2.4.1:
@@ -4071,8 +3946,8 @@ packages:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
-  ora@9.4.0:
-    resolution: {integrity: sha512-84cglkRILFxdtA8hAvLNdMrtBpPNBTrQ9/ulg0FA7xLMnD6mifv+enAIeRmvtv+WgdCE+LPGOfQmtJRrVaIVhQ==}
+  ora@9.4.1:
+    resolution: {integrity: sha512-6VlU9MLXbjVQD04AZCMX28hVtA5bUoadvUqO76MUCVA0ilwJbMiHsITRPfyVm6p/BC0Av/BXMujx39WCe1LEqw==}
     engines: {node: '>=20'}
 
   ordered-binary@1.6.1:
@@ -4082,6 +3957,10 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
+  oxc-parser@0.142.0:
+    resolution: {integrity: sha512-kKR+jPiRJYJDexVoziIg/FVGvr1fT1FZSSJOk6tVoMKKSlsf1Cso+cgGCJkOEDWOP174vRntCPFKg+AS7InWvw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
@@ -4094,11 +3973,6 @@ packages:
     resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==}
     engines: {node: '>=18'}
 
-  pacote@21.5.1:
-    resolution: {integrity: sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-    hasBin: true
-
   parse-node-version@1.0.1:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
@@ -4134,10 +4008,6 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  path-scurry@2.0.2:
-    resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
-    engines: {node: 18 || 20 || >=22}
-
   path-to-regexp@8.4.2:
     resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
 
@@ -4155,6 +4025,10 @@ packages:
     resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
+    engines: {node: '>=12'}
+
   pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -4173,14 +4047,14 @@ packages:
   pkg-types@2.3.1:
     resolution: {integrity: sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==}
 
-  playwright-core@1.61.1:
-    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.1:
+    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.61.1:
-    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
-    engines: {node: '>=18'}
+  playwright@1.62.1:
+    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+    engines: {node: '>=20'}
     hasBin: true
 
   possible-typed-array-names@1.1.0:
@@ -4196,22 +4070,22 @@ packages:
     peerDependencies:
       postcss: ^8.4.31
 
-  postcss@8.5.16:
-    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
+  postcss@8.5.25:
+    resolution: {integrity: sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==}
     engines: {node: ^10 || ^12 || >=14}
 
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.9.4:
-    resolution: {integrity: sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==}
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
     hasBin: true
 
-  proc-log@6.1.0:
-    resolution: {integrity: sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
+  proc-log@7.0.0:
+    resolution: {integrity: sha512-FYgfaA69XZ93zaXLoMNQ+ViDXGGBgR8aLh03txzcFhV+9xOXx7+8DLCULrKKpR9+GsH9ZfHm82aSUPpozX0Ztg==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
 
   prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
@@ -4223,6 +4097,15 @@ packages:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
 
+  proxy-agent-negotiate@1.1.0:
+    resolution: {integrity: sha512-N8IBcM3UgCVzz2L2Lqv8DVntDnnC8/hiV4nEDUPkqq72TPUgYWjQc+bdZlBPZK9LzPAvOY//gAt0S0DApoOXWQ==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      kerberos: ^2.0.0
+    peerDependenciesMeta:
+      kerberos:
+        optional: true
+
   proxy-from-env@2.1.0:
     resolution: {integrity: sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==}
     engines: {node: '>=10'}
@@ -4238,12 +4121,12 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
-  puppeteer-core@25.2.1:
-    resolution: {integrity: sha512-MwEZ4FFGJ1ZLOmu/04eISxoEMKtCnHyJBRFfgpwPPSYNG6gT6Xw1laNziFSV7uwDcx3jK+ATYIo9SfOd8Uhc3w==}
+  puppeteer-core@25.4.0:
+    resolution: {integrity: sha512-K1plkLOdeoUnGeT1OvdqF3qxl33v+Ra/uH5VyPEhXdMcpvGiEskHzxxEU3fgpccJpJLIipB/rPUsvkZRWeKqOA==}
     engines: {node: '>=22.12.0'}
 
-  puppeteer@25.2.1:
-    resolution: {integrity: sha512-2D5RMkQH9FRhDU57a1/jV9xWoxqZvUjaZOYjAAPdRCEY8A01V5sxzyGOMs8XiKU9fPF91SOSwNYpHRu5SD958g==}
+  puppeteer@25.4.0:
+    resolution: {integrity: sha512-xfQp8dFBcGaLc1hEMaVr7s+oW4ZkAurr8Y9H81ilKhu6QoLfSTkZjU7IavnyJ/VWpB9ni3KNJUQHUatslLWyGw==}
     engines: {node: '>=22.12.0'}
     hasBin: true
 
@@ -4313,14 +4196,19 @@ packages:
   rfdc@1.4.1:
     resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
-  rolldown@1.1.3:
-    resolution: {integrity: sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==}
+  rolldown@1.1.5:
+    resolution: {integrity: sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  rollup@4.60.2:
-    resolution: {integrity: sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+  rolldown@1.2.0:
+    resolution: {integrity: sha512-u7tgm5l4Yw1iTqUL4EcYOAt7fFvCgQMLeidrnD4GALlC6aOznCjezYajgxeyKw27u0Q5N7fwgCzjVyPIWzwuBA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+
+  rolldown@1.2.2:
+    resolution: {integrity: sha512-opwpo1tQBAcpSUJDt94B7hhLNGOKjCdE//XXjeLrnx9b83bjnw45tXdg1b09yEw/VLFBJGZpwRULMmOZo7ol+A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
   rollup@4.60.4:
@@ -4467,18 +4355,18 @@ packages:
     engines: {node: '>=16.0.0'}
     hasBin: true
 
+  sass@1.101.0:
+    resolution: {integrity: sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw==}
+    engines: {node: '>=20.19.0'}
+    hasBin: true
+
   sass@1.97.3:
     resolution: {integrity: sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
-  sass@1.99.0:
-    resolution: {integrity: sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
-  sax@1.6.0:
-    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
+  sax@1.6.1:
+    resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==}
     engines: {node: '>=11.0.0'}
 
   saxes@6.0.0:
@@ -4502,11 +4390,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.4:
-    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.8.1:
     resolution: {integrity: sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==}
     engines: {node: '>=10'}
@@ -4554,8 +4437,8 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shell-quote@1.8.4:
-    resolution: {integrity: sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==}
+  shell-quote@1.9.0:
+    resolution: {integrity: sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==}
     engines: {node: '>= 0.4'}
 
   side-channel-list@1.0.1:
@@ -4588,10 +4471,6 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  sigstore@4.1.1:
-    resolution: {integrity: sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   sirv@3.0.2:
     resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
     engines: {node: '>=18'}
@@ -4604,18 +4483,6 @@ packages:
     resolution: {integrity: sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==}
     engines: {node: '>=20'}
 
-  smart-buffer@4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-
-  socks-proxy-agent@8.0.5:
-    resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
-    engines: {node: '>= 14'}
-
-  socks@2.8.9:
-    resolution: {integrity: sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==}
-    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
-
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -4631,22 +4498,9 @@ packages:
     resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
     engines: {node: '>= 12'}
 
-  spdx-exceptions@2.5.0:
-    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
-
-  spdx-expression-parse@4.0.0:
-    resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==}
-
-  spdx-license-ids@3.0.23:
-    resolution: {integrity: sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==}
-
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  ssri@13.0.1:
-    resolution: {integrity: sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   stackback@0.0.2:
     resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
 
@@ -4654,8 +4508,8 @@ packages:
     resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
     engines: {node: '>= 0.8'}
 
-  std-env@4.1.0:
-    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
+  std-env@4.2.0:
+    resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
 
   stdin-discarder@0.3.2:
     resolution: {integrity: sha512-eCPu1qRxPVkl5605OTWF8Wz40b4Mf45NY5LQmVPQ599knfs5QhASUm9GbJ5BDMDOXgrnh0wyEdvzmL//YMlw0A==}
@@ -4673,8 +4527,8 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
-  string-width@8.2.1:
-    resolution: {integrity: sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==}
+  string-width@8.2.2:
+    resolution: {integrity: sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==}
     engines: {node: '>=20'}
 
   string.prototype.includes@2.0.1:
@@ -4743,10 +4597,6 @@ packages:
     resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
     engines: {node: '>=6'}
 
-  tar@7.5.19:
-    resolution: {integrity: sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==}
-    engines: {node: '>=18'}
-
   terser-webpack-plugin@5.6.1:
     resolution: {integrity: sha512-201R5j+sJpK8nFWwKVyNfZot8FaJbLZDq5evriVzbV1wDtSXDjRUDRfJzHpAaxFDMEhsZL1QkeqM61wgsS3KaQ==}
     engines: {node: '>= 10.13.0'}
@@ -4805,23 +4655,19 @@ packages:
     resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
     engines: {node: '>=18'}
 
-  tinyglobby@0.2.16:
-    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
-    engines: {node: '>=12.0.0'}
-
   tinyglobby@0.2.17:
     resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
     engines: {node: '>=12.0.0'}
 
-  tinyrainbow@3.1.0:
-    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
+  tinyrainbow@3.1.1:
+    resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==}
     engines: {node: '>=14.0.0'}
 
-  tldts-core@7.4.1:
-    resolution: {integrity: sha512-sc2nGvGbixlJRHwTh/qQdPXTxJU1UDJboGPQm4d/01YUJ9r/u6aeIulQvEaxUlvKDN7hb1qCLjax+jhVAPLa/g==}
+  tldts-core@7.4.9:
+    resolution: {integrity: sha512-DxKfPBI52p2msTEu7MPhdpdDTBhhVQg1a/8PjQckeyAvO13eMYElX545grIp6nnTGIMZlRvFZPvFhvI/WIz2Vg==}
 
-  tldts@7.4.0:
-    resolution: {integrity: sha512-yHBe+zVfzNZ3QfTPW/Z6KK1G2t340gFjMHqI/4KKSt/abzYydzuCnpqdaF5gCCABby+9Yfbj59oR5F2Fd5CBzg==}
+  tldts@7.4.9:
+    resolution: {integrity: sha512-3kZ8wQQ/k5DrChD4X4FVvr2D7E5uoRgAqkPyLpSCGUvqOvqu+JEdr3mwMUaVWb+vMHZaKhF5fp2PBigKsui7hA==}
     hasBin: true
 
   to-regex-range@5.0.1:
@@ -4836,8 +4682,8 @@ packages:
     resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
     engines: {node: '>=6'}
 
-  tough-cookie@6.0.1:
-    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+  tough-cookie@6.0.2:
+    resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==}
     engines: {node: '>=16'}
 
   tr46@6.0.0:
@@ -4860,15 +4706,11 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tsx@4.22.4:
-    resolution: {integrity: sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==}
+  tsx@4.23.5:
+    resolution: {integrity: sha512-rw55FUaqOoI7RvlQwLbhO4nSDApnQ4/CykPuiQ/EPvtrX3WA9Ig55jIt9VvbBJbzJuj12ueRu4PMZ2SxPVbihg==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
-  tuf-js@4.1.0:
-    resolution: {integrity: sha512-50QV99kCKH5P/Vs4E2Gzp7BopNV+KzTXqWeaxrfu5IQJBOULRsTIS9seSsOVT8ZnGXzCyx55nYWAi4qJzpZKEQ==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -4896,15 +4738,15 @@ packages:
   typed-query-selector@2.12.2:
     resolution: {integrity: sha512-EOPFbyIub4ngnEdqi2yOcNeDLaX/0jcE1JoAXQDDMIthap7FoN795lc/SHfIq2d416VufXpM8z/lD+WRm2gfOQ==}
 
-  typedoc@0.28.19:
-    resolution: {integrity: sha512-wKh+lhdmMFivMlc6vRRcMGXeGEHGU2g8a2CkPTJjJlwRf1iXbimWIPcFolCqe4E0d/FRtGszpIrsp3WLpDB8Pw==}
+  typedoc@0.28.20:
+    resolution: {integrity: sha512-uSKqkh8Cr48vllnEy+jdaAgOeR6Y+QCBW7usgUsKj7gJEfR7stw9U/fE49LBnj2tPRKPY0c0EBJSWe9Appmplg==}
     engines: {node: '>= 18', pnpm: '>= 10'}
     hasBin: true
     peerDependencies:
       typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x || 6.0.x
 
-  typescript-eslint@8.62.1:
-    resolution: {integrity: sha512-vymnnM5g0AKQDSAyfP12nMIBvgwgA42syg74kkuZ4x1VuTzwQKwc5h9rGxeShCjny5o+zWAb6OEoz7XLgrIkIw==}
+  typescript-eslint@8.65.0:
+    resolution: {integrity: sha512-/ggrHAwyjENDusvyxbuqxAC2dTnZg/Z8F+fgQtYIz+L6n/9HfSlEZcFGV/NsMNa6CkGk0xUjUAFwC0vHOflvIA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
@@ -4915,6 +4757,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   typescript@6.0.3:
     resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
     engines: {node: '>=14.17'}
@@ -4933,13 +4780,9 @@ packages:
   undici-types@8.3.0:
     resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==}
 
-  undici@6.27.0:
-    resolution: {integrity: sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==}
-    engines: {node: '>=18.17'}
-
-  undici@7.28.0:
-    resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}
-    engines: {node: '>=20.18.1'}
+  undici@8.9.0:
+    resolution: {integrity: sha512-aWZpUj7XoGonMClx4gdDRfgBjqeA+F473aDmROQQbM9n6PRfK/u1q/a0X4wMTgcHfT8H6fpbt98PFuDUwFg2YA==}
+    engines: {node: '>=22.19.0'}
 
   unicorn-magic@0.3.0:
     resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
@@ -4996,9 +4839,9 @@ packages:
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
-  validate-npm-package-name@7.0.2:
-    resolution: {integrity: sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A==}
-    engines: {node: ^20.17.0 || >=22.9.0}
+  validate-npm-package-name@8.0.0:
+    resolution: {integrity: sha512-SCv6OOV6Xj2/3cXy3dGmADluJTNcL3o7hZAglNPTe+WYuEuvxgJzxPrSDLZhF+CwyQOubqgecjMmTJGMVLWjYQ==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
 
   varint@6.0.0:
     resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==}
@@ -5007,8 +4850,14 @@ packages:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
 
-  vite-plugin-checker@0.14.4:
-    resolution: {integrity: sha512-Tw0U9UgHIRiZ+Yoe4Gh0RrYoBiCVmO9j4tomVdYr0KUjUsqXMPhqW8ouoSWmOzGp5Iimipbl3bNXZcK7OeP7Qg==}
+  vite-live-preview@0.4.0:
+    resolution: {integrity: sha512-Qz8kr0kixXwnQl+zLPZX66OjajN4jnVnDwhNToJsO6TTboUtBo8pEmRuc0iBmkwW9lXR8mOeMu+QtxFkXBcHYg==}
+    hasBin: true
+    peerDependencies:
+      vite: '>=5.4.0'
+
+  vite-plugin-checker@0.14.5:
+    resolution: {integrity: sha512-c9lQ92eisUO+F7Fd93aelojmiOS+NQpPgQ1XR2LTQHox1/laZf4yAoQj+L3RA9Vgh10e2nFd9b8r2LLyYZsbpA==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@biomejs/biome': '>=2.4.12'
@@ -5058,48 +4907,8 @@ packages:
     peerDependencies:
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  vite@7.3.5:
-    resolution: {integrity: sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^20.19.0 || >=22.12.0
-      jiti: '>=1.21.0'
-      less: ^4.0.0
-      lightningcss: ^1.21.0
-      sass: ^1.70.0
-      sass-embedded: ^1.70.0
-      stylus: '>=0.54.8'
-      sugarss: ^5.0.0
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-  vite@8.1.1:
-    resolution: {integrity: sha512-X/05/cT+VITy2AeDc1der6smvGWWREtL4hPbPTaVbjSBuuWkmNOjR6HP3NzqcQA2nF6VHGUPaFRJyft/2AE9Kg==}
+  vite@8.1.5:
+    resolution: {integrity: sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -5141,20 +4950,63 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.1.9:
-    resolution: {integrity: sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==}
+  vite@8.2.0:
+    resolution: {integrity: sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      '@vitejs/devtools': ^0.4.0
+      esbuild: ^0.27.0 || ^0.28.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      '@vitejs/devtools':
+        optional: true
+      esbuild:
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  vitest@4.1.10:
+    resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.9
-      '@vitest/browser-preview': 4.1.9
-      '@vitest/browser-webdriverio': 4.1.9
-      '@vitest/coverage-istanbul': 4.1.9
-      '@vitest/coverage-v8': 4.1.9
-      '@vitest/ui': 4.1.9
+      '@vitest/browser-playwright': 4.1.10
+      '@vitest/browser-preview': 4.1.10
+      '@vitest/browser-webdriverio': 4.1.10
+      '@vitest/coverage-istanbul': 4.1.10
+      '@vitest/coverage-v8': 4.1.10
+      '@vitest/ui': 4.1.10
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -5189,10 +5041,6 @@ packages:
     resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
     engines: {node: '>=18'}
 
-  watchpack@2.5.1:
-    resolution: {integrity: sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==}
-    engines: {node: '>=10.13.0'}
-
   watchpack@2.5.2:
     resolution: {integrity: sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==}
     engines: {node: '>=10.13.0'}
@@ -5207,8 +5055,8 @@ packages:
     resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
     engines: {node: '>=20'}
 
-  webpack-sources@3.5.0:
-    resolution: {integrity: sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==}
+  webpack-sources@3.5.1:
+    resolution: {integrity: sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==}
     engines: {node: '>=10.13.0'}
 
   webpack-virtual-modules@0.6.2:
@@ -5236,6 +5084,10 @@ packages:
     resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
+  whatwg-url@17.1.0:
+    resolution: {integrity: sha512-3GeworPmc2ZfEEHP7lEbUfBX/L75wdEsi0rLNhXcXxnoN5jyq0SL5gCy06SGW2cyTIZdTvWIDQNQoza++vKeaw==}
+    engines: {node: ^22.14.0 || >=24.0.0}
+
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
     engines: {node: '>= 0.4'}
@@ -5257,11 +5109,6 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
-  which@6.0.1:
-    resolution: {integrity: sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-    hasBin: true
-
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
@@ -5294,6 +5141,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xml-name-validator@5.0.0:
     resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
     engines: {node: '>=18'}
@@ -5311,10 +5170,6 @@ packages:
   yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  yallist@5.0.0:
-    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
-    engines: {node: '>=18'}
-
   yaml@2.9.0:
     resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
     engines: {node: '>= 14.6'}
@@ -5328,12 +5183,16 @@ packages:
     resolution: {integrity: sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=23}
 
+  yargs@18.1.0:
+    resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
   yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  yoctocolors@2.1.2:
-    resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
+  yoctocolors@2.2.0:
+    resolution: {integrity: sha512-xYqdZFUK/VYazNl/oCDYN+3WloWQwMfZxBoiNt6qNyk+xfOdi598muWE42rNZFp1kNOiqW936q5RhUdnpqElSg==}
     engines: {node: '>=18'}
 
   zod-to-json-schema@3.25.2:
@@ -5350,9 +5209,6 @@ packages:
   zod@3.25.76:
     resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
 
-  zod@4.4.2:
-    resolution: {integrity: sha512-IynmDyxsEsb9RKzO3J9+4SxXnl2FTFSzNBaKKaMV6tsSk0rw9gYw9gs+JFCq/qk2LCZ78KDwyj+Z289TijSkUw==}
-
   zod@4.4.3:
     resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
 
@@ -5361,210 +5217,123 @@ packages:
 
 snapshots:
 
-  '@algolia/abtesting@1.18.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-abtesting@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-analytics@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-common@5.52.0': {}
-
-  '@algolia/client-insights@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-personalization@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-query-suggestions@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/client-search@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/ingestion@1.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/monitoring@1.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/recommend@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
-  '@algolia/requester-browser-xhr@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-
-  '@algolia/requester-fetch@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-
-  '@algolia/requester-node-http@5.52.0':
-    dependencies:
-      '@algolia/client-common': 5.52.0
-
   '@ampproject/remapping@2.3.0':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
 
-  '@angular-devkit/architect@0.2200.4(chokidar@5.0.0)':
+  '@angular-devkit/architect@0.2201.2(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.0.4(chokidar@5.0.0)
+      '@angular-devkit/core': 22.1.2(chokidar@5.0.0)
       rxjs: 7.8.2
     transitivePeerDependencies:
       - chokidar
 
-  '@angular-devkit/core@22.0.4(chokidar@5.0.0)':
+  '@angular-devkit/core@22.1.2(chokidar@5.0.0)':
     dependencies:
       ajv: 8.20.0
       ajv-formats: 3.0.1(ajv@8.20.0)
       jsonc-parser: 3.3.1
-      picomatch: 4.0.4
+      picomatch: 4.0.5
       rxjs: 7.8.2
       source-map: 0.7.6
     optionalDependencies:
       chokidar: 5.0.0
 
-  '@angular-devkit/schematics@22.0.4(chokidar@5.0.0)':
+  '@angular-devkit/schematics@22.1.2(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.0.4(chokidar@5.0.0)
+      '@angular-devkit/core': 22.1.2(chokidar@5.0.0)
       jsonc-parser: 3.3.1
-      magic-string: 0.30.21
-      ora: 9.4.0
+      magic-string: 1.0.0
+      ora: 9.4.1
       rxjs: 7.8.2
     transitivePeerDependencies:
       - chokidar
 
-  '@angular-eslint/bundled-angular-compiler@22.0.0': {}
+  '@angular-eslint/bundled-angular-compiler@22.1.0': {}
 
-  '@angular-eslint/eslint-plugin-template@22.0.0(@angular-eslint/template-parser@22.0.0(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(@typescript-eslint/types@8.62.1)(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@angular-eslint/eslint-plugin-template@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)':
     dependencies:
-      '@angular-eslint/bundled-angular-compiler': 22.0.0
-      '@angular-eslint/template-parser': 22.0.0(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@angular-eslint/utils': 22.0.0(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+      '@angular-eslint/bundled-angular-compiler': 22.1.0
+      '@angular-eslint/template-parser': 22.1.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
+      '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
       aria-query: 5.3.2
       axobject-query: 4.1.0
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       typescript: 6.0.3
 
-  '@angular-eslint/eslint-plugin@22.0.0(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@angular-eslint/eslint-plugin@22.1.0(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)':
     dependencies:
-      '@angular-eslint/bundled-angular-compiler': 22.0.0
-      '@angular-eslint/utils': 22.0.0(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      eslint: 10.6.0(jiti@2.7.0)
+      '@angular-eslint/bundled-angular-compiler': 22.1.0
+      '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
 
-  '@angular-eslint/template-parser@22.0.0(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@angular-eslint/template-parser@22.1.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)':
     dependencies:
-      '@angular-eslint/bundled-angular-compiler': 22.0.0
-      eslint: 10.6.0(jiti@2.7.0)
+      '@angular-eslint/bundled-angular-compiler': 22.1.0
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       eslint-scope: 9.1.2
       typescript: 6.0.3
 
-  '@angular-eslint/utils@22.0.0(@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@angular-eslint/utils@22.1.0(@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(typescript@6.0.3)':
     dependencies:
-      '@angular-eslint/bundled-angular-compiler': 22.0.0
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      eslint: 10.6.0(jiti@2.7.0)
+      '@angular-eslint/bundled-angular-compiler': 22.1.0
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       typescript: 6.0.3
 
-  '@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))':
-    dependencies:
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
-      tslib: 2.8.1
-    optional: true
-
-  '@angular/build@22.0.4(@angular/compiler-cli@22.0.4(@angular/compiler@22.0.4)(typescript@6.0.3))(@angular/compiler@22.0.4)(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@types/node@26.0.1)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(postcss@8.5.16)(sass-embedded@1.97.3)(terser@5.46.2)(tslib@2.8.1)(tsx@4.22.4)(typescript@6.0.3)(vitest@4.1.9)(yaml@2.9.0)':
+  '@angular/build@22.1.2(@angular/compiler-cli@22.1.0(@angular/compiler@22.1.0)(typescript@6.0.3))(@angular/compiler@22.1.0)(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(@types/node@26.1.2)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@10.2.2))(jiti@2.7.0)(less@4.6.4)(postcss@8.5.25)(rollup@4.60.4)(sass-embedded@1.97.3)(supports-color@10.2.2)(terser@5.46.2)(tslib@2.8.1)(tsx@4.23.5)(typescript@6.0.3)(vitest@4.1.10)(yaml@2.9.0)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@angular-devkit/architect': 0.2200.4(chokidar@5.0.0)
-      '@angular/compiler': 22.0.4
-      '@angular/compiler-cli': 22.0.4(@angular/compiler@22.0.4)(typescript@6.0.3)
-      '@babel/core': 7.29.7
-      '@babel/helper-annotate-as-pure': 7.27.3
+      '@angular-devkit/architect': 0.2201.2(chokidar@5.0.0)
+      '@angular/compiler': 22.1.0
+      '@angular/compiler-cli': 22.1.0(@angular/compiler@22.1.0)(typescript@6.0.3)
+      '@babel/core': 8.0.1
+      '@babel/helper-annotate-as-pure': 8.0.0
       '@babel/helper-split-export-declaration': 7.24.7
-      '@inquirer/confirm': 6.0.12(@types/node@26.0.1)
-      '@vitejs/plugin-basic-ssl': 2.3.0(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
-      beasties: 0.4.2
-      browserslist: 4.28.4
+      '@inquirer/confirm': 6.1.1(@types/node@26.1.2)
+      '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.1.5(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
+      beasties: 0.4.3
+      browserslist: 4.28.7
       esbuild: 0.28.1
-      https-proxy-agent: 9.0.0
+      https-proxy-agent: 9.1.0(supports-color@10.2.2)
       jsonc-parser: 3.3.1
-      listr2: 10.2.1
-      magic-string: 0.30.21
+      listr2: 10.2.2
+      magic-string: 1.0.0
       mrmime: 2.0.1
+      oxc-parser: 0.142.0
       parse5-html-rewriting-stream: 8.0.1
-      picomatch: 4.0.4
+      picomatch: 4.0.5
       piscina: 5.2.0
-      rollup: 4.60.2
-      sass: 1.99.0
-      semver: 7.7.4
+      rolldown: 1.2.0
+      sass: 1.101.0
+      semver: 7.8.5
       source-map-support: 0.5.21
-      tinyglobby: 0.2.16
+      tinyglobby: 0.2.17
       tslib: 2.8.1
       typescript: 6.0.3
-      vite: 7.3.5(@types/node@26.0.1)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
-      watchpack: 2.5.1
+      vite: 8.1.5(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
+      watchpack: 2.5.2
     optionalDependencies:
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
-      '@angular/platform-browser': 22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))
-      istanbul-lib-instrument: 6.0.3
+      '@angular/core': 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))
+      istanbul-lib-instrument: 6.0.3(supports-color@10.2.2)
       less: 4.6.4
-      lmdb: 3.5.4
-      postcss: 8.5.16
-      vitest: 4.1.9(@types/node@26.0.1)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(happy-dom@20.10.6)(jsdom@29.1.1)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+      lmdb: 3.5.6
+      postcss: 8.5.25
+      rollup: 4.60.4
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(happy-dom@20.11.1)(jsdom@30.0.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
     transitivePeerDependencies:
       - '@types/node'
+      - '@vitejs/devtools'
       - chokidar
       - jiti
-      - lightningcss
+      - kerberos
       - sass-embedded
       - stylus
       - sugarss
@@ -5573,113 +5342,100 @@ snapshots:
       - tsx
       - yaml
 
-  '@angular/cli@22.0.4(@types/node@26.0.1)(chokidar@5.0.0)':
+  '@angular/cli@22.1.2(@types/node@26.1.2)(chokidar@5.0.0)(supports-color@10.2.2)':
     dependencies:
-      '@angular-devkit/architect': 0.2200.4(chokidar@5.0.0)
-      '@angular-devkit/core': 22.0.4(chokidar@5.0.0)
-      '@angular-devkit/schematics': 22.0.4(chokidar@5.0.0)
-      '@inquirer/prompts': 8.4.2(@types/node@26.0.1)
-      '@listr2/prompt-adapter-inquirer': 4.2.3(@inquirer/prompts@8.4.2(@types/node@26.0.1))(@types/node@26.0.1)(listr2@10.2.1)
-      '@modelcontextprotocol/sdk': 1.29.0(zod@4.4.2)
-      '@schematics/angular': 22.0.4(chokidar@5.0.0)
-      '@yarnpkg/lockfile': 1.1.0
-      algoliasearch: 5.52.0
-      ini: 6.0.0
+      '@angular-devkit/architect': 0.2201.2(chokidar@5.0.0)
+      '@angular-devkit/core': 22.1.2(chokidar@5.0.0)
+      '@angular-devkit/schematics': 22.1.2(chokidar@5.0.0)
+      '@inquirer/prompts': 8.5.2(@types/node@26.1.2)
+      '@listr2/prompt-adapter-inquirer': 4.2.4(@inquirer/prompts@8.5.2(@types/node@26.1.2))(@types/node@26.1.2)(listr2@10.2.2)
+      '@modelcontextprotocol/sdk': 1.29.0(supports-color@10.2.2)(zod@4.4.3)
+      '@schematics/angular': 22.1.2(chokidar@5.0.0)
       jsonc-parser: 3.3.1
-      listr2: 10.2.1
-      npm-package-arg: 13.0.2
-      pacote: 21.5.1
+      listr2: 10.2.2
+      npm-package-arg: 14.0.0
       parse5-html-rewriting-stream: 8.0.1
-      semver: 7.7.4
+      semver: 7.8.5
       yargs: 18.0.0
-      zod: 4.4.2
+      zod: 4.4.3
     transitivePeerDependencies:
       - '@cfworker/json-schema'
       - '@types/node'
       - chokidar
       - supports-color
 
-  '@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
+  '@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/core': 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/compiler-cli@22.0.4(@angular/compiler@22.0.4)(typescript@6.0.3)':
+  '@angular/compiler-cli@22.1.0(@angular/compiler@22.1.0)(typescript@6.0.3)':
     dependencies:
-      '@angular/compiler': 22.0.4
-      '@babel/core': 7.29.7
+      '@angular/compiler': 22.1.0
+      '@babel/core': 8.0.1
       '@jridgewell/sourcemap-codec': 1.5.5
       chokidar: 5.0.0
       convert-source-map: 1.9.0
       reflect-metadata: 0.2.2
       semver: 7.8.5
       tslib: 2.8.1
-      yargs: 18.0.0
+      yargs: 18.1.0
     optionalDependencies:
       typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
 
-  '@angular/compiler@22.0.4':
+  '@angular/compiler@22.1.0':
     dependencies:
       tslib: 2.8.1
 
-  '@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)':
+  '@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)':
     dependencies:
       rxjs: 7.8.2
       tslib: 2.8.1
     optionalDependencies:
-      '@angular/compiler': 22.0.4
+      '@angular/compiler': 22.1.0
       zone.js: 0.16.2
 
-  '@angular/forms@22.0.4(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
+  '@angular/forms@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
-      '@angular/platform-browser': 22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))
+      '@angular/common': 22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))
       '@standard-schema/spec': 1.1.0
       rxjs: 7.8.2
       tslib: 2.8.1
       zod: 4.4.3
 
-  '@angular/language-service@22.0.4': {}
+  '@angular/language-service@22.1.0': {}
 
-  '@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))':
+  '@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))':
     dependencies:
-      '@angular/common': 22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/common': 22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
-    optionalDependencies:
-      '@angular/animations': 22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))
 
-  '@angular/router@22.0.4(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
+  '@angular/router@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
-      '@angular/core': 22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)
-      '@angular/platform-browser': 22.0.4(@angular/animations@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@22.0.4(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.4(@angular/compiler@22.0.4)(rxjs@7.8.2)(zone.js@0.16.2))
+      '@angular/common': 22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.1.0(@angular/common@22.1.0(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.1.0(@angular/compiler@22.1.0)(rxjs@7.8.2)(zone.js@0.16.2))
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@asamuzakjp/css-color@5.1.11':
+  '@asamuzakjp/css-color@6.0.5':
     dependencies:
-      '@asamuzakjp/generational-cache': 1.0.1
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      '@csstools/css-color-parser': 4.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-color-parser': 4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
+      lru-cache: 11.5.2
 
-  '@asamuzakjp/dom-selector@7.1.1':
+  '@asamuzakjp/dom-selector@8.3.0':
     dependencies:
-      '@asamuzakjp/generational-cache': 1.0.1
-      '@asamuzakjp/nwsapi': 2.3.9
       bidi-js: 1.0.3
       css-tree: 3.2.1
       is-potential-custom-element-name: 1.0.1
-
-  '@asamuzakjp/generational-cache@1.0.1': {}
-
-  '@asamuzakjp/nwsapi@2.3.9': {}
+      lru-cache: 11.5.2
 
   '@babel/code-frame@7.29.7':
     dependencies:
@@ -5687,28 +5443,54 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
+  '@babel/code-frame@8.0.0':
+    dependencies:
+      '@babel/helper-validator-identifier': 8.0.4
+      js-tokens: 10.0.0
+
   '@babel/compat-data@7.29.7': {}
 
-  '@babel/core@7.29.7':
+  '@babel/compat-data@8.0.0': {}
+
+  '@babel/core@7.29.7(supports-color@10.2.2)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.7
       '@babel/helper-compilation-targets': 7.29.7
-      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/helpers': 7.29.7
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/core@8.0.1':
+    dependencies:
+      '@babel/code-frame': 8.0.0
+      '@babel/generator': 8.0.0
+      '@babel/helper-compilation-targets': 8.0.0
+      '@babel/helpers': 8.0.0
+      '@babel/parser': 8.0.4
+      '@babel/template': 8.0.0
+      '@babel/traverse': 8.0.4
+      '@babel/types': 8.0.4
+      '@types/gensync': 1.0.5
+      convert-source-map: 2.0.0
+      empathic: 2.0.1
+      gensync: 1.0.0-beta.2
+      import-meta-resolve: 4.2.0
+      json5: 2.2.3
+      obug: 2.1.4
+      semver: 7.8.5
+
   '@babel/generator@7.29.7':
     dependencies:
       '@babel/parser': 7.29.7
@@ -5717,62 +5499,102 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
-  '@babel/helper-annotate-as-pure@7.27.3':
+  '@babel/generator@8.0.0':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/parser': 8.0.4
+      '@babel/types': 8.0.4
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      '@types/jsesc': 2.5.1
+      jsesc: 3.1.0
+
+  '@babel/helper-annotate-as-pure@8.0.0':
+    dependencies:
+      '@babel/types': 8.0.4
 
   '@babel/helper-compilation-targets@7.29.7':
     dependencies:
       '@babel/compat-data': 7.29.7
       '@babel/helper-validator-option': 7.29.7
-      browserslist: 4.28.4
+      browserslist: 4.28.7
       lru-cache: 5.1.1
       semver: 6.3.1
 
+  '@babel/helper-compilation-targets@8.0.0':
+    dependencies:
+      '@babel/compat-data': 8.0.0
+      '@babel/helper-validator-option': 8.0.0
+      browserslist: 4.28.7
+      lru-cache: 11.5.2
+      semver: 7.8.5
+
   '@babel/helper-globals@7.29.7': {}
 
-  '@babel/helper-module-imports@7.29.7':
+  '@babel/helper-globals@8.0.0': {}
+
+  '@babel/helper-module-imports@7.29.7(supports-color@10.2.2)':
     dependencies:
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
-      '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
+      '@babel/helper-module-imports': 7.29.7(supports-color@10.2.2)
       '@babel/helper-validator-identifier': 7.29.7
-      '@babel/traverse': 7.29.7
+      '@babel/traverse': 7.29.7(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-split-export-declaration@7.24.7':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
 
   '@babel/helper-string-parser@7.29.7': {}
 
+  '@babel/helper-string-parser@8.0.0': {}
+
   '@babel/helper-validator-identifier@7.29.7': {}
 
+  '@babel/helper-validator-identifier@8.0.4': {}
+
   '@babel/helper-validator-option@7.29.7': {}
 
+  '@babel/helper-validator-option@8.0.0': {}
+
   '@babel/helpers@7.29.7':
     dependencies:
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
 
+  '@babel/helpers@8.0.0':
+    dependencies:
+      '@babel/template': 8.0.0
+      '@babel/types': 8.0.4
+
   '@babel/parser@7.29.7':
     dependencies:
       '@babel/types': 7.29.7
 
+  '@babel/parser@8.0.4':
+    dependencies:
+      '@babel/types': 8.0.4
+
   '@babel/template@7.29.7':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
 
-  '@babel/traverse@7.29.7':
+  '@babel/template@8.0.0':
+    dependencies:
+      '@babel/code-frame': 8.0.0
+      '@babel/parser': 8.0.4
+      '@babel/types': 8.0.4
+
+  '@babel/traverse@7.29.7(supports-color@10.2.2)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.7
@@ -5780,35 +5602,55 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
       '@babel/types': 7.29.7
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@8.0.4':
+    dependencies:
+      '@babel/code-frame': 8.0.0
+      '@babel/generator': 8.0.0
+      '@babel/helper-globals': 8.0.0
+      '@babel/parser': 8.0.4
+      '@babel/template': 8.0.0
+      '@babel/types': 8.0.4
+      obug: 2.1.4
+
   '@babel/types@7.29.7':
     dependencies:
       '@babel/helper-string-parser': 7.29.7
       '@babel/helper-validator-identifier': 7.29.7
 
+  '@babel/types@7.29.8':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
+  '@babel/types@8.0.4':
+    dependencies:
+      '@babel/helper-string-parser': 8.0.0
+      '@babel/helper-validator-identifier': 8.0.4
+
   '@bcoe/v8-coverage@1.0.2': {}
 
   '@bramus/specificity@2.4.2':
     dependencies:
       css-tree: 3.2.1
 
-  '@bufbuild/protobuf@2.12.1':
+  '@bufbuild/protobuf@2.13.0':
     optional: true
 
-  '@csstools/color-helpers@6.0.2': {}
+  '@csstools/color-helpers@6.1.0': {}
 
-  '@csstools/css-calc@3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-calc@3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-color-parser@4.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-color-parser@4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      '@csstools/color-helpers': 6.0.2
-      '@csstools/css-calc': 3.2.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/color-helpers': 6.1.0
+      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
@@ -5816,7 +5658,7 @@ snapshots:
     dependencies:
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.4(css-tree@3.2.1)':
+  '@csstools/css-syntax-patches-for-csstree@1.1.7(css-tree@3.2.1)':
     optionalDependencies:
       css-tree: 3.2.1
 
@@ -5828,189 +5670,138 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/core@1.11.2':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.2
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/core@1.11.3':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.3
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/runtime@1.11.1':
     dependencies:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/runtime@1.11.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/runtime@1.11.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/wasi-threads@1.2.2':
     dependencies:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/wasi-threads@1.2.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@endo/cache-map@1.1.0': {}
 
   '@endo/env-options@1.1.11': {}
 
   '@endo/immutable-arraybuffer@1.1.2': {}
 
-  '@esbuild/aix-ppc64@0.27.2':
-    optional: true
-
   '@esbuild/aix-ppc64@0.28.1':
     optional: true
 
-  '@esbuild/android-arm64@0.27.2':
-    optional: true
-
   '@esbuild/android-arm64@0.28.1':
     optional: true
 
-  '@esbuild/android-arm@0.27.2':
-    optional: true
-
   '@esbuild/android-arm@0.28.1':
     optional: true
 
-  '@esbuild/android-x64@0.27.2':
-    optional: true
-
   '@esbuild/android-x64@0.28.1':
     optional: true
 
-  '@esbuild/darwin-arm64@0.27.2':
-    optional: true
-
   '@esbuild/darwin-arm64@0.28.1':
     optional: true
 
-  '@esbuild/darwin-x64@0.27.2':
-    optional: true
-
   '@esbuild/darwin-x64@0.28.1':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.28.1':
     optional: true
 
-  '@esbuild/freebsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/freebsd-x64@0.28.1':
     optional: true
 
-  '@esbuild/linux-arm64@0.27.2':
-    optional: true
-
   '@esbuild/linux-arm64@0.28.1':
     optional: true
 
-  '@esbuild/linux-arm@0.27.2':
-    optional: true
-
   '@esbuild/linux-arm@0.28.1':
     optional: true
 
-  '@esbuild/linux-ia32@0.27.2':
-    optional: true
-
   '@esbuild/linux-ia32@0.28.1':
     optional: true
 
-  '@esbuild/linux-loong64@0.27.2':
-    optional: true
-
   '@esbuild/linux-loong64@0.28.1':
     optional: true
 
-  '@esbuild/linux-mips64el@0.27.2':
-    optional: true
-
   '@esbuild/linux-mips64el@0.28.1':
     optional: true
 
-  '@esbuild/linux-ppc64@0.27.2':
-    optional: true
-
   '@esbuild/linux-ppc64@0.28.1':
     optional: true
 
-  '@esbuild/linux-riscv64@0.27.2':
-    optional: true
-
   '@esbuild/linux-riscv64@0.28.1':
     optional: true
 
-  '@esbuild/linux-s390x@0.27.2':
-    optional: true
-
   '@esbuild/linux-s390x@0.28.1':
     optional: true
 
-  '@esbuild/linux-x64@0.27.2':
-    optional: true
-
   '@esbuild/linux-x64@0.28.1':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/netbsd-arm64@0.28.1':
     optional: true
 
-  '@esbuild/netbsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/netbsd-x64@0.28.1':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.27.2':
-    optional: true
-
   '@esbuild/openbsd-arm64@0.28.1':
     optional: true
 
-  '@esbuild/openbsd-x64@0.27.2':
-    optional: true
-
   '@esbuild/openbsd-x64@0.28.1':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.27.2':
-    optional: true
-
   '@esbuild/openharmony-arm64@0.28.1':
     optional: true
 
-  '@esbuild/sunos-x64@0.27.2':
-    optional: true
-
   '@esbuild/sunos-x64@0.28.1':
     optional: true
 
-  '@esbuild/win32-arm64@0.27.2':
-    optional: true
-
   '@esbuild/win32-arm64@0.28.1':
     optional: true
 
-  '@esbuild/win32-ia32@0.27.2':
-    optional: true
-
   '@esbuild/win32-ia32@0.28.1':
     optional: true
 
-  '@esbuild/win32-x64@0.27.2':
-    optional: true
-
   '@esbuild/win32-x64@0.28.1':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.1(eslint@10.6.0(jiti@2.7.0))':
+  '@eslint-community/eslint-utils@4.9.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))':
     dependencies:
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.2': {}
 
-  '@eslint/config-array@0.23.5':
+  '@eslint/config-array@0.23.5(supports-color@10.2.2)':
     dependencies:
       '@eslint/object-schema': 3.0.5
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       minimatch: 10.2.5
     transitivePeerDependencies:
       - supports-color
@@ -6023,9 +5814,9 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/js@10.0.1(eslint@10.6.0(jiti@2.7.0))':
+  '@eslint/js@10.0.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))':
     optionalDependencies:
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
 
   '@eslint/object-schema@3.0.5': {}
 
@@ -6036,8 +5827,6 @@ snapshots:
 
   '@exodus/bytes@1.15.1': {}
 
-  '@gar/promise-retry@1.0.3': {}
-
   '@gerrit0/mini-shiki@3.23.0':
     dependencies:
       '@shikijs/engine-oniguruma': 3.23.0
@@ -6049,9 +5838,9 @@ snapshots:
   '@harperfast/extended-iterable@1.0.3':
     optional: true
 
-  '@hono/node-server@1.19.14(hono@4.12.27)':
+  '@hono/node-server@2.0.12(hono@4.12.34)':
     dependencies:
-      hono: 4.12.27
+      hono: 4.12.34
 
   '@humanfs/core@0.19.2':
     dependencies:
@@ -6071,133 +5860,122 @@ snapshots:
 
   '@inquirer/ansi@2.0.7': {}
 
-  '@inquirer/checkbox@5.2.1(@types/node@26.0.1)':
+  '@inquirer/checkbox@5.2.1(@types/node@26.1.2)':
     dependencies:
       '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
       '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/confirm@6.0.12(@types/node@26.0.1)':
+  '@inquirer/confirm@6.1.1(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/confirm@6.1.1(@types/node@26.0.1)':
-    dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
-    optionalDependencies:
-      '@types/node': 26.0.1
-
-  '@inquirer/core@11.2.1(@types/node@26.0.1)':
+  '@inquirer/core@11.2.1(@types/node@26.1.2)':
     dependencies:
       '@inquirer/ansi': 2.0.7
       '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
       cli-width: 4.1.0
       fast-wrap-ansi: 0.2.2
       mute-stream: 3.0.0
       signal-exit: 4.1.0
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/editor@5.2.2(@types/node@26.0.1)':
+  '@inquirer/editor@5.2.2(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/external-editor': 3.0.3(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/external-editor': 3.0.3(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/expand@5.1.1(@types/node@26.0.1)':
+  '@inquirer/expand@5.1.1(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/external-editor@3.0.3(@types/node@26.0.1)':
+  '@inquirer/external-editor@3.0.3(@types/node@26.1.2)':
     dependencies:
       chardet: 2.2.0
-      iconv-lite: 0.7.2
+      iconv-lite: 0.7.3
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@inquirer/figures@2.0.7': {}
 
-  '@inquirer/input@5.1.2(@types/node@26.0.1)':
+  '@inquirer/input@5.1.2(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/number@4.1.1(@types/node@26.0.1)':
+  '@inquirer/number@4.1.1(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/password@5.1.1(@types/node@26.0.1)':
+  '@inquirer/password@5.1.1(@types/node@26.1.2)':
     dependencies:
       '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/prompts@8.4.2(@types/node@26.0.1)':
+  '@inquirer/prompts@8.5.2(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/checkbox': 5.2.1(@types/node@26.0.1)
-      '@inquirer/confirm': 6.1.1(@types/node@26.0.1)
-      '@inquirer/editor': 5.2.2(@types/node@26.0.1)
-      '@inquirer/expand': 5.1.1(@types/node@26.0.1)
-      '@inquirer/input': 5.1.2(@types/node@26.0.1)
-      '@inquirer/number': 4.1.1(@types/node@26.0.1)
-      '@inquirer/password': 5.1.1(@types/node@26.0.1)
-      '@inquirer/rawlist': 5.3.1(@types/node@26.0.1)
-      '@inquirer/search': 4.2.1(@types/node@26.0.1)
-      '@inquirer/select': 5.2.1(@types/node@26.0.1)
+      '@inquirer/checkbox': 5.2.1(@types/node@26.1.2)
+      '@inquirer/confirm': 6.1.1(@types/node@26.1.2)
+      '@inquirer/editor': 5.2.2(@types/node@26.1.2)
+      '@inquirer/expand': 5.1.1(@types/node@26.1.2)
+      '@inquirer/input': 5.1.2(@types/node@26.1.2)
+      '@inquirer/number': 4.1.1(@types/node@26.1.2)
+      '@inquirer/password': 5.1.1(@types/node@26.1.2)
+      '@inquirer/rawlist': 5.3.1(@types/node@26.1.2)
+      '@inquirer/search': 4.2.1(@types/node@26.1.2)
+      '@inquirer/select': 5.2.1(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/rawlist@5.3.1(@types/node@26.0.1)':
+  '@inquirer/rawlist@5.3.1(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/search@4.2.1(@types/node@26.0.1)':
+  '@inquirer/search@4.2.1(@types/node@26.1.2)':
     dependencies:
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
       '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/select@5.2.1(@types/node@26.0.1)':
+  '@inquirer/select@5.2.1(@types/node@26.1.2)':
     dependencies:
       '@inquirer/ansi': 2.0.7
-      '@inquirer/core': 11.2.1(@types/node@26.0.1)
+      '@inquirer/core': 11.2.1(@types/node@26.1.2)
       '@inquirer/figures': 2.0.7
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
-  '@inquirer/type@4.0.7(@types/node@26.0.1)':
+  '@inquirer/type@4.0.7(@types/node@26.1.2)':
     optionalDependencies:
-      '@types/node': 26.0.1
-
-  '@isaacs/fs-minipass@4.0.1':
-    dependencies:
-      minipass: 7.1.3
+      '@types/node': 26.1.2
 
   '@istanbuljs/schema@0.1.6':
     optional: true
@@ -6227,56 +6005,56 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@listr2/prompt-adapter-inquirer@4.2.3(@inquirer/prompts@8.4.2(@types/node@26.0.1))(@types/node@26.0.1)(listr2@10.2.1)':
+  '@listr2/prompt-adapter-inquirer@4.2.4(@inquirer/prompts@8.5.2(@types/node@26.1.2))(@types/node@26.1.2)(listr2@10.2.2)':
     dependencies:
-      '@inquirer/prompts': 8.4.2(@types/node@26.0.1)
-      '@inquirer/type': 4.0.7(@types/node@26.0.1)
-      listr2: 10.2.1
+      '@inquirer/prompts': 8.5.2(@types/node@26.1.2)
+      '@inquirer/type': 4.0.7(@types/node@26.1.2)
+      listr2: 10.2.2
     transitivePeerDependencies:
       - '@types/node'
 
-  '@lmdb/lmdb-darwin-arm64@3.5.4':
+  '@lmdb/lmdb-darwin-arm64@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-darwin-x64@3.5.4':
+  '@lmdb/lmdb-darwin-x64@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-linux-arm64@3.5.4':
+  '@lmdb/lmdb-linux-arm64@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-linux-arm@3.5.4':
+  '@lmdb/lmdb-linux-arm@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-linux-x64@3.5.4':
+  '@lmdb/lmdb-linux-x64@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-win32-arm64@3.5.4':
+  '@lmdb/lmdb-win32-arm64@3.5.6':
     optional: true
 
-  '@lmdb/lmdb-win32-x64@3.5.4':
+  '@lmdb/lmdb-win32-x64@3.5.6':
     optional: true
 
-  '@microsoft/api-extractor-model@7.32.2(@types/node@26.0.1)':
+  '@microsoft/api-extractor-model@7.32.2(@types/node@26.1.2)':
     dependencies:
       '@microsoft/tsdoc': 0.16.0
       '@microsoft/tsdoc-config': 0.18.1
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.0.1)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
     transitivePeerDependencies:
       - '@types/node'
     optional: true
 
-  '@microsoft/api-extractor@7.56.0(@types/node@26.0.1)':
+  '@microsoft/api-extractor@7.56.0(@types/node@26.1.2)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.32.2(@types/node@26.0.1)
+      '@microsoft/api-extractor-model': 7.32.2(@types/node@26.1.2)
       '@microsoft/tsdoc': 0.16.0
       '@microsoft/tsdoc-config': 0.18.1
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.0.1)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
       '@rushstack/rig-package': 0.6.0
-      '@rushstack/terminal': 0.21.0(@types/node@26.0.1)
-      '@rushstack/ts-command-line': 5.1.7(@types/node@26.0.1)
+      '@rushstack/terminal': 0.21.0(@types/node@26.1.2)
+      '@rushstack/ts-command-line': 5.1.7(@types/node@26.1.2)
       diff: 8.0.4
       lodash: 4.18.1
-      minimatch: 10.2.5
+      minimatch: 10.2.6
       resolve: 1.22.12
       semver: 7.5.4
       source-map: 0.6.1
@@ -6296,9 +6074,9 @@ snapshots:
   '@microsoft/tsdoc@0.16.0':
     optional: true
 
-  '@modelcontextprotocol/sdk@1.29.0(zod@4.4.2)':
+  '@modelcontextprotocol/sdk@1.29.0(supports-color@10.2.2)(zod@4.4.3)':
     dependencies:
-      '@hono/node-server': 1.19.14(hono@4.12.27)
+      '@hono/node-server': 2.0.12(hono@4.12.34)
       ajv: 8.20.0
       ajv-formats: 3.0.1(ajv@8.20.0)
       content-type: 1.0.5
@@ -6306,15 +6084,15 @@ snapshots:
       cross-spawn: 7.0.6
       eventsource: 3.0.7
       eventsource-parser: 3.1.0
-      express: 5.2.1
-      express-rate-limit: 8.5.2(express@5.2.1)
-      hono: 4.12.27
-      jose: 6.2.3
+      express: 5.2.1(supports-color@10.2.2)
+      express-rate-limit: 8.6.1(express@5.2.1(supports-color@10.2.2))(supports-color@10.2.2)
+      hono: 4.12.34
+      jose: 6.2.8
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.1
       raw-body: 3.0.2
-      zod: 4.4.2
-      zod-to-json-schema: 3.25.2(zod@4.4.2)
+      zod: 4.4.3
+      zod-to-json-schema: 3.25.2(zod@4.4.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -6441,191 +6219,301 @@ snapshots:
 
   '@napi-rs/wasm-runtime@1.0.7':
     dependencies:
-      '@emnapi/core': 1.11.1
-      '@emnapi/runtime': 1.11.1
+      '@emnapi/core': 1.11.3
+      '@emnapi/runtime': 1.11.3
       '@tybys/wasm-util': 0.10.3
     optional: true
 
-  '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
     dependencies:
       '@emnapi/core': 1.11.1
       '@emnapi/runtime': 1.11.1
       '@tybys/wasm-util': 0.10.3
     optional: true
 
-  '@npmcli/agent@4.0.2':
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)':
     dependencies:
-      agent-base: 7.1.4
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
-      lru-cache: 11.5.1
-      socks-proxy-agent: 8.0.5
-    transitivePeerDependencies:
-      - supports-color
+      '@emnapi/core': 1.11.2
+      '@emnapi/runtime': 1.11.2
+      '@tybys/wasm-util': 0.10.3
+    optional: true
 
-  '@npmcli/fs@5.0.0':
+  '@oxc-parser/binding-android-arm-eabi@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-android-arm64@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-arm64@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-x64@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-freebsd-x64@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-musleabihf@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-musl@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-ppc64-gnu@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-gnu@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-gnu@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-musl@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-openharmony-arm64@0.142.0':
+    optional: true
+
+  '@oxc-parser/binding-wasm32-wasi@0.142.0':
     dependencies:
-      semver: 7.7.4
-
-  '@npmcli/git@7.0.2':
-    dependencies:
-      '@gar/promise-retry': 1.0.3
-      '@npmcli/promise-spawn': 9.0.1
-      ini: 6.0.0
-      lru-cache: 11.5.1
-      npm-pick-manifest: 11.0.3
-      proc-log: 6.1.0
-      semver: 7.7.4
-      which: 6.0.1
-
-  '@npmcli/installed-package-contents@4.0.0':
-    dependencies:
-      npm-bundled: 5.0.0
-      npm-normalize-package-bin: 5.0.0
-
-  '@npmcli/node-gyp@5.0.0': {}
-
-  '@npmcli/package-json@7.0.5':
-    dependencies:
-      '@npmcli/git': 7.0.2
-      glob: 13.0.6
-      hosted-git-info: 9.0.3
-      json-parse-even-better-errors: 5.0.0
-      proc-log: 6.1.0
-      semver: 7.7.4
-      spdx-expression-parse: 4.0.0
-
-  '@npmcli/promise-spawn@9.0.1':
-    dependencies:
-      which: 6.0.1
-
-  '@npmcli/redact@4.0.0': {}
-
-  '@npmcli/run-script@10.0.4':
-    dependencies:
-      '@npmcli/node-gyp': 5.0.0
-      '@npmcli/package-json': 7.0.5
-      '@npmcli/promise-spawn': 9.0.1
-      node-gyp: 12.4.0
-      proc-log: 6.1.0
-
-  '@oxc-project/types@0.137.0': {}
-
-  '@parcel/watcher-android-arm64@2.5.6':
+      '@emnapi/core': 1.11.2
+      '@emnapi/runtime': 1.11.2
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)
     optional: true
 
-  '@parcel/watcher-darwin-arm64@2.5.6':
+  '@oxc-parser/binding-win32-arm64-msvc@0.142.0':
     optional: true
 
-  '@parcel/watcher-darwin-x64@2.5.6':
+  '@oxc-parser/binding-win32-ia32-msvc@0.142.0':
     optional: true
 
-  '@parcel/watcher-freebsd-x64@2.5.6':
+  '@oxc-parser/binding-win32-x64-msvc@0.142.0':
     optional: true
 
-  '@parcel/watcher-linux-arm-glibc@2.5.6':
+  '@oxc-project/types@0.139.0': {}
+
+  '@oxc-project/types@0.140.0': {}
+
+  '@oxc-project/types@0.142.0': {}
+
+  '@parcel/watcher-android-arm64@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm-musl@2.5.6':
+  '@parcel/watcher-darwin-arm64@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm64-glibc@2.5.6':
+  '@parcel/watcher-darwin-x64@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-arm64-musl@2.5.6':
+  '@parcel/watcher-freebsd-x64@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-x64-glibc@2.5.6':
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher-linux-x64-musl@2.5.6':
+  '@parcel/watcher-linux-arm-musl@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-arm64@2.5.6':
+  '@parcel/watcher-linux-arm64-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-ia32@2.5.6':
+  '@parcel/watcher-linux-arm64-musl@2.6.0':
     optional: true
 
-  '@parcel/watcher-win32-x64@2.5.6':
+  '@parcel/watcher-linux-x64-glibc@2.6.0':
     optional: true
 
-  '@parcel/watcher@2.5.6':
+  '@parcel/watcher-linux-x64-musl@2.6.0':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.6.0':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.6.0':
+    optional: true
+
+  '@parcel/watcher@2.6.0':
     dependencies:
       detect-libc: 2.1.2
       is-glob: 4.0.3
       node-addon-api: 7.1.1
-      picomatch: 4.0.4
+      picomatch: 4.0.5
     optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.6
-      '@parcel/watcher-darwin-arm64': 2.5.6
-      '@parcel/watcher-darwin-x64': 2.5.6
-      '@parcel/watcher-freebsd-x64': 2.5.6
-      '@parcel/watcher-linux-arm-glibc': 2.5.6
-      '@parcel/watcher-linux-arm-musl': 2.5.6
-      '@parcel/watcher-linux-arm64-glibc': 2.5.6
-      '@parcel/watcher-linux-arm64-musl': 2.5.6
-      '@parcel/watcher-linux-x64-glibc': 2.5.6
-      '@parcel/watcher-linux-x64-musl': 2.5.6
-      '@parcel/watcher-win32-arm64': 2.5.6
-      '@parcel/watcher-win32-ia32': 2.5.6
-      '@parcel/watcher-win32-x64': 2.5.6
+      '@parcel/watcher-android-arm64': 2.6.0
+      '@parcel/watcher-darwin-arm64': 2.6.0
+      '@parcel/watcher-darwin-x64': 2.6.0
+      '@parcel/watcher-freebsd-x64': 2.6.0
+      '@parcel/watcher-linux-arm-glibc': 2.6.0
+      '@parcel/watcher-linux-arm-musl': 2.6.0
+      '@parcel/watcher-linux-arm64-glibc': 2.6.0
+      '@parcel/watcher-linux-arm64-musl': 2.6.0
+      '@parcel/watcher-linux-x64-glibc': 2.6.0
+      '@parcel/watcher-linux-x64-musl': 2.6.0
+      '@parcel/watcher-win32-arm64': 2.6.0
+      '@parcel/watcher-win32-x64': 2.6.0
     optional: true
 
+  '@penpot/plugin-styles@1.4.2': {}
+
+  '@penpot/plugin-types@1.4.2': {}
+
   '@polka/url@1.0.0-next.29': {}
 
-  '@puppeteer/browsers@3.0.5':
+  '@puppeteer/browsers@3.0.6':
     dependencies:
-      modern-tar: 0.7.6
-      yargs: 18.0.0
+      modern-tar: 0.7.7
+      yargs: 18.1.0
 
-  '@rolldown/binding-android-arm64@1.1.3':
+  '@rolldown/binding-android-arm64@1.1.5':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.1.3':
+  '@rolldown/binding-android-arm64@1.2.0':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.1.3':
+  '@rolldown/binding-android-arm64@1.2.2':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.1.3':
+  '@rolldown/binding-darwin-arm64@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.1.3':
+  '@rolldown/binding-darwin-arm64@1.2.0':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.1.3':
+  '@rolldown/binding-darwin-arm64@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.1.3':
+  '@rolldown/binding-darwin-x64@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.1.3':
+  '@rolldown/binding-darwin-x64@1.2.0':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.1.3':
+  '@rolldown/binding-darwin-x64@1.2.2':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.1.3':
+  '@rolldown/binding-freebsd-x64@1.1.5':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.1.3':
+  '@rolldown/binding-freebsd-x64@1.2.0':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.1.3':
+  '@rolldown/binding-freebsd-x64@1.2.2':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.1.3':
+  '@rolldown/binding-linux-arm-gnueabihf@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-gnu@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-gnu@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-gnu@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-musl@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-musl@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-musl@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-ppc64-gnu@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-ppc64-gnu@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-ppc64-gnu@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-s390x-gnu@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-s390x-gnu@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-s390x-gnu@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-x64-gnu@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-x64-gnu@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-x64-gnu@1.2.2':
+    optional: true
+
+  '@rolldown/binding-linux-x64-musl@1.1.5':
+    optional: true
+
+  '@rolldown/binding-linux-x64-musl@1.2.0':
+    optional: true
+
+  '@rolldown/binding-linux-x64-musl@1.2.2':
+    optional: true
+
+  '@rolldown/binding-openharmony-arm64@1.1.5':
+    optional: true
+
+  '@rolldown/binding-openharmony-arm64@1.2.0':
+    optional: true
+
+  '@rolldown/binding-openharmony-arm64@1.2.2':
+    optional: true
+
+  '@rolldown/binding-wasm32-wasi@1.1.5':
     dependencies:
       '@emnapi/core': 1.11.1
       '@emnapi/runtime': 1.11.1
-      '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.1.3':
+  '@rolldown/binding-wasm32-wasi@1.2.0':
+    dependencies:
+      '@emnapi/core': 1.11.2
+      '@emnapi/runtime': 1.11.2
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.1.3':
+  '@rolldown/binding-win32-arm64-msvc@1.1.5':
+    optional: true
+
+  '@rolldown/binding-win32-arm64-msvc@1.2.0':
+    optional: true
+
+  '@rolldown/binding-win32-arm64-msvc@1.2.2':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.1.5':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.2.0':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.2.2':
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
@@ -6634,157 +6522,82 @@ snapshots:
     dependencies:
       '@types/estree': 1.0.9
       estree-walker: 2.0.2
-      picomatch: 4.0.4
+      picomatch: 4.0.5
     optionalDependencies:
       rollup: 4.60.4
 
-  '@rollup/rollup-android-arm-eabi@4.60.2':
-    optional: true
-
   '@rollup/rollup-android-arm-eabi@4.60.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.60.2':
-    optional: true
-
   '@rollup/rollup-android-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.60.2':
-    optional: true
-
   '@rollup/rollup-darwin-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.60.2':
-    optional: true
-
   '@rollup/rollup-darwin-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.60.2':
-    optional: true
-
   '@rollup/rollup-freebsd-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.60.2':
-    optional: true
-
   '@rollup/rollup-freebsd-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-arm-musleabihf@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-arm64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-arm64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-loong64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-musl@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-loong64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-ppc64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-ppc64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-riscv64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-riscv64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-s390x-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-x64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.60.2':
-    optional: true
-
   '@rollup/rollup-linux-x64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-openbsd-x64@4.60.2':
-    optional: true
-
   '@rollup/rollup-openbsd-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.60.2':
-    optional: true
-
   '@rollup/rollup-openharmony-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.2':
-    optional: true
-
   '@rollup/rollup-win32-arm64-msvc@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.2':
-    optional: true
-
   '@rollup/rollup-win32-ia32-msvc@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.60.2':
-    optional: true
-
   '@rollup/rollup-win32-x64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.60.2':
-    optional: true
-
   '@rollup/rollup-win32-x64-msvc@4.60.4':
     optional: true
 
@@ -6848,7 +6661,7 @@ snapshots:
 
   '@rtsao/scc@1.1.0': {}
 
-  '@rushstack/node-core-library@5.19.1(@types/node@26.0.1)':
+  '@rushstack/node-core-library@5.19.1(@types/node@26.1.2)':
     dependencies:
       ajv: 8.20.0
       ajv-draft-04: 1.0.0(ajv@8.20.0)
@@ -6859,12 +6672,12 @@ snapshots:
       resolve: 1.22.12
       semver: 7.5.4
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
     optional: true
 
-  '@rushstack/problem-matcher@0.1.1(@types/node@26.0.1)':
+  '@rushstack/problem-matcher@0.1.1(@types/node@26.1.2)':
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
     optional: true
 
   '@rushstack/rig-package@0.6.0':
@@ -6873,18 +6686,18 @@ snapshots:
       strip-json-comments: 3.1.1
     optional: true
 
-  '@rushstack/terminal@0.21.0(@types/node@26.0.1)':
+  '@rushstack/terminal@0.21.0(@types/node@26.1.2)':
     dependencies:
-      '@rushstack/node-core-library': 5.19.1(@types/node@26.0.1)
-      '@rushstack/problem-matcher': 0.1.1(@types/node@26.0.1)
+      '@rushstack/node-core-library': 5.19.1(@types/node@26.1.2)
+      '@rushstack/problem-matcher': 0.1.1(@types/node@26.1.2)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
     optional: true
 
-  '@rushstack/ts-command-line@5.1.7(@types/node@26.0.1)':
+  '@rushstack/ts-command-line@5.1.7(@types/node@26.1.2)':
     dependencies:
-      '@rushstack/terminal': 0.21.0(@types/node@26.0.1)
+      '@rushstack/terminal': 0.21.0(@types/node@26.1.2)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
@@ -6892,15 +6705,19 @@ snapshots:
       - '@types/node'
     optional: true
 
-  '@schematics/angular@22.0.4(chokidar@5.0.0)':
+  '@schematics/angular@22.1.2(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.0.4(chokidar@5.0.0)
-      '@angular-devkit/schematics': 22.0.4(chokidar@5.0.0)
+      '@angular-devkit/core': 22.1.2(chokidar@5.0.0)
+      '@angular-devkit/schematics': 22.1.2(chokidar@5.0.0)
       jsonc-parser: 3.3.1
       typescript: 6.0.3
     transitivePeerDependencies:
       - chokidar
 
+  '@seahax/deep-copy@0.1.0': {}
+
+  '@seahax/semaphore@0.5.1': {}
+
   '@shikijs/engine-oniguruma@3.23.0':
     dependencies:
       '@shikijs/types': 3.23.0
@@ -6921,38 +6738,6 @@ snapshots:
 
   '@shikijs/vscode-textmate@10.0.2': {}
 
-  '@sigstore/bundle@4.0.0':
-    dependencies:
-      '@sigstore/protobuf-specs': 0.5.1
-
-  '@sigstore/core@3.2.1': {}
-
-  '@sigstore/protobuf-specs@0.5.1': {}
-
-  '@sigstore/sign@4.1.1':
-    dependencies:
-      '@gar/promise-retry': 1.0.3
-      '@sigstore/bundle': 4.0.0
-      '@sigstore/core': 3.2.1
-      '@sigstore/protobuf-specs': 0.5.1
-      make-fetch-happen: 15.0.6
-      proc-log: 6.1.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@sigstore/tuf@4.0.2':
-    dependencies:
-      '@sigstore/protobuf-specs': 0.5.1
-      tuf-js: 4.1.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@sigstore/verify@3.1.1':
-    dependencies:
-      '@sigstore/bundle': 4.0.0
-      '@sigstore/core': 3.2.1
-      '@sigstore/protobuf-specs': 0.5.1
-
   '@standard-schema/spec@1.1.0': {}
 
   '@swc/helpers@0.5.18':
@@ -6960,13 +6745,6 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
-  '@tufjs/canonical-json@2.0.0': {}
-
-  '@tufjs/models@4.1.0':
-    dependencies:
-      '@tufjs/canonical-json': 2.0.0
-      minimatch: 10.2.5
-
   '@tybys/wasm-util@0.10.3':
     dependencies:
       tslib: 2.8.1
@@ -6996,21 +6774,26 @@ snapshots:
 
   '@types/esrecurse@4.3.1': {}
 
-  '@types/estree@1.0.8': {}
+  '@types/estree@1.0.8':
+    optional: true
 
   '@types/estree@1.0.9': {}
 
   '@types/feather-icons@4.29.4': {}
 
+  '@types/gensync@1.0.5': {}
+
   '@types/hast@3.0.4':
     dependencies:
       '@types/unist': 3.0.3
 
+  '@types/jsesc@2.5.1': {}
+
   '@types/json-schema@7.0.15': {}
 
   '@types/json5@0.0.29': {}
 
-  '@types/node@26.0.1':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
@@ -7020,7 +6803,7 @@ snapshots:
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   '@types/yargs-parser@21.0.3': {}
 
@@ -7028,74 +6811,74 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  '@typescript-eslint/eslint-plugin@8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@typescript-eslint/eslint-plugin@8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.62.1
-      '@typescript-eslint/type-utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.62.1
-      eslint: 10.6.0(jiti@2.7.0)
-      ignore: 7.0.5
+      '@typescript-eslint/parser': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/type-utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.65.0
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
+      ignore: 7.0.6
       natural-compare: 1.4.0
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.62.1
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/typescript-estree': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.62.1
-      debug: 4.4.3
-      eslint: 10.6.0(jiti@2.7.0)
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.65.0
+      debug: 4.4.3(supports-color@10.2.2)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.62.1(typescript@6.0.3)':
+  '@typescript-eslint/project-service@8.65.0(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/types': 8.62.1
-      debug: 4.4.3
+      '@typescript-eslint/tsconfig-utils': 8.65.0(typescript@6.0.3)
+      '@typescript-eslint/types': 8.65.0
+      debug: 4.4.3(supports-color@10.2.2)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.62.1':
+  '@typescript-eslint/scope-manager@8.65.0':
     dependencies:
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/visitor-keys': 8.62.1
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/visitor-keys': 8.65.0
 
-  '@typescript-eslint/tsconfig-utils@8.62.1(typescript@6.0.3)':
+  '@typescript-eslint/tsconfig-utils@8.65.0(typescript@6.0.3)':
     dependencies:
       typescript: 6.0.3
 
-  '@typescript-eslint/type-utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@typescript-eslint/type-utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/typescript-estree': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      debug: 4.4.3
-      eslint: 10.6.0(jiti@2.7.0)
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      debug: 4.4.3(supports-color@10.2.2)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.62.1': {}
+  '@typescript-eslint/types@8.65.0': {}
 
-  '@typescript-eslint/typescript-estree@8.62.1(typescript@6.0.3)':
+  '@typescript-eslint/typescript-estree@8.65.0(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/tsconfig-utils': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/visitor-keys': 8.62.1
-      debug: 4.4.3
-      minimatch: 10.2.5
+      '@typescript-eslint/project-service': 8.65.0(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/tsconfig-utils': 8.65.0(typescript@6.0.3)
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/visitor-keys': 8.65.0
+      debug: 4.4.3(supports-color@10.2.2)
+      minimatch: 10.2.6
       semver: 7.8.5
       tinyglobby: 0.2.17
       ts-api-utils: 2.5.0(typescript@6.0.3)
@@ -7103,91 +6886,91 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)':
+  '@typescript-eslint/utils@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.6.0(jiti@2.7.0))
-      '@typescript-eslint/scope-manager': 8.62.1
-      '@typescript-eslint/types': 8.62.1
-      '@typescript-eslint/typescript-estree': 8.62.1(typescript@6.0.3)
-      eslint: 10.6.0(jiti@2.7.0)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(supports-color@10.2.2)(typescript@6.0.3)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.62.1':
+  '@typescript-eslint/visitor-keys@8.65.0':
     dependencies:
-      '@typescript-eslint/types': 8.62.1
+      '@typescript-eslint/types': 8.65.0
       eslint-visitor-keys: 5.0.1
 
-  '@vitejs/plugin-basic-ssl@2.3.0(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))':
+  '@vitejs/plugin-basic-ssl@2.3.0(vite@8.1.5(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))':
     dependencies:
-      vite: 7.3.5(@types/node@26.0.1)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 8.1.5(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
 
-  '@vitest/coverage-v8@4.1.9(vitest@4.1.9)':
+  '@vitest/coverage-v8@4.1.10(vitest@4.1.10)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.1.9
-      ast-v8-to-istanbul: 1.0.4
+      '@vitest/utils': 4.1.10
+      ast-v8-to-istanbul: 1.0.5
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-reports: 3.2.0
       magicast: 0.5.3
-      obug: 2.1.3
-      std-env: 4.1.0
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.0.1)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(happy-dom@20.10.6)(jsdom@29.1.1)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+      obug: 2.1.4
+      std-env: 4.2.0
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(happy-dom@20.11.1)(jsdom@30.0.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
 
-  '@vitest/expect@4.1.9':
+  '@vitest/expect@4.1.10':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
       chai: 6.2.2
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
-  '@vitest/mocker@4.1.9(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))':
+  '@vitest/mocker@4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))':
     dependencies:
-      '@vitest/spy': 4.1.9
+      '@vitest/spy': 4.1.10
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
 
-  '@vitest/pretty-format@4.1.9':
+  '@vitest/pretty-format@4.1.10':
     dependencies:
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
-  '@vitest/runner@4.1.9':
+  '@vitest/runner@4.1.10':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.10
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.9':
+  '@vitest/snapshot@4.1.10':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/utils': 4.1.10
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.1.9': {}
+  '@vitest/spy@4.1.10': {}
 
-  '@vitest/ui@4.1.9(vitest@4.1.9)':
+  '@vitest/ui@4.1.10(vitest@4.1.10)':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.10
       fflate: 0.8.3
-      flatted: 3.4.2
+      flatted: 3.4.3
       pathe: 2.0.3
       sirv: 3.0.2
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@26.0.1)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(happy-dom@20.10.6)(jsdom@29.1.1)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
+      tinyrainbow: 3.1.1
+      vitest: 4.1.10(@types/node@26.1.2)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(happy-dom@20.11.1)(jsdom@30.0.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
 
-  '@vitest/utils@4.1.9':
+  '@vitest/utils@4.1.10':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
+      '@vitest/pretty-format': 4.1.10
       convert-source-map: 2.0.0
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
 
   '@volar/language-core@2.4.28':
     dependencies:
@@ -7195,11 +6978,13 @@ snapshots:
 
   '@volar/source-map@2.4.28': {}
 
-  '@volar/typescript@2.4.28':
+  '@volar/typescript@2.4.28(typescript@6.0.3)':
     dependencies:
       '@volar/language-core': 2.4.28
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
+    optionalDependencies:
+      typescript: 6.0.3
 
   '@webassemblyjs/ast@1.14.1':
     dependencies:
@@ -7298,18 +7083,14 @@ snapshots:
   '@xtuc/long@4.2.2':
     optional: true
 
-  '@yarnpkg/lockfile@1.1.0': {}
-
-  abbrev@4.0.0: {}
-
   accepts@2.0.0:
     dependencies:
       mime-types: 3.0.2
       negotiator: 1.0.0
 
-  acorn-import-phases@1.0.4(acorn@8.17.0):
+  acorn-import-phases@1.0.4(acorn@8.18.0):
     dependencies:
-      acorn: 8.17.0
+      acorn: 8.18.0
     optional: true
 
   acorn-jsx@5.3.2(acorn@8.17.0):
@@ -7320,14 +7101,15 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.2:
+  acorn@8.18.0:
+    optional: true
+
+  agent-base@6.0.2(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  agent-base@7.1.4: {}
-
   agent-base@9.0.0: {}
 
   ajv-draft-04@1.0.0(ajv@8.20.0):
@@ -7360,7 +7142,7 @@ snapshots:
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.3
+      fast-uri: 3.1.5
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
     optional: true
@@ -7368,27 +7150,10 @@ snapshots:
   ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.2
+      fast-uri: 3.1.5
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
-  algoliasearch@5.52.0:
-    dependencies:
-      '@algolia/abtesting': 1.18.0
-      '@algolia/client-abtesting': 5.52.0
-      '@algolia/client-analytics': 5.52.0
-      '@algolia/client-common': 5.52.0
-      '@algolia/client-insights': 5.52.0
-      '@algolia/client-personalization': 5.52.0
-      '@algolia/client-query-suggestions': 5.52.0
-      '@algolia/client-search': 5.52.0
-      '@algolia/ingestion': 1.52.0
-      '@algolia/monitoring': 1.52.0
-      '@algolia/recommend': 5.52.0
-      '@algolia/requester-browser-xhr': 5.52.0
-      '@algolia/requester-fetch': 5.52.0
-      '@algolia/requester-node-http': 5.52.0
-
   ansi-escapes@7.3.0:
     dependencies:
       environment: 1.1.0
@@ -7482,7 +7247,7 @@ snapshots:
 
   ast-types-flow@0.0.8: {}
 
-  ast-v8-to-istanbul@1.0.4:
+  ast-v8-to-istanbul@1.0.5:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       estree-walker: 3.0.3
@@ -7498,11 +7263,11 @@ snapshots:
 
   axe-core@4.11.4: {}
 
-  axios@1.18.1:
+  axios@1.19.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@10.2.2))
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 5.0.1(supports-color@10.2.2)
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -7514,9 +7279,9 @@ snapshots:
 
   balanced-match@4.0.4: {}
 
-  baseline-browser-mapping@2.10.40: {}
+  baseline-browser-mapping@2.11.11: {}
 
-  beasties@0.4.2:
+  beasties@0.4.3:
     dependencies:
       css-select: 6.0.0
       css-what: 7.0.0
@@ -7524,9 +7289,9 @@ snapshots:
       domhandler: 5.0.3
       htmlparser2: 10.1.0
       picocolors: 1.1.1
-      postcss: 8.5.16
+      postcss: 8.5.25
       postcss-media-query-parser: 0.2.3
-      postcss-safe-parser: 7.0.1(postcss@8.5.16)
+      postcss-safe-parser: 7.0.1(postcss@8.5.25)
 
   bidi-js@1.0.3:
     dependencies:
@@ -7534,13 +7299,13 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  body-parser@2.3.0:
+  body-parser@2.3.0(supports-color@10.2.2):
     dependencies:
       bytes: 3.1.2
       content-type: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       http-errors: 2.0.1
-      iconv-lite: 0.7.2
+      iconv-lite: 0.7.3
       on-finished: 2.4.1
       qs: 6.15.3
       raw-body: 3.0.2
@@ -7550,12 +7315,12 @@ snapshots:
 
   boolbase@1.0.0: {}
 
-  brace-expansion@1.1.15:
+  brace-expansion@1.1.18:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@5.0.7:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -7563,35 +7328,22 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.28.4:
+  browserslist@4.28.7:
     dependencies:
-      baseline-browser-mapping: 2.10.40
-      caniuse-lite: 1.0.30001799
-      electron-to-chromium: 1.5.381
-      node-releases: 2.0.50
-      update-browserslist-db: 1.2.3(browserslist@4.28.4)
+      baseline-browser-mapping: 2.11.11
+      caniuse-lite: 1.0.30001806
+      electron-to-chromium: 1.5.399
+      node-releases: 2.0.51
+      update-browserslist-db: 1.2.3(browserslist@4.28.7)
 
   buffer-from@1.1.2: {}
 
   buffer-image-size@0.6.4:
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
 
   bytes@3.1.2: {}
 
-  cacache@20.0.4:
-    dependencies:
-      '@npmcli/fs': 5.0.0
-      fs-minipass: 3.0.3
-      glob: 13.0.6
-      lru-cache: 11.5.1
-      minipass: 7.1.3
-      minipass-collect: 2.0.1
-      minipass-flush: 1.0.7
-      minipass-pipeline: 1.2.4
-      p-map: 7.0.4
-      ssri: 13.0.1
-
   call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
@@ -7609,7 +7361,7 @@ snapshots:
       call-bind-apply-helpers: 1.0.2
       get-intrinsic: 1.3.0
 
-  caniuse-lite@1.0.30001799: {}
+  caniuse-lite@1.0.30001806: {}
 
   chai@6.2.2: {}
 
@@ -7632,19 +7384,18 @@ snapshots:
   chokidar@4.0.3:
     dependencies:
       readdirp: 4.1.2
+    optional: true
 
   chokidar@5.0.0:
     dependencies:
       readdirp: 5.0.0
 
-  chownr@3.0.0: {}
-
   chrome-trace-event@1.0.4:
     optional: true
 
-  chromium-bidi@16.0.1(devtools-protocol@0.0.1638949):
+  chromium-bidi@17.0.2(devtools-protocol@0.0.1653615):
     dependencies:
-      devtools-protocol: 0.0.1638949
+      devtools-protocol: 0.0.1653615
       mitt: 3.0.1
       zod: 3.25.76
 
@@ -7659,7 +7410,7 @@ snapshots:
   cli-truncate@5.2.0:
     dependencies:
       slice-ansi: 8.0.0
-      string-width: 8.2.1
+      string-width: 8.2.2
 
   cli-width@4.1.0: {}
 
@@ -7683,11 +7434,11 @@ snapshots:
 
   concat-map@0.0.1: {}
 
-  concurrently@10.0.3:
+  concurrently@10.0.4:
     dependencies:
       chalk: 5.6.2
       rxjs: 7.8.2
-      shell-quote: 1.8.4
+      shell-quote: 1.9.0
       supports-color: 10.2.2
       tree-kill: 1.2.2
       yargs: 18.0.0
@@ -7770,13 +7521,17 @@ snapshots:
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
-  debug@3.2.7:
+  debug@3.2.7(supports-color@10.2.2):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 10.2.2
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@10.2.2):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 10.2.2
 
   decimal.js@10.6.0: {}
 
@@ -7800,7 +7555,7 @@ snapshots:
 
   detect-libc@2.1.2: {}
 
-  devtools-protocol@0.0.1638949: {}
+  devtools-protocol@0.0.1653615: {}
 
   diff@8.0.4:
     optional: true
@@ -7837,15 +7592,17 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.381: {}
+  electron-to-chromium@1.5.399: {}
 
   emoji-regex@10.6.0: {}
 
   emoji-regex@9.2.2: {}
 
+  empathic@2.0.1: {}
+
   encodeurl@2.0.0: {}
 
-  enhanced-resolve@5.24.1:
+  enhanced-resolve@5.24.4:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.3.3
@@ -7857,8 +7614,6 @@ snapshots:
 
   entities@8.0.0: {}
 
-  env-paths@2.2.1: {}
-
   environment@1.1.0: {}
 
   errno@0.1.8:
@@ -7946,7 +7701,7 @@ snapshots:
       iterator.prototype: 1.1.5
       math-intrinsics: 1.1.0
 
-  es-module-lexer@2.2.0: {}
+  es-module-lexer@2.3.1: {}
 
   es-object-atoms@1.1.1:
     dependencies:
@@ -7973,35 +7728,6 @@ snapshots:
       is-date-object: 1.1.0
       is-symbol: 1.1.1
 
-  esbuild@0.27.2:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.2
-      '@esbuild/android-arm': 0.27.2
-      '@esbuild/android-arm64': 0.27.2
-      '@esbuild/android-x64': 0.27.2
-      '@esbuild/darwin-arm64': 0.27.2
-      '@esbuild/darwin-x64': 0.27.2
-      '@esbuild/freebsd-arm64': 0.27.2
-      '@esbuild/freebsd-x64': 0.27.2
-      '@esbuild/linux-arm': 0.27.2
-      '@esbuild/linux-arm64': 0.27.2
-      '@esbuild/linux-ia32': 0.27.2
-      '@esbuild/linux-loong64': 0.27.2
-      '@esbuild/linux-mips64el': 0.27.2
-      '@esbuild/linux-ppc64': 0.27.2
-      '@esbuild/linux-riscv64': 0.27.2
-      '@esbuild/linux-s390x': 0.27.2
-      '@esbuild/linux-x64': 0.27.2
-      '@esbuild/netbsd-arm64': 0.27.2
-      '@esbuild/netbsd-x64': 0.27.2
-      '@esbuild/openbsd-arm64': 0.27.2
-      '@esbuild/openbsd-x64': 0.27.2
-      '@esbuild/openharmony-arm64': 0.27.2
-      '@esbuild/sunos-x64': 0.27.2
-      '@esbuild/win32-arm64': 0.27.2
-      '@esbuild/win32-ia32': 0.27.2
-      '@esbuild/win32-x64': 0.27.2
-
   esbuild@0.28.1:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.28.1
@@ -8033,44 +7759,46 @@ snapshots:
 
   escalade@3.2.0: {}
 
+  escape-goat@4.0.0: {}
+
   escape-html@1.0.3: {}
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-prettier@10.1.8(eslint@10.6.0(jiti@2.7.0)):
+  eslint-config-prettier@10.1.8(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2)):
     dependencies:
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
 
-  eslint-import-resolver-node@0.3.10:
+  eslint-import-resolver-node@0.3.10(supports-color@10.2.2):
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
       is-core-module: 2.16.2
       resolve: 2.0.0-next.7
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.13.0(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint-import-resolver-node@0.3.10)(eslint@10.6.0(jiti@2.7.0)):
+  eslint-module-utils@2.13.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint-import-resolver-node@0.3.10(supports-color@10.2.2))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
     optionalDependencies:
-      '@typescript-eslint/parser': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      eslint: 10.6.0(jiti@2.7.0)
-      eslint-import-resolver-node: 0.3.10
+      '@typescript-eslint/parser': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
+      eslint-import-resolver-node: 0.3.10(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
       array.prototype.findlastindex: 1.2.6
       array.prototype.flat: 1.3.3
       array.prototype.flatmap: 1.3.3
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@10.2.2)
       doctrine: 2.1.0
-      eslint: 10.6.0(jiti@2.7.0)
-      eslint-import-resolver-node: 0.3.10
-      eslint-module-utils: 2.13.0(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint-import-resolver-node@0.3.10)(eslint@10.6.0(jiti@2.7.0))
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
+      eslint-import-resolver-node: 0.3.10(supports-color@10.2.2)
+      eslint-module-utils: 2.13.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint-import-resolver-node@0.3.10(supports-color@10.2.2))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)
       hasown: 2.0.4
       is-core-module: 2.16.2
       is-glob: 4.0.3
@@ -8082,13 +7810,13 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-jsx-a11y@6.10.2(eslint@10.6.0(jiti@2.7.0)):
+  eslint-plugin-jsx-a11y@6.10.2(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2)):
     dependencies:
       aria-query: 5.3.2
       array-includes: 3.1.9
@@ -8098,7 +7826,7 @@ snapshots:
       axobject-query: 4.1.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       hasown: 2.0.4
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.9
@@ -8107,18 +7835,18 @@ snapshots:
       safe-regex-test: 1.1.0
       string.prototype.includes: 2.0.1
 
-  eslint-plugin-react-hooks@7.1.1(eslint@10.6.0(jiti@2.7.0)):
+  eslint-plugin-react-hooks@7.1.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      '@babel/core': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/parser': 7.29.7
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       hermes-parser: 0.25.1
       zod: 4.4.3
       zod-validation-error: 4.0.2(zod@4.4.3)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react@7.37.5(eslint@10.6.0(jiti@2.7.0)):
+  eslint-plugin-react@7.37.5(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2)):
     dependencies:
       array-includes: 3.1.9
       array.prototype.findlast: 1.2.5
@@ -8126,7 +7854,7 @@ snapshots:
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
       es-iterator-helpers: 1.3.2
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       estraverse: 5.3.0
       hasown: 2.0.4
       jsx-ast-utils: 3.3.5
@@ -8140,11 +7868,11 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
-  eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)):
+  eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2)):
     dependencies:
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/eslint-plugin': 8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
 
   eslint-scope@5.1.1:
     dependencies:
@@ -8163,11 +7891,11 @@ snapshots:
 
   eslint-visitor-keys@5.0.1: {}
 
-  eslint@10.6.0(jiti@2.7.0):
+  eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.6.0(jiti@2.7.0))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))
       '@eslint-community/regexpp': 4.12.2
-      '@eslint/config-array': 0.23.5
+      '@eslint/config-array': 0.23.5(supports-color@10.2.2)
       '@eslint/config-helpers': 0.6.0
       '@eslint/core': 1.2.1
       '@eslint/plugin-kit': 0.7.2
@@ -8177,7 +7905,7 @@ snapshots:
       '@types/estree': 1.0.9
       ajv: 6.15.0
       cross-spawn: 7.0.6
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       escape-string-regexp: 4.0.0
       eslint-scope: 9.1.2
       eslint-visitor-keys: 5.0.1
@@ -8242,27 +7970,28 @@ snapshots:
 
   expect-type@1.4.0: {}
 
-  exponential-backoff@3.1.3: {}
-
-  express-rate-limit@8.5.2(express@5.2.1):
+  express-rate-limit@8.6.1(express@5.2.1(supports-color@10.2.2))(supports-color@10.2.2):
     dependencies:
-      express: 5.2.1
-      ip-address: 10.2.0
+      debug: 4.4.3(supports-color@10.2.2)
+      express: 5.2.1(supports-color@10.2.2)
+      ip-address: 10.4.0
+    transitivePeerDependencies:
+      - supports-color
 
-  express@5.2.1:
+  express@5.2.1(supports-color@10.2.2):
     dependencies:
       accepts: 2.0.0
-      body-parser: 2.3.0
+      body-parser: 2.3.0(supports-color@10.2.2)
       content-disposition: 1.1.0
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 2.1.1
+      finalhandler: 2.1.1(supports-color@10.2.2)
       fresh: 2.0.0
       http-errors: 2.0.1
       merge-descriptors: 2.0.0
@@ -8273,9 +8002,9 @@ snapshots:
       proxy-addr: 2.0.7
       qs: 6.15.3
       range-parser: 1.3.0
-      router: 2.2.0
-      send: 1.2.1
-      serve-static: 2.2.1
+      router: 2.2.0(supports-color@10.2.2)
+      send: 1.2.1(supports-color@10.2.2)
+      serve-static: 2.2.1(supports-color@10.2.2)
       statuses: 2.0.2
       type-is: 2.1.0
       vary: 1.1.2
@@ -8296,18 +8025,15 @@ snapshots:
     dependencies:
       fast-string-truncated-width: 3.0.3
 
-  fast-uri@3.1.2: {}
-
-  fast-uri@3.1.3:
-    optional: true
+  fast-uri@3.1.5: {}
 
   fast-wrap-ansi@0.2.2:
     dependencies:
       fast-string-width: 3.0.2
 
-  fdir@6.5.0(picomatch@4.0.4):
+  fdir@6.5.0(picomatch@4.0.5):
     optionalDependencies:
-      picomatch: 4.0.4
+      picomatch: 4.0.5
 
   feather-icons@4.29.2:
     dependencies:
@@ -8324,9 +8050,9 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  finalhandler@2.1.1:
+  finalhandler@2.1.1(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -8342,12 +8068,14 @@ snapshots:
 
   flat-cache@4.0.1:
     dependencies:
-      flatted: 3.4.2
+      flatted: 3.4.3
       keyv: 4.5.4
 
-  flatted@3.4.2: {}
+  flatted@3.4.3: {}
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@10.2.2)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@10.2.2)
 
   for-each@0.3.5:
     dependencies:
@@ -8370,10 +8098,13 @@ snapshots:
       graceful-fs: 4.2.11
       jsonfile: 6.2.1
       universalify: 2.0.1
+    optional: true
 
-  fs-minipass@3.0.3:
+  fs-extra@11.4.0:
     dependencies:
-      minipass: 7.1.3
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.1
+      universalify: 2.0.1
 
   fsevents@2.3.2:
     optional: true
@@ -8434,15 +8165,10 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob-to-regexp@0.4.1: {}
+  glob-to-regexp@0.4.1:
+    optional: true
 
-  glob@13.0.6:
-    dependencies:
-      minimatch: 10.2.5
-      minipass: 7.1.3
-      path-scurry: 2.0.2
-
-  globals@17.7.0: {}
+  globals@17.9.0: {}
 
   globalthis@1.0.4:
     dependencies:
@@ -8453,9 +8179,9 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  happy-dom@20.10.6:
+  happy-dom@20.11.1:
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       '@types/whatwg-mimetype': 3.0.2
       '@types/ws': 8.18.1
       buffer-image-size: 0.6.4
@@ -8498,11 +8224,11 @@ snapshots:
     dependencies:
       hermes-estree: 0.25.1
 
-  hono@4.12.27: {}
+  hono@4.12.34: {}
 
-  hosted-git-info@9.0.3:
+  hosted-git-info@10.1.1:
     dependencies:
-      lru-cache: 11.5.1
+      lru-cache: 11.5.2
 
   html-encoding-sniffer@6.0.0:
     dependencies:
@@ -8519,8 +8245,6 @@ snapshots:
       domutils: 3.2.2
       entities: 7.0.1
 
-  http-cache-semantics@4.2.0: {}
-
   http-errors@2.0.1:
     dependencies:
       depd: 2.0.0
@@ -8529,32 +8253,20 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  http-proxy-agent@7.0.2:
+  https-proxy-agent@5.0.1(supports-color@10.2.2):
     dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
+      agent-base: 6.0.2(supports-color@10.2.2)
+      debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@5.0.1:
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.4.3
-    transitivePeerDependencies:
-      - supports-color
-
-  https-proxy-agent@7.0.6:
-    dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
-    transitivePeerDependencies:
-      - supports-color
-
-  https-proxy-agent@9.0.0:
+  https-proxy-agent@9.1.0(supports-color@10.2.2):
     dependencies:
       agent-base: 9.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
+      proxy-agent-negotiate: 1.1.0
     transitivePeerDependencies:
+      - kerberos
       - supports-color
 
   iconv-lite@0.6.3:
@@ -8562,17 +8274,13 @@ snapshots:
       safer-buffer: 2.1.2
     optional: true
 
-  iconv-lite@0.7.2:
+  iconv-lite@0.7.3:
     dependencies:
       safer-buffer: 2.1.2
 
-  ignore-walk@8.0.0:
-    dependencies:
-      minimatch: 10.2.5
-
   ignore@5.3.2: {}
 
-  ignore@7.0.5: {}
+  ignore@7.0.6: {}
 
   image-size@0.5.5:
     optional: true
@@ -8582,19 +8290,19 @@ snapshots:
   import-lazy@4.0.0:
     optional: true
 
+  import-meta-resolve@4.2.0: {}
+
   imurmurhash@0.1.4: {}
 
   inherits@2.0.4: {}
 
-  ini@6.0.0: {}
-
   internal-slot@1.1.0:
     dependencies:
       es-errors: 1.3.0
       hasown: 2.0.4
       side-channel: 1.1.0
 
-  ip-address@10.2.0: {}
+  ip-address@10.4.0: {}
 
   ipaddr.js@1.9.1: {}
 
@@ -8729,13 +8437,11 @@ snapshots:
 
   isexe@2.0.0: {}
 
-  isexe@4.0.0: {}
-
   istanbul-lib-coverage@3.2.2: {}
 
-  istanbul-lib-instrument@6.0.3:
+  istanbul-lib-instrument@6.0.3(supports-color@10.2.2):
     dependencies:
-      '@babel/core': 7.29.7
+      '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/parser': 7.29.7
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
@@ -8766,7 +8472,7 @@ snapshots:
 
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       merge-stream: 2.0.0
       supports-color: 8.1.1
     optional: true
@@ -8776,34 +8482,34 @@ snapshots:
   jju@1.4.0:
     optional: true
 
-  jose@6.2.3: {}
+  jose@6.2.8: {}
 
   js-tokens@10.0.0: {}
 
   js-tokens@4.0.0: {}
 
-  jsdom@29.1.1:
+  jsdom@30.0.1:
     dependencies:
-      '@asamuzakjp/css-color': 5.1.11
-      '@asamuzakjp/dom-selector': 7.1.1
+      '@asamuzakjp/css-color': 6.0.5
+      '@asamuzakjp/dom-selector': 8.3.0
       '@bramus/specificity': 2.4.2
-      '@csstools/css-syntax-patches-for-csstree': 1.1.4(css-tree@3.2.1)
+      '@csstools/css-syntax-patches-for-csstree': 1.1.7(css-tree@3.2.1)
       '@exodus/bytes': 1.15.1
       css-tree: 3.2.1
       data-urls: 7.0.0
       decimal.js: 10.6.0
       html-encoding-sniffer: 6.0.0
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.5.1
+      lru-cache: 11.5.2
       parse5: 8.0.1
       saxes: 6.0.0
       symbol-tree: 3.2.4
-      tough-cookie: 6.0.1
-      undici: 7.28.0
+      tough-cookie: 6.0.2
+      undici: 8.9.0
       w3c-xmlserializer: 5.0.0
       webidl-conversions: 8.0.1
       whatwg-mimetype: 5.0.0
-      whatwg-url: 16.0.1
+      whatwg-url: 17.1.0
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - '@noble/hashes'
@@ -8812,8 +8518,6 @@ snapshots:
 
   json-buffer@3.0.1: {}
 
-  json-parse-even-better-errors@5.0.0: {}
-
   json-schema-traverse@0.4.1: {}
 
   json-schema-traverse@1.0.0: {}
@@ -8842,8 +8546,6 @@ snapshots:
     optionalDependencies:
       graceful-fs: 4.2.11
 
-  jsonparse@1.3.1: {}
-
   jsx-ast-utils@3.3.5:
     dependencies:
       array-includes: 3.1.9
@@ -8882,62 +8584,62 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lightningcss-android-arm64@1.32.0:
+  lightningcss-android-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-arm64@1.32.0:
+  lightningcss-darwin-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-x64@1.32.0:
+  lightningcss-darwin-x64@1.33.0:
     optional: true
 
-  lightningcss-freebsd-x64@1.32.0:
+  lightningcss-freebsd-x64@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
+  lightningcss-linux-arm-gnueabihf@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.32.0:
+  lightningcss-linux-arm64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.32.0:
+  lightningcss-linux-arm64-musl@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-gnu@1.32.0:
+  lightningcss-linux-x64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-musl@1.32.0:
+  lightningcss-linux-x64-musl@1.33.0:
     optional: true
 
-  lightningcss-win32-arm64-msvc@1.32.0:
+  lightningcss-win32-arm64-msvc@1.33.0:
     optional: true
 
-  lightningcss-win32-x64-msvc@1.32.0:
+  lightningcss-win32-x64-msvc@1.33.0:
     optional: true
 
-  lightningcss@1.32.0:
+  lightningcss@1.33.0:
     dependencies:
       detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-android-arm64: 1.32.0
-      lightningcss-darwin-arm64: 1.32.0
-      lightningcss-darwin-x64: 1.32.0
-      lightningcss-freebsd-x64: 1.32.0
-      lightningcss-linux-arm-gnueabihf: 1.32.0
-      lightningcss-linux-arm64-gnu: 1.32.0
-      lightningcss-linux-arm64-musl: 1.32.0
-      lightningcss-linux-x64-gnu: 1.32.0
-      lightningcss-linux-x64-musl: 1.32.0
-      lightningcss-win32-arm64-msvc: 1.32.0
-      lightningcss-win32-x64-msvc: 1.32.0
+      lightningcss-android-arm64: 1.33.0
+      lightningcss-darwin-arm64: 1.33.0
+      lightningcss-darwin-x64: 1.33.0
+      lightningcss-freebsd-x64: 1.33.0
+      lightningcss-linux-arm-gnueabihf: 1.33.0
+      lightningcss-linux-arm64-gnu: 1.33.0
+      lightningcss-linux-arm64-musl: 1.33.0
+      lightningcss-linux-x64-gnu: 1.33.0
+      lightningcss-linux-x64-musl: 1.33.0
+      lightningcss-win32-arm64-msvc: 1.33.0
+      lightningcss-win32-x64-msvc: 1.33.0
 
   lilconfig@3.1.3: {}
 
-  linkify-it@5.0.1:
+  linkify-it@5.0.2:
     dependencies:
       uc.micro: 2.1.0
 
-  listr2@10.2.1:
+  listr2@10.2.2:
     dependencies:
       cli-truncate: 5.2.0
       eventemitter3: 5.0.4
@@ -8945,7 +8647,7 @@ snapshots:
       rfdc: 1.4.1
       wrap-ansi: 10.0.0
 
-  lmdb@3.5.4:
+  lmdb@3.5.6:
     dependencies:
       '@harperfast/extended-iterable': 1.0.3
       msgpackr: 1.12.1
@@ -8954,13 +8656,13 @@ snapshots:
       ordered-binary: 1.6.1
       weak-lru-cache: 1.2.2
     optionalDependencies:
-      '@lmdb/lmdb-darwin-arm64': 3.5.4
-      '@lmdb/lmdb-darwin-x64': 3.5.4
-      '@lmdb/lmdb-linux-arm': 3.5.4
-      '@lmdb/lmdb-linux-arm64': 3.5.4
-      '@lmdb/lmdb-linux-x64': 3.5.4
-      '@lmdb/lmdb-win32-arm64': 3.5.4
-      '@lmdb/lmdb-win32-x64': 3.5.4
+      '@lmdb/lmdb-darwin-arm64': 3.5.6
+      '@lmdb/lmdb-darwin-x64': 3.5.6
+      '@lmdb/lmdb-linux-arm': 3.5.6
+      '@lmdb/lmdb-linux-arm64': 3.5.6
+      '@lmdb/lmdb-linux-x64': 3.5.6
+      '@lmdb/lmdb-win32-arm64': 3.5.6
+      '@lmdb/lmdb-win32-x64': 3.5.6
     optional: true
 
   loader-runner@4.3.2:
@@ -8982,7 +8684,7 @@ snapshots:
   log-symbols@7.0.1:
     dependencies:
       is-unicode-supported: 2.1.0
-      yoctocolors: 2.1.2
+      yoctocolors: 2.2.0
 
   log-update@6.1.0:
     dependencies:
@@ -8996,7 +8698,7 @@ snapshots:
     dependencies:
       js-tokens: 4.0.0
 
-  lru-cache@11.5.1: {}
+  lru-cache@11.5.2: {}
 
   lru-cache@5.1.1:
     dependencies:
@@ -9013,6 +8715,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
+  magic-string@1.0.0:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
   magicast@0.5.3:
     dependencies:
       '@babel/parser': 7.29.7
@@ -9029,29 +8735,12 @@ snapshots:
     dependencies:
       semver: 7.8.5
 
-  make-fetch-happen@15.0.6:
-    dependencies:
-      '@gar/promise-retry': 1.0.3
-      '@npmcli/agent': 4.0.2
-      '@npmcli/redact': 4.0.0
-      cacache: 20.0.4
-      http-cache-semantics: 4.2.0
-      minipass: 7.1.3
-      minipass-fetch: 5.0.2
-      minipass-flush: 1.0.7
-      minipass-pipeline: 1.2.4
-      negotiator: 1.0.0
-      proc-log: 6.1.0
-      ssri: 13.0.1
-    transitivePeerDependencies:
-      - supports-color
-
-  markdown-it@14.2.0:
+  markdown-it@14.3.0:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
-      linkify-it: 5.0.1
-      mdurl: 2.0.0
+      linkify-it: 5.0.2
+      mdurl: 2.1.0
       punycode.js: 2.3.1
       uc.micro: 2.1.0
 
@@ -9059,9 +8748,9 @@ snapshots:
 
   mdn-data@2.27.1: {}
 
-  mdurl@2.0.0: {}
+  mdurl@2.1.0: {}
 
-  media-typer@1.1.0: {}
+  media-typer@1.1.1: {}
 
   merge-descriptors@2.0.0: {}
 
@@ -9087,48 +8776,18 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.7
+      brace-expansion: 5.0.9
+
+  minimatch@10.2.6:
+    dependencies:
+      brace-expansion: 5.0.9
 
   minimatch@3.1.5:
     dependencies:
-      brace-expansion: 1.1.15
+      brace-expansion: 1.1.18
 
   minimist@1.2.8: {}
 
-  minipass-collect@2.0.1:
-    dependencies:
-      minipass: 7.1.3
-
-  minipass-fetch@5.0.2:
-    dependencies:
-      minipass: 7.1.3
-      minipass-sized: 2.0.0
-      minizlib: 3.1.0
-    optionalDependencies:
-      iconv-lite: 0.7.2
-
-  minipass-flush@1.0.7:
-    dependencies:
-      minipass: 3.3.6
-
-  minipass-pipeline@1.2.4:
-    dependencies:
-      minipass: 3.3.6
-
-  minipass-sized@2.0.0:
-    dependencies:
-      minipass: 7.1.3
-
-  minipass@3.3.6:
-    dependencies:
-      yallist: 4.0.0
-
-  minipass@7.1.3: {}
-
-  minizlib@3.1.0:
-    dependencies:
-      minipass: 7.1.3
-
   mitt@3.0.1: {}
 
   mlly@1.8.2:
@@ -9138,7 +8797,7 @@ snapshots:
       pkg-types: 1.3.1
       ufo: 1.6.4
 
-  modern-tar@0.7.6: {}
+  modern-tar@0.7.7: {}
 
   mrmime@2.0.1: {}
 
@@ -9163,14 +8822,14 @@ snapshots:
 
   mute-stream@3.0.0: {}
 
-  nanoid@3.3.15: {}
+  nanoid@3.3.16: {}
 
   natural-compare@1.4.0: {}
 
   needle@3.5.0:
     dependencies:
       iconv-lite: 0.6.3
-      sax: 1.6.0
+      sax: 1.6.1
     optional: true
 
   negotiator@1.0.0: {}
@@ -9196,68 +8855,16 @@ snapshots:
       detect-libc: 2.1.2
     optional: true
 
-  node-gyp@12.4.0:
-    dependencies:
-      env-paths: 2.2.1
-      exponential-backoff: 3.1.3
-      graceful-fs: 4.2.11
-      nopt: 9.0.0
-      proc-log: 6.1.0
-      semver: 7.7.4
-      tar: 7.5.19
-      tinyglobby: 0.2.17
-      undici: 6.27.0
-      which: 6.0.1
-
-  node-releases@2.0.50: {}
-
-  nopt@9.0.0:
-    dependencies:
-      abbrev: 4.0.0
+  node-releases@2.0.51: {}
 
   normalize-path@3.0.0: {}
 
-  npm-bundled@5.0.0:
+  npm-package-arg@14.0.0:
     dependencies:
-      npm-normalize-package-bin: 5.0.0
-
-  npm-install-checks@8.0.0:
-    dependencies:
-      semver: 7.7.4
-
-  npm-normalize-package-bin@5.0.0: {}
-
-  npm-package-arg@13.0.2:
-    dependencies:
-      hosted-git-info: 9.0.3
-      proc-log: 6.1.0
+      hosted-git-info: 10.1.1
+      proc-log: 7.0.0
       semver: 7.8.5
-      validate-npm-package-name: 7.0.2
-
-  npm-packlist@10.0.4:
-    dependencies:
-      ignore-walk: 8.0.0
-      proc-log: 6.1.0
-
-  npm-pick-manifest@11.0.3:
-    dependencies:
-      npm-install-checks: 8.0.0
-      npm-normalize-package-bin: 5.0.0
-      npm-package-arg: 13.0.2
-      semver: 7.7.4
-
-  npm-registry-fetch@19.1.1:
-    dependencies:
-      '@npmcli/redact': 4.0.0
-      jsonparse: 1.3.1
-      make-fetch-happen: 15.0.6
-      minipass: 7.1.3
-      minipass-fetch: 5.0.2
-      minizlib: 3.1.0
-      npm-package-arg: 13.0.2
-      proc-log: 6.1.0
-    transitivePeerDependencies:
-      - supports-color
+      validate-npm-package-name: 8.0.0
 
   npm-run-path@6.0.0:
     dependencies:
@@ -9310,7 +8917,7 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.1.2
 
-  obug@2.1.3: {}
+  obug@2.1.4: {}
 
   on-finished@2.4.1:
     dependencies:
@@ -9333,7 +8940,7 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  ora@9.4.0:
+  ora@9.4.1:
     dependencies:
       chalk: 5.6.2
       cli-cursor: 5.0.0
@@ -9342,7 +8949,7 @@ snapshots:
       is-unicode-supported: 2.1.0
       log-symbols: 7.0.1
       stdin-discarder: 0.3.2
-      string-width: 8.2.1
+      string-width: 8.2.2
 
   ordered-binary@1.6.1:
     optional: true
@@ -9353,6 +8960,31 @@ snapshots:
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
+  oxc-parser@0.142.0:
+    dependencies:
+      '@oxc-project/types': 0.142.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm-eabi': 0.142.0
+      '@oxc-parser/binding-android-arm64': 0.142.0
+      '@oxc-parser/binding-darwin-arm64': 0.142.0
+      '@oxc-parser/binding-darwin-x64': 0.142.0
+      '@oxc-parser/binding-freebsd-x64': 0.142.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.142.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.142.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.142.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.142.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.142.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.142.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.142.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.142.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.142.0
+      '@oxc-parser/binding-linux-x64-musl': 0.142.0
+      '@oxc-parser/binding-openharmony-arm64': 0.142.0
+      '@oxc-parser/binding-wasm32-wasi': 0.142.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.142.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.142.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.142.0
+
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
@@ -9363,28 +8995,6 @@ snapshots:
 
   p-map@7.0.4: {}
 
-  pacote@21.5.1:
-    dependencies:
-      '@gar/promise-retry': 1.0.3
-      '@npmcli/git': 7.0.2
-      '@npmcli/installed-package-contents': 4.0.0
-      '@npmcli/package-json': 7.0.5
-      '@npmcli/promise-spawn': 9.0.1
-      '@npmcli/run-script': 10.0.4
-      cacache: 20.0.4
-      fs-minipass: 3.0.3
-      minipass: 7.1.3
-      npm-package-arg: 13.0.2
-      npm-packlist: 10.0.4
-      npm-pick-manifest: 11.0.3
-      npm-registry-fetch: 19.1.1
-      proc-log: 6.1.0
-      sigstore: 4.1.1
-      ssri: 13.0.1
-      tar: 7.5.19
-    transitivePeerDependencies:
-      - supports-color
-
   parse-node-version@1.0.1:
     optional: true
 
@@ -9414,11 +9024,6 @@ snapshots:
 
   path-parse@1.0.7: {}
 
-  path-scurry@2.0.2:
-    dependencies:
-      lru-cache: 11.5.1
-      minipass: 7.1.3
-
   path-to-regexp@8.4.2: {}
 
   pathe@2.0.3: {}
@@ -9429,6 +9034,8 @@ snapshots:
 
   picomatch@4.0.4: {}
 
+  picomatch@4.0.5: {}
+
   pify@4.0.1:
     optional: true
 
@@ -9450,11 +9057,11 @@ snapshots:
       exsolve: 1.1.0
       pathe: 2.0.3
 
-  playwright-core@1.61.1: {}
+  playwright-core@1.62.1: {}
 
-  playwright@1.61.1:
+  playwright@1.62.1:
     dependencies:
-      playwright-core: 1.61.1
+      playwright-core: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -9462,21 +9069,21 @@ snapshots:
 
   postcss-media-query-parser@0.2.3: {}
 
-  postcss-safe-parser@7.0.1(postcss@8.5.16):
+  postcss-safe-parser@7.0.1(postcss@8.5.25):
     dependencies:
-      postcss: 8.5.16
+      postcss: 8.5.25
 
-  postcss@8.5.16:
+  postcss@8.5.25:
     dependencies:
-      nanoid: 3.3.15
+      nanoid: 3.3.16
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.9.4: {}
+  prettier@3.9.6: {}
 
-  proc-log@6.1.0: {}
+  proc-log@7.0.0: {}
 
   prop-types@15.8.1:
     dependencies:
@@ -9495,6 +9102,8 @@ snapshots:
       forwarded: 0.2.0
       ipaddr.js: 1.9.1
 
+  proxy-agent-negotiate@1.1.0: {}
+
   proxy-from-env@2.1.0: {}
 
   prr@1.0.1:
@@ -9504,31 +9113,33 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  puppeteer-core@25.2.1:
+  puppeteer-core@25.4.0:
     dependencies:
-      '@puppeteer/browsers': 3.0.5
-      chromium-bidi: 16.0.1(devtools-protocol@0.0.1638949)
-      devtools-protocol: 0.0.1638949
+      '@puppeteer/browsers': 3.0.6
+      chromium-bidi: 17.0.2(devtools-protocol@0.0.1653615)
+      devtools-protocol: 0.0.1653615
       typed-query-selector: 2.12.2
       webdriver-bidi-protocol: 0.4.2
-      ws: 8.21.0
+      ws: 8.21.1
     transitivePeerDependencies:
       - bufferutil
       - proxy-agent
       - utf-8-validate
+      - yauzl
 
-  puppeteer@25.2.1:
+  puppeteer@25.4.0:
     dependencies:
-      '@puppeteer/browsers': 3.0.5
-      chromium-bidi: 16.0.1(devtools-protocol@0.0.1638949)
-      devtools-protocol: 0.0.1638949
+      '@puppeteer/browsers': 3.0.6
+      chromium-bidi: 17.0.2(devtools-protocol@0.0.1653615)
+      devtools-protocol: 0.0.1653615
       lilconfig: 3.1.3
-      puppeteer-core: 25.2.1
+      puppeteer-core: 25.4.0
       typed-query-selector: 2.12.2
     transitivePeerDependencies:
       - bufferutil
       - proxy-agent
       - utf-8-validate
+      - yauzl
 
   qs@6.15.3:
     dependencies:
@@ -9543,7 +9154,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.1
-      iconv-lite: 0.7.2
+      iconv-lite: 0.7.3
       unpipe: 1.0.0
 
   react-is@16.13.1: {}
@@ -9552,7 +9163,8 @@ snapshots:
     dependencies:
       picomatch: 2.3.2
 
-  readdirp@4.1.2: {}
+  readdirp@4.1.2:
+    optional: true
 
   readdirp@5.0.0: {}
 
@@ -9606,57 +9218,67 @@ snapshots:
 
   rfdc@1.4.1: {}
 
-  rolldown@1.1.3:
+  rolldown@1.1.5:
     dependencies:
-      '@oxc-project/types': 0.137.0
+      '@oxc-project/types': 0.139.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.1.3
-      '@rolldown/binding-darwin-arm64': 1.1.3
-      '@rolldown/binding-darwin-x64': 1.1.3
-      '@rolldown/binding-freebsd-x64': 1.1.3
-      '@rolldown/binding-linux-arm-gnueabihf': 1.1.3
-      '@rolldown/binding-linux-arm64-gnu': 1.1.3
-      '@rolldown/binding-linux-arm64-musl': 1.1.3
-      '@rolldown/binding-linux-ppc64-gnu': 1.1.3
-      '@rolldown/binding-linux-s390x-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-gnu': 1.1.3
-      '@rolldown/binding-linux-x64-musl': 1.1.3
-      '@rolldown/binding-openharmony-arm64': 1.1.3
-      '@rolldown/binding-wasm32-wasi': 1.1.3
-      '@rolldown/binding-win32-arm64-msvc': 1.1.3
-      '@rolldown/binding-win32-x64-msvc': 1.1.3
+      '@rolldown/binding-android-arm64': 1.1.5
+      '@rolldown/binding-darwin-arm64': 1.1.5
+      '@rolldown/binding-darwin-x64': 1.1.5
+      '@rolldown/binding-freebsd-x64': 1.1.5
+      '@rolldown/binding-linux-arm-gnueabihf': 1.1.5
+      '@rolldown/binding-linux-arm64-gnu': 1.1.5
+      '@rolldown/binding-linux-arm64-musl': 1.1.5
+      '@rolldown/binding-linux-ppc64-gnu': 1.1.5
+      '@rolldown/binding-linux-s390x-gnu': 1.1.5
+      '@rolldown/binding-linux-x64-gnu': 1.1.5
+      '@rolldown/binding-linux-x64-musl': 1.1.5
+      '@rolldown/binding-openharmony-arm64': 1.1.5
+      '@rolldown/binding-wasm32-wasi': 1.1.5
+      '@rolldown/binding-win32-arm64-msvc': 1.1.5
+      '@rolldown/binding-win32-x64-msvc': 1.1.5
 
-  rollup@4.60.2:
+  rolldown@1.2.0:
     dependencies:
-      '@types/estree': 1.0.8
+      '@oxc-project/types': 0.140.0
+      '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.60.2
-      '@rollup/rollup-android-arm64': 4.60.2
-      '@rollup/rollup-darwin-arm64': 4.60.2
-      '@rollup/rollup-darwin-x64': 4.60.2
-      '@rollup/rollup-freebsd-arm64': 4.60.2
-      '@rollup/rollup-freebsd-x64': 4.60.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.60.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.60.2
-      '@rollup/rollup-linux-arm64-gnu': 4.60.2
-      '@rollup/rollup-linux-arm64-musl': 4.60.2
-      '@rollup/rollup-linux-loong64-gnu': 4.60.2
-      '@rollup/rollup-linux-loong64-musl': 4.60.2
-      '@rollup/rollup-linux-ppc64-gnu': 4.60.2
-      '@rollup/rollup-linux-ppc64-musl': 4.60.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.60.2
-      '@rollup/rollup-linux-riscv64-musl': 4.60.2
-      '@rollup/rollup-linux-s390x-gnu': 4.60.2
-      '@rollup/rollup-linux-x64-gnu': 4.60.2
-      '@rollup/rollup-linux-x64-musl': 4.60.2
-      '@rollup/rollup-openbsd-x64': 4.60.2
-      '@rollup/rollup-openharmony-arm64': 4.60.2
-      '@rollup/rollup-win32-arm64-msvc': 4.60.2
-      '@rollup/rollup-win32-ia32-msvc': 4.60.2
-      '@rollup/rollup-win32-x64-gnu': 4.60.2
-      '@rollup/rollup-win32-x64-msvc': 4.60.2
-      fsevents: 2.3.3
+      '@rolldown/binding-android-arm64': 1.2.0
+      '@rolldown/binding-darwin-arm64': 1.2.0
+      '@rolldown/binding-darwin-x64': 1.2.0
+      '@rolldown/binding-freebsd-x64': 1.2.0
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.0
+      '@rolldown/binding-linux-arm64-gnu': 1.2.0
+      '@rolldown/binding-linux-arm64-musl': 1.2.0
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.0
+      '@rolldown/binding-linux-s390x-gnu': 1.2.0
+      '@rolldown/binding-linux-x64-gnu': 1.2.0
+      '@rolldown/binding-linux-x64-musl': 1.2.0
+      '@rolldown/binding-openharmony-arm64': 1.2.0
+      '@rolldown/binding-wasm32-wasi': 1.2.0
+      '@rolldown/binding-win32-arm64-msvc': 1.2.0
+      '@rolldown/binding-win32-x64-msvc': 1.2.0
+
+  rolldown@1.2.2:
+    dependencies:
+      '@oxc-project/types': 0.142.0
+      '@rolldown/pluginutils': 1.0.1
+    optionalDependencies:
+      '@rolldown/binding-android-arm64': 1.2.2
+      '@rolldown/binding-darwin-arm64': 1.2.2
+      '@rolldown/binding-darwin-x64': 1.2.2
+      '@rolldown/binding-freebsd-x64': 1.2.2
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.2
+      '@rolldown/binding-linux-arm64-gnu': 1.2.2
+      '@rolldown/binding-linux-arm64-musl': 1.2.2
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.2
+      '@rolldown/binding-linux-s390x-gnu': 1.2.2
+      '@rolldown/binding-linux-x64-gnu': 1.2.2
+      '@rolldown/binding-linux-x64-musl': 1.2.2
+      '@rolldown/binding-openharmony-arm64': 1.2.2
+      '@rolldown/binding-win32-arm64-msvc': 1.2.2
+      '@rolldown/binding-win32-x64-msvc': 1.2.2
 
   rollup@4.60.4:
     dependencies:
@@ -9688,10 +9310,11 @@ snapshots:
       '@rollup/rollup-win32-x64-gnu': 4.60.4
       '@rollup/rollup-win32-x64-msvc': 4.60.4
       fsevents: 2.3.3
+    optional: true
 
-  router@2.2.0:
+  router@2.2.0(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -9784,7 +9407,7 @@ snapshots:
 
   sass-embedded@1.97.3:
     dependencies:
-      '@bufbuild/protobuf': 2.12.1
+      '@bufbuild/protobuf': 2.13.0
       colorjs.io: 0.5.2
       immutable: 5.1.9
       rxjs: 7.8.2
@@ -9812,24 +9435,24 @@ snapshots:
       sass-embedded-win32-x64: 1.97.3
     optional: true
 
+  sass@1.101.0:
+    dependencies:
+      chokidar: 5.0.0
+      immutable: 5.1.9
+      source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.6.0
+
   sass@1.97.3:
     dependencies:
       chokidar: 4.0.3
       immutable: 5.1.9
       source-map-js: 1.2.1
     optionalDependencies:
-      '@parcel/watcher': 2.5.6
+      '@parcel/watcher': 2.6.0
     optional: true
 
-  sass@1.99.0:
-    dependencies:
-      chokidar: 4.0.3
-      immutable: 5.1.9
-      source-map-js: 1.2.1
-    optionalDependencies:
-      '@parcel/watcher': 2.5.6
-
-  sax@1.6.0:
+  sax@1.6.1:
     optional: true
 
   saxes@6.0.0:
@@ -9854,15 +9477,13 @@ snapshots:
       lru-cache: 6.0.0
     optional: true
 
-  semver@7.7.4: {}
-
   semver@7.8.1: {}
 
   semver@7.8.5: {}
 
-  send@1.2.1:
+  send@1.2.1(supports-color@10.2.2):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -9876,12 +9497,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@2.2.1:
+  serve-static@2.2.1(supports-color@10.2.2):
     dependencies:
       encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 1.2.1
+      send: 1.2.1(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -9927,7 +9548,7 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shell-quote@1.8.4: {}
+  shell-quote@1.9.0: {}
 
   side-channel-list@1.0.1:
     dependencies:
@@ -9971,17 +9592,6 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  sigstore@4.1.1:
-    dependencies:
-      '@sigstore/bundle': 4.0.0
-      '@sigstore/core': 3.2.1
-      '@sigstore/protobuf-specs': 0.5.1
-      '@sigstore/sign': 4.1.1
-      '@sigstore/tuf': 4.0.2
-      '@sigstore/verify': 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   sirv@3.0.2:
     dependencies:
       '@polka/url': 1.0.0-next.29
@@ -9998,21 +9608,6 @@ snapshots:
       ansi-styles: 6.2.3
       is-fullwidth-code-point: 5.1.0
 
-  smart-buffer@4.2.0: {}
-
-  socks-proxy-agent@8.0.5:
-    dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
-      socks: 2.8.9
-    transitivePeerDependencies:
-      - supports-color
-
-  socks@2.8.9:
-    dependencies:
-      ip-address: 10.2.0
-      smart-buffer: 4.2.0
-
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
@@ -10024,27 +9619,14 @@ snapshots:
 
   source-map@0.7.6: {}
 
-  spdx-exceptions@2.5.0: {}
-
-  spdx-expression-parse@4.0.0:
-    dependencies:
-      spdx-exceptions: 2.5.0
-      spdx-license-ids: 3.0.23
-
-  spdx-license-ids@3.0.23: {}
-
   sprintf-js@1.0.3:
     optional: true
 
-  ssri@13.0.1:
-    dependencies:
-      minipass: 7.1.3
-
   stackback@0.0.2: {}
 
   statuses@2.0.2: {}
 
-  std-env@4.1.0: {}
+  std-env@4.2.0: {}
 
   stdin-discarder@0.3.2: {}
 
@@ -10062,7 +9644,7 @@ snapshots:
       get-east-asian-width: 1.6.0
       strip-ansi: 7.2.0
 
-  string-width@8.2.1:
+  string-width@8.2.2:
     dependencies:
       get-east-asian-width: 1.6.0
       strip-ansi: 7.2.0
@@ -10152,31 +9734,23 @@ snapshots:
   tapable@2.3.3:
     optional: true
 
-  tar@7.5.19:
-    dependencies:
-      '@isaacs/fs-minipass': 4.0.1
-      chownr: 3.0.0
-      minipass: 7.1.3
-      minizlib: 3.1.0
-      yallist: 5.0.0
-
-  terser-webpack-plugin@5.6.1(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)):
+  terser-webpack-plugin@5.6.1(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       jest-worker: 27.5.1
       schema-utils: 4.3.3
       terser: 5.46.2
-      webpack: 5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)
+      webpack: 5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)
     optionalDependencies:
       esbuild: 0.28.1
-      lightningcss: 1.32.0
-      postcss: 8.5.16
+      lightningcss: 1.33.0
+      postcss: 8.5.25
     optional: true
 
   terser@5.46.2:
     dependencies:
       '@jridgewell/source-map': 0.3.11
-      acorn: 8.17.0
+      acorn: 8.18.0
       commander: 2.20.3
       source-map-support: 0.5.21
     optional: true
@@ -10187,23 +9761,18 @@ snapshots:
 
   tinyexec@1.2.4: {}
 
-  tinyglobby@0.2.16:
-    dependencies:
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
-
   tinyglobby@0.2.17:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
 
-  tinyrainbow@3.1.0: {}
+  tinyrainbow@3.1.1: {}
 
-  tldts-core@7.4.1: {}
+  tldts-core@7.4.9: {}
 
-  tldts@7.4.0:
+  tldts@7.4.9:
     dependencies:
-      tldts-core: 7.4.1
+      tldts-core: 7.4.9
 
   to-regex-range@5.0.1:
     dependencies:
@@ -10213,9 +9782,9 @@ snapshots:
 
   totalist@3.0.1: {}
 
-  tough-cookie@6.0.1:
+  tough-cookie@6.0.2:
     dependencies:
-      tldts: 7.4.0
+      tldts: 7.4.9
 
   tr46@6.0.0:
     dependencies:
@@ -10236,20 +9805,12 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  tsx@4.22.4:
+  tsx@4.23.5:
     dependencies:
       esbuild: 0.28.1
     optionalDependencies:
       fsevents: 2.3.3
 
-  tuf-js@4.1.0:
-    dependencies:
-      '@tufjs/models': 4.1.0
-      debug: 4.4.3
-      make-fetch-happen: 15.0.6
-    transitivePeerDependencies:
-      - supports-color
-
   type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
@@ -10257,7 +9818,7 @@ snapshots:
   type-is@2.1.0:
     dependencies:
       content-type: 2.0.0
-      media-typer: 1.1.0
+      media-typer: 1.1.1
       mime-types: 3.0.2
 
   typed-array-buffer@1.0.3:
@@ -10295,22 +9856,22 @@ snapshots:
 
   typed-query-selector@2.12.2: {}
 
-  typedoc@0.28.19(typescript@6.0.3):
+  typedoc@0.28.20(typescript@6.0.3):
     dependencies:
       '@gerrit0/mini-shiki': 3.23.0
       lunr: 2.3.9
-      markdown-it: 14.2.0
+      markdown-it: 14.3.0
       minimatch: 10.2.5
       typescript: 6.0.3
       yaml: 2.9.0
 
-  typescript-eslint@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3):
+  typescript-eslint@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.62.1(@typescript-eslint/parser@8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/parser': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      '@typescript-eslint/typescript-estree': 8.62.1(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.62.1(eslint@10.6.0(jiti@2.7.0))(typescript@6.0.3)
-      eslint: 10.6.0(jiti@2.7.0)
+      '@typescript-eslint/eslint-plugin': 8.65.0(@typescript-eslint/parser@8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/typescript-estree': 8.65.0(supports-color@10.2.2)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
@@ -10318,6 +9879,8 @@ snapshots:
   typescript@5.8.2:
     optional: true
 
+  typescript@5.9.3: {}
+
   typescript@6.0.3: {}
 
   uc.micro@2.1.0: {}
@@ -10333,9 +9896,7 @@ snapshots:
 
   undici-types@8.3.0: {}
 
-  undici@6.27.0: {}
-
-  undici@7.28.0: {}
+  undici@8.9.0: {}
 
   unicorn-magic@0.3.0: {}
 
@@ -10343,25 +9904,25 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-dts@1.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.0.1))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.60.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)):
+  unplugin-dts@1.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.1.2))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.2.2)(rollup@4.60.4)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)):
     dependencies:
       '@rollup/pluginutils': 5.4.0(rollup@4.60.4)
-      '@volar/typescript': 2.4.28
+      '@volar/typescript': 2.4.28(typescript@6.0.3)
       compare-versions: 6.1.1
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@10.2.2)
       kolorist: 1.8.0
       local-pkg: 1.2.1
       magic-string: 0.30.21
       typescript: 6.0.3
       unplugin: 2.3.11
     optionalDependencies:
-      '@microsoft/api-extractor': 7.56.0(@types/node@26.0.1)
+      '@microsoft/api-extractor': 7.56.0(@types/node@26.1.2)
       '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
       esbuild: 0.28.1
-      rolldown: 1.1.3
+      rolldown: 1.2.2
       rollup: 4.60.4
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
-      webpack: 5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
+      webpack: 5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)
     transitivePeerDependencies:
       - supports-color
 
@@ -10369,12 +9930,12 @@ snapshots:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       acorn: 8.17.0
-      picomatch: 4.0.4
+      picomatch: 4.0.5
       webpack-virtual-modules: 0.6.2
 
-  update-browserslist-db@1.2.3(browserslist@4.28.4):
+  update-browserslist-db@1.2.3(browserslist@4.28.7):
     dependencies:
-      browserslist: 4.28.4
+      browserslist: 4.28.7
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -10382,14 +9943,27 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  validate-npm-package-name@7.0.2: {}
+  validate-npm-package-name@8.0.0: {}
 
   varint@6.0.0:
     optional: true
 
   vary@1.1.2: {}
 
-  vite-plugin-checker@0.14.4(eslint@10.6.0(jiti@2.7.0))(optionator@0.9.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-live-preview@0.4.0(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)):
+    dependencies:
+      '@seahax/deep-copy': 0.1.0
+      '@seahax/semaphore': 0.5.1
+      '@types/ws': 8.18.1
+      escape-goat: 4.0.0
+      strip-ansi: 7.2.0
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
+      ws: 8.21.1
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  vite-plugin-checker@0.14.5(eslint@10.6.0(jiti@2.7.0)(supports-color@10.2.2))(optionator@0.9.4)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)):
     dependencies:
       '@babel/code-frame': 7.29.7
       chokidar: 5.0.0
@@ -10398,19 +9972,19 @@ snapshots:
       picomatch: 4.0.4
       proper-lockfile: 4.1.2
       tiny-invariant: 1.3.3
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
     optionalDependencies:
-      eslint: 10.6.0(jiti@2.7.0)
+      eslint: 10.6.0(jiti@2.7.0)(supports-color@10.2.2)
       optionator: 0.9.4
       typescript: 6.0.3
 
-  vite-plugin-dts@5.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.0.1))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.60.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)):
+  vite-plugin-dts@5.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.1.2))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.2.2)(rollup@4.60.4)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)):
     dependencies:
-      unplugin-dts: 1.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.0.1))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.1.3)(rollup@4.60.4)(typescript@6.0.3)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16))
+      unplugin-dts: 1.0.3(@microsoft/api-extractor@7.56.0(@types/node@26.1.2))(@rspack/core@1.6.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(rolldown@1.2.2)(rollup@4.60.4)(supports-color@10.2.2)(typescript@6.0.3)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25))
     optionalDependencies:
-      '@microsoft/api-extractor': 7.56.0(@types/node@26.0.1)
+      '@microsoft/api-extractor': 7.56.0(@types/node@26.1.2)
       rollup: 4.60.4
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@rspack/core'
       - '@vue/language-core'
@@ -10420,81 +9994,80 @@ snapshots:
       - typescript
       - webpack
 
-  vite-plugin-static-copy@4.1.1(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-plugin-static-copy@4.1.1(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)):
     dependencies:
       chokidar: 3.6.0
       p-map: 7.0.4
       picocolors: 1.1.1
       tinyglobby: 0.2.17
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
 
-  vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0):
+  vite@8.1.5(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0):
     dependencies:
-      esbuild: 0.27.2
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
-      postcss: 8.5.16
-      rollup: 4.60.4
+      lightningcss: 1.33.0
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.1.5
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 26.0.1
-      fsevents: 2.3.3
-      jiti: 2.7.0
-      less: 4.6.4
-      lightningcss: 1.32.0
-      sass: 1.99.0
-      sass-embedded: 1.97.3
-      terser: 5.46.2
-      tsx: 4.22.4
-      yaml: 2.9.0
-
-  vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0):
-    dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.16
-      rolldown: 1.1.3
-      tinyglobby: 0.2.17
-    optionalDependencies:
-      '@types/node': 26.0.1
+      '@types/node': 26.1.2
       esbuild: 0.28.1
       fsevents: 2.3.3
       jiti: 2.7.0
       less: 4.6.4
-      sass: 1.99.0
+      sass: 1.101.0
       sass-embedded: 1.97.3
       terser: 5.46.2
-      tsx: 4.22.4
+      tsx: 4.23.5
       yaml: 2.9.0
 
-  vitest@4.1.9(@types/node@26.0.1)(@vitest/coverage-v8@4.1.9)(@vitest/ui@4.1.9)(happy-dom@20.10.6)(jsdom@29.1.1)(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)):
+  vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0):
     dependencies:
-      '@vitest/expect': 4.1.9
-      '@vitest/mocker': 4.1.9(vite@8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0))
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/runner': 4.1.9
-      '@vitest/snapshot': 4.1.9
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
-      es-module-lexer: 2.2.0
+      lightningcss: 1.33.0
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.2.2
+      tinyglobby: 0.2.17
+    optionalDependencies:
+      '@types/node': 26.1.2
+      esbuild: 0.28.1
+      fsevents: 2.3.3
+      jiti: 2.7.0
+      less: 4.6.4
+      sass: 1.101.0
+      sass-embedded: 1.97.3
+      terser: 5.46.2
+      tsx: 4.23.5
+      yaml: 2.9.0
+
+  vitest@4.1.10(@types/node@26.1.2)(@vitest/coverage-v8@4.1.10)(@vitest/ui@4.1.10)(happy-dom@20.11.1)(jsdom@30.0.1)(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)):
+    dependencies:
+      '@vitest/expect': 4.1.10
+      '@vitest/mocker': 4.1.10(vite@8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0))
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/runner': 4.1.10
+      '@vitest/snapshot': 4.1.10
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      es-module-lexer: 2.3.1
       expect-type: 1.4.0
       magic-string: 0.30.21
-      obug: 2.1.3
+      obug: 2.1.4
       pathe: 2.0.3
-      picomatch: 4.0.4
-      std-env: 4.1.0
+      picomatch: 4.0.5
+      std-env: 4.2.0
       tinybench: 2.9.0
       tinyexec: 1.2.4
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
-      vite: 8.1.1(@types/node@26.0.1)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.99.0)(terser@5.46.2)(tsx@4.22.4)(yaml@2.9.0)
+      tinyrainbow: 3.1.1
+      vite: 8.2.0(@types/node@26.1.2)(esbuild@0.28.1)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.97.3)(sass@1.101.0)(terser@5.46.2)(tsx@4.23.5)(yaml@2.9.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 26.0.1
-      '@vitest/coverage-v8': 4.1.9(vitest@4.1.9)
-      '@vitest/ui': 4.1.9(vitest@4.1.9)
-      happy-dom: 20.10.6
-      jsdom: 29.1.1
+      '@types/node': 26.1.2
+      '@vitest/coverage-v8': 4.1.10(vitest@4.1.10)
+      '@vitest/ui': 4.1.10(vitest@4.1.10)
+      happy-dom: 20.11.1
+      jsdom: 30.0.1
     transitivePeerDependencies:
       - msw
 
@@ -10504,15 +10077,9 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
-  watchpack@2.5.1:
-    dependencies:
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-
   watchpack@2.5.2:
     dependencies:
       graceful-fs: 4.2.11
-    optional: true
 
   weak-lru-cache@1.2.2:
     optional: true
@@ -10521,12 +10088,12 @@ snapshots:
 
   webidl-conversions@8.0.1: {}
 
-  webpack-sources@3.5.0:
+  webpack-sources@3.5.1:
     optional: true
 
   webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16):
+  webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.9
@@ -10534,12 +10101,12 @@ snapshots:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/wasm-edit': 1.14.1
       '@webassemblyjs/wasm-parser': 1.14.1
-      acorn: 8.17.0
-      acorn-import-phases: 1.0.4(acorn@8.17.0)
-      browserslist: 4.28.4
+      acorn: 8.18.0
+      acorn-import-phases: 1.0.4(acorn@8.18.0)
+      browserslist: 4.28.7
       chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.24.1
-      es-module-lexer: 2.2.0
+      enhanced-resolve: 5.24.4
+      es-module-lexer: 2.3.1
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
@@ -10549,9 +10116,9 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 4.3.3
       tapable: 2.3.3
-      terser-webpack-plugin: 5.6.1(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16)(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.32.0)(postcss@8.5.16))
+      terser-webpack-plugin: 5.6.1(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25)(webpack@5.106.2(esbuild@0.28.1)(lightningcss@1.33.0)(postcss@8.5.25))
       watchpack: 2.5.2
-      webpack-sources: 3.5.0
+      webpack-sources: 3.5.1
     transitivePeerDependencies:
       - '@minify-html/node'
       - '@swc/core'
@@ -10579,6 +10146,14 @@ snapshots:
     transitivePeerDependencies:
       - '@noble/hashes'
 
+  whatwg-url@17.1.0:
+    dependencies:
+      '@exodus/bytes': 1.15.1
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   which-boxed-primitive@1.1.1:
     dependencies:
       is-bigint: 1.1.0
@@ -10624,10 +10199,6 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
-  which@6.0.1:
-    dependencies:
-      isexe: 4.0.0
-
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
@@ -10638,7 +10209,7 @@ snapshots:
   wrap-ansi@10.0.0:
     dependencies:
       ansi-styles: 6.2.3
-      string-width: 8.2.1
+      string-width: 8.2.2
       strip-ansi: 7.2.0
 
   wrap-ansi@9.0.2:
@@ -10651,6 +10222,8 @@ snapshots:
 
   ws@8.21.0: {}
 
+  ws@8.21.1: {}
+
   xml-name-validator@5.0.0: {}
 
   xmlchars@2.2.0: {}
@@ -10659,9 +10232,8 @@ snapshots:
 
   yallist@3.1.1: {}
 
-  yallist@4.0.0: {}
-
-  yallist@5.0.0: {}
+  yallist@4.0.0:
+    optional: true
 
   yaml@2.9.0: {}
 
@@ -10676,13 +10248,22 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 22.0.0
 
+  yargs@18.1.0:
+    dependencies:
+      cliui: 9.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      string-width: 8.2.2
+      y18n: 5.0.8
+      yargs-parser: 22.0.0
+
   yocto-queue@0.1.0: {}
 
-  yoctocolors@2.1.2: {}
+  yoctocolors@2.2.0: {}
 
-  zod-to-json-schema@3.25.2(zod@4.4.2):
+  zod-to-json-schema@3.25.2(zod@4.4.3):
     dependencies:
-      zod: 4.4.2
+      zod: 4.4.3
 
   zod-validation-error@4.0.2(zod@4.4.3):
     dependencies:
@@ -10690,8 +10271,6 @@ snapshots:
 
   zod@3.25.76: {}
 
-  zod@4.4.2: {}
-
   zod@4.4.3: {}
 
   zone.js@0.16.2: {}
diff --git a/plugins/pnpm-workspace.yaml b/plugins/pnpm-workspace.yaml
index ce14894b25..a0099791fc 100644
--- a/plugins/pnpm-workspace.yaml
+++ b/plugins/pnpm-workspace.yaml
@@ -20,10 +20,15 @@ minimumReleaseAgeExclude:
   - esbuild@0.28.1
   - '@babel/core@7.29.1'
   - undici@7.28.0
+  - brace-expansion@1.1.16 || 1.1.17 || 1.1.18 || 5.0.8 || 5.0.9
+  - '@hono/node-server@2.0.5'
+  - fast-uri@3.1.5
 
 overrides:
   '@babel/core@<=7.29.0': ^7.29.1
+  '@hono/node-server@<2.0.5': ^2.0.5
   ajv@>=7.0.0-alpha.0 <8.18.0: ^8.18.0
+  brace-expansion@>=4.0.0 <5.0.9: ^5.0.9
   lodash@<=4.17.23: ^4.17.24
   lodash@>=4.0.0 <=4.17.23: ^4.17.24
   minimatch@>=10.0.0 <10.2.1: ^10.2.1
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0deb5862af..008bd049b7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,31 +4,40 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  playwright@>=1.61.1 <2.0.0-0: 1.62.1
+
 importers:
 
   .:
     devDependencies:
       '@playwright/mcp':
-        specifier: ^0.0.76
-        version: 0.0.76
+        specifier: ^0.0.78
+        version: 0.0.78
       '@playwright/test':
-        specifier: ^1.61.1
-        version: 1.61.1
+        specifier: ^1.62.0
+        version: 1.62.0
       '@types/node':
-        specifier: ^26.0.1
-        version: 26.0.1
+        specifier: ^26.1.2
+        version: 26.1.2
+      commander:
+        specifier: ^15.0.0
+        version: 15.0.0
+      dotenv:
+        specifier: ^17.4.2
+        version: 17.4.2
       esbuild:
         specifier: ^0.28.1
         version: 0.28.1
       mdts:
-        specifier: ^0.20.3
-        version: 0.20.3
+        specifier: ^0.20.6
+        version: 0.20.6
       nrepl-client:
         specifier: ^0.3.0
         version: 0.3.0
       playwright:
-        specifier: ^1.61.1
-        version: 1.61.1
+        specifier: 1.62.1
+        version: 1.62.1
 
 packages:
 
@@ -194,14 +203,14 @@ packages:
   '@kwsites/promise-deferred@1.1.1':
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
 
-  '@playwright/mcp@0.0.76':
-    resolution: {integrity: sha512-ICcW6wAV+HoNEco19eni+JTVylCIIedruWkrRl2Rsv/qcGhBZLT/c0I1VounjIjSVSupw3pHmcr3CNCikTHTBQ==}
+  '@playwright/mcp@0.0.78':
+    resolution: {integrity: sha512-XLTUeA6mEN9sQ+hJ4dfG8EIkDbxS0K3Trc2RBkUJuf02TgE2FQRNTMtq/aJfhyRMINsRl/Ybc4sxcWLtFn4/TQ==}
     engines: {node: '>=18'}
     hasBin: true
 
-  '@playwright/test@1.61.1':
-    resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==}
-    engines: {node: '>=18'}
+  '@playwright/test@1.62.0':
+    resolution: {integrity: sha512-9zOJ6ZQRAena31MpOH9VSzIz8Ou3YJ/wtY/eQm5T2uhfhG7/U3COrMS8xOtUrZrp9OgdmzEnIYODye3nY1VqzA==}
+    engines: {node: '>=20'}
     hasBin: true
 
   '@simple-git/args-pathspec@1.0.3':
@@ -210,8 +219,8 @@ packages:
   '@simple-git/argv-parser@1.1.1':
     resolution: {integrity: sha512-Q9lBcfQ+VQCpQqGJFHe5yooOS5hGdLFFbJ5R+R5aDsnkPCahtn1hSkMcORX65J2Z5lxSkD0lQorMsncuBQxYUw==}
 
-  '@types/node@26.0.1':
-    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
   accepts@2.0.0:
     resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
@@ -227,13 +236,13 @@ packages:
   bencode@2.0.3:
     resolution: {integrity: sha512-D/vrAD4dLVX23NalHwb8dSvsUsxeRPO8Y7ToKA015JQYq69MLDOMkC0uGZYA/MPpltLO8rt8eqFC2j8DxjTZ/w==}
 
-  body-parser@2.2.2:
-    resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
+  body-parser@2.3.0:
+    resolution: {integrity: sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==}
     engines: {node: '>=18'}
 
-  brace-expansion@5.0.6:
-    resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   bundle-name@4.1.0:
     resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
@@ -263,9 +272,9 @@ packages:
     resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
     engines: {node: '>=16'}
 
-  commander@14.0.3:
-    resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
-    engines: {node: '>=20'}
+  commander@15.0.0:
+    resolution: {integrity: sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg==}
+    engines: {node: '>=22.12.0'}
 
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
@@ -319,6 +328,10 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
+  dotenv@17.4.2:
+    resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==}
+    engines: {node: '>=12'}
+
   dunder-proto@1.0.1:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
@@ -428,8 +441,8 @@ packages:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
 
-  iconv-lite@0.7.2:
-    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+  iconv-lite@0.7.3:
+    resolution: {integrity: sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==}
     engines: {node: '>=0.10.0'}
 
   inherits@2.0.4:
@@ -467,30 +480,30 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  linkify-it@5.0.1:
-    resolution: {integrity: sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==}
+  linkify-it@5.0.2:
+    resolution: {integrity: sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==}
 
-  lru-cache@11.5.1:
-    resolution: {integrity: sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==}
+  lru-cache@11.5.2:
+    resolution: {integrity: sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==}
     engines: {node: 20 || >=22}
 
-  markdown-it@14.2.0:
-    resolution: {integrity: sha512-1TGiQiJVRQ3NPmZH6sx5Cfnmg6GQm9jvC1ch4TK511NjSJvjzKLzn5pPfZRNZkRPZP0HqCioSndqH8v2nRaWVQ==}
+  markdown-it@14.3.0:
+    resolution: {integrity: sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==}
     hasBin: true
 
   math-intrinsics@1.1.0:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mdts@0.20.3:
-    resolution: {integrity: sha512-XFLIyc9ugFru6+LX7FmaadY6N6WbY9wll5PsemE9DVC/v1hy6iH/oYx/i+aGXe8wv25ihgmS5/RWOFlHMHZopQ==}
+  mdts@0.20.6:
+    resolution: {integrity: sha512-neAeLeOwAalXG5NhaUZ7iLj3R0N7lsCCsGQ5utDwSJaMNZSspeEyjjYCdoQHx7b10958S8cmEYKSpQR6DamCyg==}
     hasBin: true
 
-  mdurl@2.0.0:
-    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
+  mdurl@2.1.0:
+    resolution: {integrity: sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==}
 
-  media-typer@1.1.0:
-    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+  media-typer@1.1.1:
+    resolution: {integrity: sha512-yz3xRaG20c6/BOzvYoDaGtPmGscs7YivItZEEqe6GbwNfHuxu9YNmvnEkMzKldAGY4/80pRcQRZSEnhquk9XuQ==}
     engines: {node: '>= 0.8'}
 
   merge-descriptors@2.0.0:
@@ -512,8 +525,8 @@ packages:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
 
-  minimatch@10.2.5:
-    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+  minimatch@10.2.6:
+    resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
     engines: {node: 18 || 20 || >=22}
 
   minipass@7.1.3:
@@ -587,24 +600,24 @@ packages:
   plantuml@0.0.2:
     resolution: {integrity: sha512-3YzQJUO1Yg+mDckTm3Ht5Q8bmtN8g3M9LD8fXqiqHDW3vzUpHrUe9lxVY6AT1I50w7FdOned0hhJno4JBIku2g==}
 
-  playwright-core@1.61.0-alpha-1781023400000:
-    resolution: {integrity: sha512-UdtUd9qnCO0zvb8p3OvOZpelY6mA40mTb3NmWGuMtrD+hqqWuorWCPlSGwj7jw/LEB9AxvYLHTL1CJi2flvksg==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.0-alpha-1783623505000:
+    resolution: {integrity: sha512-CPJZdsA/KGT2QQlekiV6Wt+QlQrZHVSZ6oiNtOI/bYYOIVLM8jfKGWTM4zQiyd4UN+40Cq4cA6lxmZHZbtPvJQ==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright-core@1.61.1:
-    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.1:
+    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.61.0-alpha-1781023400000:
-    resolution: {integrity: sha512-8TRUG3IvwaAhuVm6k3C5vB7CwC5Fxq76DCCxOgPr6r1dpTedDwxlmdOBUkSZ0zxfxP14jcuPxi86/Trq4eA03w==}
-    engines: {node: '>=18'}
+  playwright@1.62.0-alpha-1783623505000:
+    resolution: {integrity: sha512-6KV9h4PP3hqu4NaGdxxcijWfYh9LJcFI/R2sP4TTC4I5cFo3oRawN0ETlW5MkE3cQEgKhhoj0KUNz4sfpCT0Tg==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.61.1:
-    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
-    engines: {node: '>=18'}
+  playwright@1.62.1:
+    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+    engines: {node: '>=20'}
     hasBin: true
 
   powershell-utils@0.1.0:
@@ -622,12 +635,12 @@ packages:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
 
-  qs@6.15.2:
-    resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==}
+  qs@6.15.3:
+    resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}
     engines: {node: '>=0.6'}
 
-  range-parser@1.2.1:
-    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+  range-parser@1.3.0:
+    resolution: {integrity: sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==}
     engines: {node: '>= 0.6'}
 
   raw-body@3.0.2:
@@ -680,8 +693,8 @@ packages:
     resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
     engines: {node: '>= 0.4'}
 
-  side-channel@1.1.0:
-    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
     engines: {node: '>= 0.4'}
 
   signal-exit@3.0.7:
@@ -732,8 +745,8 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -836,14 +849,14 @@ snapshots:
 
   '@kwsites/promise-deferred@1.1.1': {}
 
-  '@playwright/mcp@0.0.76':
+  '@playwright/mcp@0.0.78':
     dependencies:
-      playwright: 1.61.0-alpha-1781023400000
-      playwright-core: 1.61.0-alpha-1781023400000
+      playwright: 1.62.0-alpha-1783623505000
+      playwright-core: 1.62.0-alpha-1783623505000
 
-  '@playwright/test@1.61.1':
+  '@playwright/test@1.62.0':
     dependencies:
-      playwright: 1.61.1
+      playwright: 1.62.1
 
   '@simple-git/args-pathspec@1.0.3': {}
 
@@ -851,7 +864,7 @@ snapshots:
     dependencies:
       '@simple-git/args-pathspec': 1.0.3
 
-  '@types/node@26.0.1':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
@@ -866,21 +879,21 @@ snapshots:
 
   bencode@2.0.3: {}
 
-  body-parser@2.2.2:
+  body-parser@2.3.0:
     dependencies:
       bytes: 3.1.2
-      content-type: 1.0.5
+      content-type: 2.0.0
       debug: 4.4.3
       http-errors: 2.0.1
-      iconv-lite: 0.7.2
+      iconv-lite: 0.7.3
       on-finished: 2.4.1
-      qs: 6.15.2
+      qs: 6.15.3
       raw-body: 3.0.2
       type-is: 2.1.0
     transitivePeerDependencies:
       - supports-color
 
-  brace-expansion@5.0.6:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -908,7 +921,7 @@ snapshots:
 
   commander@11.1.0: {}
 
-  commander@14.0.3: {}
+  commander@15.0.0: {}
 
   commander@2.20.3: {}
 
@@ -943,6 +956,8 @@ snapshots:
 
   depd@2.0.0: {}
 
+  dotenv@17.4.2: {}
+
   dunder-proto@1.0.1:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -1015,7 +1030,7 @@ snapshots:
   express@5.2.1:
     dependencies:
       accepts: 2.0.0
-      body-parser: 2.2.2
+      body-parser: 2.3.0
       content-disposition: 1.1.0
       content-type: 1.0.5
       cookie: 0.7.2
@@ -1034,8 +1049,8 @@ snapshots:
       once: 1.4.0
       parseurl: 1.3.3
       proxy-addr: 2.0.7
-      qs: 6.15.2
-      range-parser: 1.2.1
+      qs: 6.15.3
+      range-parser: 1.3.0
       router: 2.2.0
       send: 1.2.1
       serve-static: 2.2.1
@@ -1091,7 +1106,7 @@ snapshots:
 
   glob@13.0.6:
     dependencies:
-      minimatch: 10.2.5
+      minimatch: 10.2.6
       minipass: 7.1.3
       path-scurry: 2.0.2
 
@@ -1113,7 +1128,7 @@ snapshots:
 
   human-signals@1.1.1: {}
 
-  iconv-lite@0.7.2:
+  iconv-lite@0.7.3:
     dependencies:
       safer-buffer: 2.1.2
 
@@ -1139,46 +1154,46 @@ snapshots:
 
   isexe@2.0.0: {}
 
-  linkify-it@5.0.1:
+  linkify-it@5.0.2:
     dependencies:
       uc.micro: 2.1.0
 
-  lru-cache@11.5.1: {}
+  lru-cache@11.5.2: {}
 
-  markdown-it@14.2.0:
+  markdown-it@14.3.0:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
-      linkify-it: 5.0.1
-      mdurl: 2.0.0
+      linkify-it: 5.0.2
+      mdurl: 2.1.0
       punycode.js: 2.3.1
       uc.micro: 2.1.0
 
   math-intrinsics@1.1.0: {}
 
-  mdts@0.20.3:
+  mdts@0.20.6:
     dependencies:
       chalk: 5.6.2
       chokidar: 4.0.3
-      commander: 14.0.3
+      commander: 15.0.0
       express: 5.2.1
       github-slugger: 2.0.0
       glob: 13.0.6
-      markdown-it: 14.2.0
+      markdown-it: 14.3.0
       node-plantuml-back: 1.1.4
       open: 11.0.0
       plantuml: 0.0.2
       plantuml-encoder: 1.4.0
       simple-git: 3.36.0
-      ws: 8.21.0
+      ws: 8.21.1
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  mdurl@2.0.0: {}
+  mdurl@2.1.0: {}
 
-  media-typer@1.1.0: {}
+  media-typer@1.1.1: {}
 
   merge-descriptors@2.0.0: {}
 
@@ -1192,9 +1207,9 @@ snapshots:
 
   mimic-fn@2.1.0: {}
 
-  minimatch@10.2.5:
+  minimatch@10.2.6:
     dependencies:
-      brace-expansion: 5.0.6
+      brace-expansion: 5.0.9
 
   minipass@7.1.3: {}
 
@@ -1253,7 +1268,7 @@ snapshots:
 
   path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.5.1
+      lru-cache: 11.5.2
       minipass: 7.1.3
 
   path-to-regexp@8.4.2: {}
@@ -1265,19 +1280,19 @@ snapshots:
       execa: 4.1.0
       get-stream: 5.2.0
 
-  playwright-core@1.61.0-alpha-1781023400000: {}
+  playwright-core@1.62.0-alpha-1783623505000: {}
 
-  playwright-core@1.61.1: {}
+  playwright-core@1.62.1: {}
 
-  playwright@1.61.0-alpha-1781023400000:
+  playwright@1.62.0-alpha-1783623505000:
     dependencies:
-      playwright-core: 1.61.0-alpha-1781023400000
+      playwright-core: 1.62.0-alpha-1783623505000
     optionalDependencies:
       fsevents: 2.3.2
 
-  playwright@1.61.1:
+  playwright@1.62.1:
     dependencies:
-      playwright-core: 1.61.1
+      playwright-core: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -1295,17 +1310,18 @@ snapshots:
 
   punycode.js@2.3.1: {}
 
-  qs@6.15.2:
+  qs@6.15.3:
     dependencies:
-      side-channel: 1.1.0
+      es-define-property: 1.0.1
+      side-channel: 1.1.1
 
-  range-parser@1.2.1: {}
+  range-parser@1.3.0: {}
 
   raw-body@3.0.2:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.1
-      iconv-lite: 0.7.2
+      iconv-lite: 0.7.3
       unpipe: 1.0.0
 
   readdirp@4.1.2: {}
@@ -1335,7 +1351,7 @@ snapshots:
       mime-types: 3.0.2
       ms: 2.1.3
       on-finished: 2.4.1
-      range-parser: 1.2.1
+      range-parser: 1.3.0
       statuses: 2.0.2
     transitivePeerDependencies:
       - supports-color
@@ -1377,7 +1393,7 @@ snapshots:
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
-  side-channel@1.1.0:
+  side-channel@1.1.1:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
@@ -1408,7 +1424,7 @@ snapshots:
   type-is@2.1.0:
     dependencies:
       content-type: 2.0.0
-      media-typer: 1.1.0
+      media-typer: 1.1.1
       mime-types: 3.0.2
 
   uc.micro@2.1.0: {}
@@ -1425,7 +1441,7 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  ws@8.21.0: {}
+  ws@8.21.1: {}
 
   wsl-utils@0.3.1:
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 381d72d613..7a28fcc29c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,10 @@
 allowBuilds:
   esbuild: true
-  opencode-ai: true
+
+minimumReleaseAgeExclude:
+  - playwright-core@1.62.1
+  - playwright@1.62.1
+  - brace-expansion@5.0.9
+
+overrides:
+  "playwright@>=1.61.1 <2.0.0-0": "1.62.1"
diff --git a/render-wasm/Cargo.toml b/render-wasm/Cargo.toml
index 15f8f39335..b17e3aa69f 100644
--- a/render-wasm/Cargo.toml
+++ b/render-wasm/Cargo.toml
@@ -42,3 +42,7 @@ opt-level = 3
 lto = "fat"
 strip = true
 codegen-units = 1
+
+[profile.size]
+inherits = "release"
+opt-level = "z"
diff --git a/render-wasm/README.md b/render-wasm/README.md
index b1010bb70c..4ed4830bcd 100644
--- a/render-wasm/README.md
+++ b/render-wasm/README.md
@@ -29,6 +29,34 @@ You can also use `./watch` to run the build on every change.
 
 The build script will compile the project and copy the `.js` and `.wasm` files to their correct location within the frontend app.
 
+### Render targets
+
+The same Rust source produces two artifacts, which differ only in compiler
+options:
+
+| Target     | Tuned for | Cargo profile     | Consumed by                    |
+| ---------- | --------- | ----------------- | ------------------------------ |
+| `frontend` | speed     | `release` (`-O3`) | `frontend/resources/public/js` |
+| `export`   | size      | `size` (`-Oz`)    | `exporter/resources/wasm`      |
+
+```sh
+./build            # both targets, frontend first
+./build frontend   # workspace / viewer renderer
+./build export     # headless exporter renderer
+```
+
+`./watch` still follows a single target (`frontend` unless you pass one),
+since watching both would rebuild twice on every keystroke.
+
+Each target keeps its own `CARGO_TARGET_DIR` (`target/<target>`), so switching
+between them does not invalidate the other's cache. Set `BUILD_MODE=release`
+(or `NODE_ENV=production`) for an optimized build; the default is `debug`.
+
+Each target writes its own generated `shared.js` (the enum discriminants the
+CLJS side compiles against) next to the code that imports it — respectively
+`frontend/src/app/render_wasm/api/shared.js` and
+`exporter/src/app/wasm/shared.js`. Neither build writes to the other's paths.
+
 ![Architecture overview](docs/images/architecture_schema.png)
 
 
diff --git a/render-wasm/_build_env b/render-wasm/_build_env
index 0b506e415d..e034580dfd 100644
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -1,15 +1,25 @@
 #!/usr/bin/env bash
 
 export VERSION_TAG=${VERSION:-develop};
+export RENDER_TARGET="${RENDER_TARGET:-${1:-frontend}}";
+
+case "$RENDER_TARGET" in
+    frontend|export) ;;
+    *)
+        echo "ERROR: unknown render target '$RENDER_TARGET' (expected 'frontend' or 'export')" >&2;
+        exit 1;
+        ;;
+esac
 
 if [ "$NODE_ENV" = "production" ];  then
     export BUILD_MODE="release";
 else
-    export BUILD_MODE=${1:-debug};
+    export BUILD_MODE=${BUILD_MODE:-debug};
 fi
 
 export BUILD_NAME="${BUILD_NAME:-render-wasm}"
 export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
+export CARGO_TARGET_DIR=${CARGO_TARGET_DIR:-"target/$RENDER_TARGET"};
 export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
 
 # 256 MB of initial heap to perform less
@@ -51,9 +61,21 @@ export EM_CACHE="/tmp/emsdk_cache";
 
 export CARGO_PARAMS="${@:2}";
 
+export CARGO_PROFILE_DIR="debug";
+
 if [ "$BUILD_MODE" = "release" ]; then
-    export CARGO_PARAMS="--release $CARGO_PARAMS"
-    export EMCC_CFLAGS="-O3 -sASSERTIONS=0 $EMCC_CFLAGS"
+    case "$RENDER_TARGET" in
+        frontend)
+            export CARGO_PARAMS="--release $CARGO_PARAMS";
+            export CARGO_PROFILE_DIR="release";
+            export EMCC_CFLAGS="-O3 -sASSERTIONS=0 $EMCC_CFLAGS";
+            ;;
+        export)
+            export CARGO_PARAMS="--profile size $CARGO_PARAMS";
+            export CARGO_PROFILE_DIR="size";
+            export EMCC_CFLAGS="-Oz -sASSERTIONS=0 $EMCC_CFLAGS";
+            ;;
+    esac
 else
     # TODO: Extra parameters that could be good to look into:
     #        -gseparate-dwarf
@@ -62,6 +84,12 @@ else
     export EMCC_CFLAGS="-g -sASSERTIONS=1 -sVERBOSE=1 $EMCC_CFLAGS"
 fi
 
+export FRONTEND_DEST="../frontend/resources/public/js";
+export EXPORT_DEST="../exporter/resources/wasm";
+
+export FRONTEND_SHARED_DEST="../frontend/src/app/render_wasm/api/shared.js";
+export EXPORT_SHARED_DEST="../exporter/src/app/wasm/shared.js";
+
 function clean {
     cargo clean;
 }
@@ -78,26 +106,48 @@ function build {
 
 function copy_artifacts {
     DEST=$1;
+    SRC="$CARGO_TARGET_DIR/$CARGO_BUILD_TARGET/$CARGO_PROFILE_DIR";
 
     mkdir -p $DEST;
 
-    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js $DEST/$BUILD_NAME.js;
-    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm $DEST/$BUILD_NAME.wasm;
-    if [ -f target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm.map ]; then
-        cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm.map $DEST/$BUILD_NAME.wasm.map;
+    cp $SRC/render_wasm.js $DEST/$BUILD_NAME.js;
+    cp $SRC/render_wasm.wasm $DEST/$BUILD_NAME.wasm;
+    if [ -f $SRC/render_wasm.wasm.map ]; then
+        cp $SRC/render_wasm.wasm.map $DEST/$BUILD_NAME.wasm.map;
     fi
 
     sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$VERSION_TAG/g" $DEST/$BUILD_NAME.js;
 
-    pnpm exec esbuild target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \
-        --log-level=error \
-        --outfile=$DEST/worker/render.js \
-        --platform=neutral \
-        --format=iife \
-        --global-name=WasmModule;
+    # The worker bundle is a browser concern; the exporter imports the ESM
+    # module directly under Node.
+    if [ "$RENDER_TARGET" = "frontend" ]; then
+        pnpm exec esbuild $SRC/render_wasm.js \
+            --log-level=error \
+            --outfile=$DEST/worker/render.js \
+            --platform=neutral \
+            --format=iife \
+            --global-name=WasmModule;
+    fi
 }
 
 function copy_shared_artifact {
-    SHARED_FILE=$(find target/wasm32-unknown-emscripten -name render_wasm_shared.js | head -n 1);
-    cp $SHARED_FILE ../frontend/src/app/render_wasm/api/shared.js;
+    DEST=$1;
+    SHARED_FILE=$(find $CARGO_TARGET_DIR/$CARGO_BUILD_TARGET -name render_wasm_shared.js | head -n 1);
+
+    cp $SHARED_FILE $DEST;
+}
+
+# Copies whatever the current RENDER_TARGET produced to where that target's
+# consumer reads it.
+function copy_target_artifacts {
+    case "$RENDER_TARGET" in
+        frontend)
+            copy_artifacts "$FRONTEND_DEST";
+            copy_shared_artifact "$FRONTEND_SHARED_DEST";
+            ;;
+        export)
+            copy_artifacts "$EXPORT_DEST";
+            copy_shared_artifact "$EXPORT_SHARED_DEST";
+            ;;
+    esac
 }
diff --git a/render-wasm/build b/render-wasm/build
index 2505ae0cf9..2a832fc3f4 100755
--- a/render-wasm/build
+++ b/render-wasm/build
@@ -1,8 +1,26 @@
 #!/usr/bin/env bash
 
+# Usage: ./build [frontend|export] [extra cargo params...]
+#
+# With no target, builds both. Set BUILD_MODE=release (or NODE_ENV=production)
+# for an optimized build. See `_build_env` for what each target changes.
+
+_SCRIPT_DIR=$(dirname $0);
+
+# Each target needs its own `_build_env`, so re-enter per target.
+case "${1:-}" in
+    frontend|export)
+        ;;
+    *)
+        for _target in frontend export; do
+            "$_SCRIPT_DIR/build" "$_target" "$@" || exit $?;
+        done
+        exit 0;
+        ;;
+esac
+
 EMSDK_QUIET=1 . /opt/emsdk/emsdk_env.sh
 
-_SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;
 
 . ./_build_env
@@ -11,8 +29,7 @@ set -ex;
 
 setup;
 build;
-copy_artifacts "../frontend/resources/public/js";
-copy_shared_artifact;
+copy_target_artifacts;
 
 exit $?;
 
diff --git a/render-wasm/docs/rendering_architecture.md b/render-wasm/docs/rendering_architecture.md
index 709c882900..12812af022 100644
--- a/render-wasm/docs/rendering_architecture.md
+++ b/render-wasm/docs/rendering_architecture.md
@@ -80,7 +80,10 @@ flowchart TB
 The client-side WASM export — rendering in the browser through the vector path
 (`render_shape_pdf` / `render_shape_pixels`) — is wired **only for single
 exports** (`request-simple-export` in `frontend/.../exports/assets.cljs`), and
-only when render-wasm is active and the `:wasm-export` flag is set.
+only when render-wasm is active and the `wasm-export/v1` feature is enabled
+(instance-wide through the `enable-feature-wasm-export` flag, or per team
+through the team `features` column). The exporter service keeps its own
+`:wasm-export` flag to decide whether it can serve the headless WASM path.
 
 **Multiple/batch export** (`request-multiple-export`) always runs **server-side**
 via the `:export-shapes` command; it merely passes an `:is-wasm` hint so the
diff --git a/render-wasm/lint b/render-wasm/lint
index e94145189a..4ed7d6826d 100755
--- a/render-wasm/lint
+++ b/render-wasm/lint
@@ -8,7 +8,7 @@ if [[ "$1" == "--debug" ]]; then
     set -x
 fi
 
-. ./_build_env
+. ./_build_env frontend
 
 export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
 export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
diff --git a/render-wasm/package.json b/render-wasm/package.json
index 1a86f5737b..75e77ee457 100644
--- a/render-wasm/package.json
+++ b/render-wasm/package.json
@@ -4,14 +4,14 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "type": "module",
   "devDependencies": {
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.2",
     "esbuild": "^0.28.1"
   }
 }
diff --git a/render-wasm/pnpm-lock.yaml b/render-wasm/pnpm-lock.yaml
index 5b1cc35622..0d580aceed 100644
--- a/render-wasm/pnpm-lock.yaml
+++ b/render-wasm/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     devDependencies:
       '@types/node':
-        specifier: ^26.0.1
-        version: 26.0.1
+        specifier: ^26.1.2
+        version: 26.1.2
       esbuild:
         specifier: ^0.28.1
         version: 0.28.1
@@ -173,8 +173,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@types/node@26.0.1':
-    resolution: {integrity: sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==}
+  '@types/node@26.1.2':
+    resolution: {integrity: sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==}
 
   esbuild@0.28.1:
     resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
@@ -264,7 +264,7 @@ snapshots:
   '@esbuild/win32-x64@0.28.1':
     optional: true
 
-  '@types/node@26.0.1':
+  '@types/node@26.1.2':
     dependencies:
       undici-types: 8.3.0
 
diff --git a/render-wasm/src/globals.rs b/render-wasm/src/globals.rs
index cd0fcf0bbf..b1de8c9271 100644
--- a/render-wasm/src/globals.rs
+++ b/render-wasm/src/globals.rs
@@ -40,6 +40,17 @@ pub(crate) fn get_render_state() -> &'static mut RenderState {
     }
 }
 
+#[inline(always)]
+pub(crate) fn current_browser() -> u8 {
+    unsafe {
+        if DESIGN_STATE.is_null() {
+            0
+        } else {
+            (*DESIGN_STATE).current_browser
+        }
+    }
+}
+
 #[inline(always)]
 pub(crate) fn has_render_state() -> bool {
     unsafe { !RENDER_STATE.is_null() }
diff --git a/render-wasm/src/main.rs b/render-wasm/src/main.rs
index 06ad3caaad..2d007d18e4 100644
--- a/render-wasm/src/main.rs
+++ b/render-wasm/src/main.rs
@@ -20,6 +20,7 @@ use std::collections::HashMap;
 
 #[allow(unused_imports)]
 use crate::error::{Error, Result};
+use crate::render::raster::RasterFormat;
 use crate::render::{FrameType, RenderFlag};
 
 use globals::{get_design_state, get_gpu_state, get_render_state, get_resources, has_render_state};
@@ -236,6 +237,23 @@ pub extern "C" fn render_from_cache(_: i32) -> Result<()> {
     Ok(())
 }
 
+#[no_mangle]
+#[wasm_error]
+pub extern "C" fn render_from_backbuffer() -> Result<()> {
+    with_state!(state, {
+        // Re-present the last fully rendered frame from the Backbuffer with the
+        // UI overlay (rulers) redrawn on top. Unlike `render_from_cache`, it does
+        // NOT rebuild the Backbuffer from the document tile atlas — that atlas is
+        // capped at scale <= 1.0, so on a zoomed-in view its blit is a blurry
+        // upscale and swapping it in reads as a flash. Reusing the Backbuffer is
+        // pixel-identical at any zoom. Only valid on a stable viewbox (the
+        // Backbuffer must still match the current view); pan/zoom keeps using
+        // `render_from_cache`.
+        state.present_frame();
+    });
+    Ok(())
+}
+
 #[no_mangle]
 #[wasm_error]
 pub extern "C" fn set_preview_mode(enabled: bool) -> Result<()> {
@@ -724,6 +742,19 @@ pub extern "C" fn is_image_cached(
     Ok(result)
 }
 
+/// Evicts least-recently-used images until the store retains at most
+/// `max_mb` megabytes of image data. Called by the headless exporter between
+/// requests — never mid-render, so an image can't disappear under a running
+/// export; evicted images are re-provisioned by later requests that need
+/// them. Returns the number of evicted images.
+#[no_mangle]
+#[wasm_error]
+pub extern "C" fn evict_images_to_budget(max_mb: u32) -> Result<u32> {
+    let max_bytes = (max_mb as usize) * 1024 * 1024;
+    let evicted = get_resources().images.evict_to_budget(max_bytes);
+    Ok(evicted as u32)
+}
+
 #[no_mangle]
 #[wasm_error]
 pub extern "C" fn set_shape_svg_raw_content() -> Result<()> {
@@ -945,6 +976,9 @@ pub extern "C" fn get_shape_extrect(a: u32, b: u32, c: u32, d: u32) -> Result<*m
     })
 }
 
+/// Raster image via the GPU surface. Returns `[len][width][height][bytes]`
+/// (LE). `format` selects the encoder: 0 = PNG, 1 = JPEG, 2 = WEBP (see
+/// `RasterFormat`).
 #[no_mangle]
 #[wasm_error]
 pub extern "C" fn render_shape_pixels(
@@ -953,6 +987,7 @@ pub extern "C" fn render_shape_pixels(
     c: u32,
     d: u32,
     scale: f32,
+    format: u32,
 ) -> Result<*mut u8> {
     let id = uuid_from_u32_quartet(a, b, c, d);
 
@@ -960,9 +995,11 @@ pub extern "C" fn render_shape_pixels(
         return Err(Error::CriticalError("Scale is not finite".to_string()));
     }
 
+    let format = RasterFormat::from_u32(format)?;
+
     with_state!(state, {
         let (data, width, height) =
-            state.render_shape_pixels(&id, scale, performance::get_time())?;
+            state.render_shape_pixels(&id, scale, performance::get_time(), format)?;
 
         let len = data.len() as u32;
         let mut buf = Vec::with_capacity(4 + data.len());
@@ -1000,8 +1037,9 @@ pub extern "C" fn render_shape_pdf(a: u32, b: u32, c: u32, d: u32, scale: f32) -
     })
 }
 
-/// PNG via CPU raster (no GPU/WebGL). Returns `[len][width][height][png]` (LE),
-/// same layout as `render_shape_pixels`.
+/// Raster image via CPU (no GPU/WebGL). Returns `[len][width][height][bytes]`
+/// (LE), same layout as `render_shape_pixels`. `format` selects the encoder:
+/// 0 = PNG, 1 = JPEG, 2 = WEBP (see `RasterFormat`).
 #[no_mangle]
 #[wasm_error]
 pub extern "C" fn render_shape_raster(
@@ -1010,6 +1048,7 @@ pub extern "C" fn render_shape_raster(
     c: u32,
     d: u32,
     scale: f32,
+    format: u32,
 ) -> Result<*mut u8> {
     let id = uuid_from_u32_quartet(a, b, c, d);
 
@@ -1017,8 +1056,10 @@ pub extern "C" fn render_shape_raster(
         return Err(Error::CriticalError("Scale is not finite".to_string()));
     }
 
+    let format = RasterFormat::from_u32(format)?;
+
     with_state!(state, {
-        let (data, width, height) = state.render_shape_raster(&id, scale)?;
+        let (data, width, height) = state.render_shape_raster(&id, scale, format)?;
 
         let len = data.len() as u32;
         let mut buf = Vec::with_capacity(12 + data.len());
diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs
index 047aaaf393..8aa067dae2 100644
--- a/render-wasm/src/render.rs
+++ b/render-wasm/src/render.rs
@@ -413,6 +413,10 @@ pub(crate) struct RenderState {
     /// a tile before its text glyph uploads complete (blank first/center tile).
     /// One explicit flush warms the submit path for the rest of the pass.
     pub tile_atlas_flushed: bool,
+    /// DropShadows→Current touch once per tile when no shape composites a real
+    /// shadow. A full skip made flush_and_submit very slow (Skia ops-task
+    /// ordering); doing it per shape was wasted GPU work.
+    pub drop_shadows_ops_warmed: bool,
 }
 
 pub struct InteractiveDragCrop {
@@ -596,6 +600,7 @@ impl RenderState {
             preserve_target_during_render: false,
             backbuffer_crop_cache: HashMap::default(),
             tile_atlas_flushed: false,
+            drop_shadows_ops_warmed: false,
         })
     }
 
@@ -649,6 +654,44 @@ impl RenderState {
         shape.frame_clip_layer_blur()
     }
 
+    /// Builds the background-blur clip region for a shape whose strokes
+    /// extend beyond the fill geometry: the fill path expanded (via union)
+    /// with a solid stroke coverage of the maximum outward stroke reach.
+    /// Dash/dot stroke styles are treated as solid, so dash gaps also get
+    /// a blurred backdrop.
+    fn background_blur_clip_path(shape: &Shape, stroke_outset: f32) -> skia::Path {
+        let base = match &shape.shape_type {
+            Type::Rect(data) if data.corners.is_some() => {
+                let rrect = RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
+                skia::Path::rrect(rrect, None)
+            }
+            Type::Frame(data) if data.corners.is_some() => {
+                let rrect = RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
+                skia::Path::rrect(rrect, None)
+            }
+            Type::Rect(_) | Type::Frame(_) => skia::Path::rect(shape.selrect, None),
+            Type::Circle => skia::Path::oval(shape.selrect, None),
+            _ => shape
+                .get_skia_path()
+                .unwrap_or_else(|| skia::Path::rect(shape.selrect, None)),
+        };
+
+        // Expand outward by the max stroke reach: a centered stroke of
+        // 2× the outset covers exactly `stroke_outset` beyond the path
+        // (the inward half disappears in the union with the fill).
+        let mut paint = skia::Paint::default();
+        paint.set_style(skia::PaintStyle::Stroke);
+        paint.set_stroke_width(stroke_outset * 2.0);
+
+        let mut outline = skia::Path::default();
+        if skia::path_utils::fill_path_with_paint(&base, &paint, &mut outline, None, None) {
+            if let Some(united) = base.op(&outline, skia::PathOp::Union) {
+                return united;
+            }
+        }
+        base
+    }
+
     /// Renders background blur effect directly to the given target surface.
     /// Must be called BEFORE any save_layer for the shape's own opacity/blend,
     /// so that the backdrop blur is independent of the shape's visual properties.
@@ -703,7 +746,14 @@ impl RenderState {
         canvas.concat(&matrix);
 
         if matches!(shape.shape_type, Type::Text(_)) {
-            canvas.clip_rect(shape.selrect, skia::ClipOp::Intersect, true);
+            // Outset the clip by the max outward stroke reach so the mask
+            // (which includes stroke coverage) isn't cut off at the shape rect.
+            let mut clip_rect = shape.selrect;
+            let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), false);
+            if stroke_outset > 0.0 {
+                clip_rect.outset((stroke_outset, stroke_outset));
+            }
+            canvas.clip_rect(clip_rect, skia::ClipOp::Intersect, true);
             // Blur in device space
             canvas.reset_matrix();
 
@@ -736,30 +786,41 @@ impl RenderState {
             return;
         }
 
-        // Clip to shape's path based on shape type
-        match &shape.shape_type {
-            Type::Rect(data) if data.corners.is_some() => {
-                let rrect = RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
-                canvas.clip_rrect(rrect, skia::ClipOp::Intersect, true);
-            }
-            Type::Frame(data) if data.corners.is_some() => {
-                let rrect = RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
-                canvas.clip_rrect(rrect, skia::ClipOp::Intersect, true);
-            }
-            Type::Rect(_) | Type::Frame(_) => {
-                canvas.clip_rect(shape.selrect, skia::ClipOp::Intersect, true);
-            }
-            Type::Circle => {
-                let mut pb = skia::PathBuilder::new();
-                pb.add_oval(shape.selrect, None, None);
-                canvas.clip_path(&pb.detach(), skia::ClipOp::Intersect, true);
-            }
-            _ => {
-                if let Some(path) = shape.get_skia_path() {
-                    canvas.clip_path(&path, skia::ClipOp::Intersect, true);
-                } else {
+        // Clip to shape's path based on shape type. When the shape has
+        // strokes that extend beyond the fill geometry (center/outer), the
+        // clip is expanded with the stroke coverage so the backdrop is also
+        // blurred under the stroke (visible when the stroke is translucent).
+        let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), shape.is_open());
+        if stroke_outset > 0.0 {
+            let clip_path = Self::background_blur_clip_path(shape, stroke_outset);
+            canvas.clip_path(&clip_path, skia::ClipOp::Intersect, true);
+        } else {
+            match &shape.shape_type {
+                Type::Rect(data) if data.corners.is_some() => {
+                    let rrect =
+                        RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
+                    canvas.clip_rrect(rrect, skia::ClipOp::Intersect, true);
+                }
+                Type::Frame(data) if data.corners.is_some() => {
+                    let rrect =
+                        RRect::new_rect_radii(shape.selrect, data.corners.as_ref().unwrap());
+                    canvas.clip_rrect(rrect, skia::ClipOp::Intersect, true);
+                }
+                Type::Rect(_) | Type::Frame(_) => {
                     canvas.clip_rect(shape.selrect, skia::ClipOp::Intersect, true);
                 }
+                Type::Circle => {
+                    let mut pb = skia::PathBuilder::new();
+                    pb.add_oval(shape.selrect, None, None);
+                    canvas.clip_path(&pb.detach(), skia::ClipOp::Intersect, true);
+                }
+                _ => {
+                    if let Some(path) = shape.get_skia_path() {
+                        canvas.clip_path(&path, skia::ClipOp::Intersect, true);
+                    } else {
+                        canvas.clip_rect(shape.selrect, skia::ClipOp::Intersect, true);
+                    }
+                }
             }
         }
 
@@ -874,10 +935,6 @@ impl RenderState {
         Ok(())
     }
 
-    pub fn flush(&mut self) {
-        self.surfaces.flush(SurfaceId::Backbuffer);
-    }
-
     pub fn flush_and_submit(&mut self) {
         self.surfaces.flush_and_submit(SurfaceId::Target);
     }
@@ -886,6 +943,18 @@ impl RenderState {
     /// on top of Target, then present. Backbuffer is left clean so it can be reused
     /// as-is across interactive-transform frames without stale overlay pixels.
     pub fn present_frame(&mut self, tree: ShapesPoolRef) {
+        self.compose_frame(tree);
+        self.surfaces.flush_and_submit(SurfaceId::Target);
+    }
+
+    /// Compose the frame on Target — the already-rendered Backbuffer plus the
+    /// UI/debug overlays — *without* submitting it, so a caller can draw extra
+    /// overlays into the same frame and present them atomically.
+    ///
+    /// Unlike `render_from_cache`, this reuses the Backbuffer as-is instead of
+    /// rebuilding it from the document atlas, so the result is pixel-identical
+    /// to the last full render at any zoom level.
+    pub fn compose_frame(&mut self, tree: ShapesPoolRef) {
         // Viewer masked passes render a partial scene onto a transparent backbuffer.
         // SrcOver would keep pass-1 pixels wherever the backbuffer stays transparent.
         if self.viewer_masked_pass() {
@@ -903,7 +972,6 @@ impl RenderState {
             ui::render(self, tree);
         }
         debug::render_wasm_label(self);
-        self.surfaces.flush_and_submit(SurfaceId::Target);
     }
 
     /// Renders only the canvas background and UI surface (rulers/frame), without
@@ -1157,11 +1225,16 @@ impl RenderState {
     }
 
     fn get_inherited_drop_shadows(&self) -> Option<Vec<skia_safe::Paint>> {
+        let scale = self.get_scale();
         let drop_shadows: Vec<&Shadow> = self
             .nested_shadows
             .iter()
             .flat_map(|shadows| shadows.iter())
-            .filter(|shadow| !shadow.hidden() && shadow.style() == crate::shapes::ShadowStyle::Drop)
+            .filter(|shadow| {
+                !shadow.hidden()
+                    && shadow.style() == crate::shapes::ShadowStyle::Drop
+                    && shadow.is_perceptible_at_scale(scale)
+            })
             .collect();
 
         if drop_shadows.is_empty() {
@@ -1181,6 +1254,66 @@ impl RenderState {
         )
     }
 
+    /// Apply frame clip stack in document space on the given surface bitmask.
+    /// Caller must already have those surfaces in doc transform (Fills-style
+    /// scale + tile translation, or Current after the same). Hard (non-AA)
+    /// clips avoid alpha seams on semi-transparent overflow.
+    fn apply_clip_stack_to_surfaces(
+        &mut self,
+        clips: &ClipStack,
+        surface_ids: u32,
+        scale: f32,
+        debug_fill_surface: Option<SurfaceId>,
+    ) {
+        for (mut bounds, corners, transform) in clips.iter() {
+            self.surfaces.apply_mut(surface_ids, |s| {
+                s.canvas().concat(transform);
+            });
+
+            // Outset clip by ~0.5 to include edge pixels that
+            // aliased clip misclassifies as outside (causing artifacts).
+            let outset = 0.5 / scale;
+            bounds.outset((outset, outset));
+
+            // Hard clip edge (antialias = false) to avoid alpha seam when clipping
+            // semi-transparent content larger than the frame.
+            if let Some(corners) = corners {
+                let rrect = RRect::new_rect_radii(bounds, corners);
+                self.surfaces.apply_mut(surface_ids, |s| {
+                    s.canvas().clip_rrect(rrect, skia::ClipOp::Intersect, false);
+                });
+            } else {
+                self.surfaces.apply_mut(surface_ids, |s| {
+                    s.canvas().clip_rect(bounds, skia::ClipOp::Intersect, false);
+                });
+            }
+
+            // This renders a red line around clipped
+            // shapes (frames).
+            if self.options.is_debug_visible() {
+                if let Some(fills_surface_id) = debug_fill_surface {
+                    let mut paint = skia::Paint::default();
+                    paint.set_style(skia::PaintStyle::Stroke);
+                    paint.set_color(skia::Color::from_argb(255, 255, 0, 0));
+                    paint.set_stroke_width(4.);
+                    self.surfaces
+                        .canvas(fills_surface_id)
+                        .draw_rect(bounds, &paint);
+                }
+            }
+
+            // Uncomment to debug the render_position_data
+            // if let Type::Text(text_content) = &shape.shape_type {
+            //     text::render_position_data(self, fills_surface_id, &shape, text_content);
+            // }
+
+            self.surfaces.apply_mut(surface_ids, |s| {
+                s.canvas()
+                    .concat(&transform.invert().unwrap_or(Matrix::default()));
+            });
+        }
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn render_shape(
         &mut self,
@@ -1204,17 +1337,8 @@ impl RenderState {
             | innershadows_surface_id as u32
             | text_drop_shadows_surface_id as u32;
 
-        // Only save canvas state if we have clipping or transforms
-        // For simple shapes without clipping, skip expensive save/restore
-        let needs_save =
-            clip_bounds.is_some() || offset.is_some() || !shape.transform.is_identity();
-
-        if needs_save {
-            self.surfaces.apply_mut(surface_ids, |s| {
-                s.canvas().save();
-            });
-        }
         let fast_mode = self.options.is_fast_mode();
+        let skip_drop_shadows = self.should_skip_drop_shadows();
         // Skip anti-aliasing entirely during fast_mode (interactive
         // gestures + pan/zoom). AA edge sampling is per-pixel and adds
         // up across many shapes; reverts to full quality on commit.
@@ -1230,29 +1354,58 @@ impl RenderState {
             && self.nested_blurs.iter().flatten().any(|blur| {
                 !blur.hidden && blur.blur_type == BlurType::LayerBlur && blur.value > 0.0
             });
-        let can_render_directly = apply_to_current_surface
-            && clip_bounds.is_none()
-            && offset.is_none()
-            && parent_shadows.is_none()
-            && !shape.needs_layer()
+
+        // Empty non-masked groups paint nothing here (children are separate walker
+        // nodes). Skip the layered Fills/Strokes path entirely.
+        if matches!(shape.shape_type, Type::Group(g) if !g.masked)
+            && shape.fills.is_empty()
+            && !shape.has_visible_strokes()
+            && shape.shadows.is_empty()
             && shape.blur.is_none()
             && shape.background_blur.is_none()
             && !has_inherited_blur
-            && shape.shadows.is_empty()
-            && shape.transform.is_identity()
+            && parent_shadows.is_none()
+        {
+            return Ok(());
+        }
+
+        // Only perceptible shadows need the layered Fills/Strokes path. Use the
+        // same footprint LOD as when painting drop and inner shadows.
+        let scale = self.get_scale();
+        let shadows_need_layered = !skip_drop_shadows
+            && (shape
+                .drop_shadows_visible()
+                .any(|s| s.is_perceptible_at_scale_for(scale, shape.is_recursive()))
+                || shape
+                    .inner_shadows_visible()
+                    .any(|s| s.is_perceptible_at_scale_for(scale, shape.is_recursive())));
+
+        // Clip is allowed: we apply the same stack on Current after scale+translate.
+        // Opacity < 1 with SrcOver is OK: render_shape_enter already opened a
+        // save_layer on Current; painting fills/strokes into that layer matches
+        // the layered path without Fills/Strokes blits.
+        // Non-SrcOver blend, frame clip blur, and masked groups stay layered.
+        // Stroke-only (fills_none) can go direct: empty fills are a no-op and
+        // strokes paint into Current. Large files need mid-walk GPU drains so
+        // release builds do not backlog a huge ops buffer in one Partial.
+        let can_render_directly = apply_to_current_surface
+            && offset.is_none()
+            && parent_shadows.is_none()
+            && shape.blend_mode().0 == skia::BlendMode::SrcOver
+            && !shape.has_frame_clip_layer_blur()
+            && !matches!(shape.shape_type, Type::Group(g) if g.masked)
+            && shape.blur.is_none()
+            && shape.background_blur.is_none()
+            && !has_inherited_blur
+            && !shadows_need_layered
             && matches!(
                 shape.shape_type,
-                Type::Rect(_) | Type::Circle | Type::Path(_) | Type::Bool(_)
+                Type::Rect(_) | Type::Circle | Type::Path(_) | Type::Bool(_) | Type::Frame(_)
             )
             && !(shape.fills.is_empty() && has_nested_fills)
-            && !shape
-                .svg_attrs
-                .as_ref()
-                .is_some_and(|attrs| attrs.fill_none)
             && target_surface != SurfaceId::Export;
 
         if can_render_directly {
-            let scale = self.get_scale();
             let translation = self
                 .surfaces
                 .get_render_context_translation(self.render_area, scale);
@@ -1264,17 +1417,36 @@ impl RenderState {
                 canvas.translate(translation);
             });
 
+            if let Some(clips) = clip_bounds.as_ref() {
+                self.apply_clip_stack_to_surfaces(clips, target_surface as u32, scale, None);
+            }
+
+            if !shape.transform.is_identity() {
+                let center = shape.center();
+                let mut matrix = shape.transform;
+                matrix.post_translate(center);
+                matrix.pre_translate(-center);
+                self.surfaces.apply_mut(target_surface as u32, |s| {
+                    s.canvas().concat(&matrix);
+                });
+            }
+
             fills::render(self, shape, &shape.fills, antialias, target_surface, None)?;
-            // Pass strokes in natural order; stroke merging handles top-most ordering internally.
-            let visible_strokes: Vec<&Stroke> = shape.visible_strokes().collect();
-            strokes::render(
-                self,
-                shape,
-                &visible_strokes,
-                Some(target_surface),
-                antialias,
-                outset,
-            )?;
+
+            // Clipped frames draw strokes in render_shape_exit over children.
+            let skip_strokes = matches!(shape.shape_type, Type::Frame(_)) && shape.clip_content;
+            if !skip_strokes {
+                // Pass strokes in natural order; stroke merging handles top-most ordering internally.
+                let visible_strokes: Vec<&Stroke> = shape.visible_strokes().collect();
+                strokes::render(
+                    self,
+                    shape,
+                    &visible_strokes,
+                    Some(target_surface),
+                    antialias,
+                    outset,
+                )?;
+            }
 
             self.surfaces.apply_mut(target_surface as u32, |s| {
                 s.canvas().restore();
@@ -1285,62 +1457,24 @@ impl RenderState {
                 debug::render_debug_shape(self, Some(shape_selrect_bounds), None);
             }
 
-            if needs_save {
-                self.surfaces.apply_mut(surface_ids, |s| {
-                    s.canvas().restore();
-                });
-            }
             return Ok(());
         }
 
+        // Only save canvas state if we have clipping or transforms
+        // For simple shapes without clipping, skip expensive save/restore
+        let needs_save =
+            clip_bounds.is_some() || offset.is_some() || !shape.transform.is_identity();
+
+        if needs_save {
+            self.surfaces.apply_mut(surface_ids, |s| {
+                s.canvas().save();
+            });
+        }
+
         // set clipping
         if let Some(clips) = clip_bounds.as_ref() {
             let scale = self.get_scale();
-            for (mut bounds, corners, transform) in clips.iter() {
-                self.surfaces.apply_mut(surface_ids, |s| {
-                    s.canvas().concat(transform);
-                });
-
-                // Outset clip by ~0.5 to include edge pixels that
-                // aliased clip misclassifies as outside (causing artifacts).
-                let outset = 0.5 / scale;
-                bounds.outset((outset, outset));
-
-                // Hard clip edge (antialias = false) to avoid alpha seam when clipping
-                // semi-transparent content larger than the frame.
-                if let Some(corners) = corners {
-                    let rrect = RRect::new_rect_radii(bounds, corners);
-                    self.surfaces.apply_mut(surface_ids, |s| {
-                        s.canvas().clip_rrect(rrect, skia::ClipOp::Intersect, false);
-                    });
-                } else {
-                    self.surfaces.apply_mut(surface_ids, |s| {
-                        s.canvas().clip_rect(bounds, skia::ClipOp::Intersect, false);
-                    });
-                }
-
-                // This renders a red line around clipped
-                // shapes (frames).
-                if self.options.is_debug_visible() {
-                    let mut paint = skia::Paint::default();
-                    paint.set_style(skia::PaintStyle::Stroke);
-                    paint.set_color(skia::Color::from_argb(255, 255, 0, 0));
-                    paint.set_stroke_width(4.);
-                    self.surfaces
-                        .canvas(fills_surface_id)
-                        .draw_rect(bounds, &paint);
-                }
-
-                // Uncomment to debug the render_position_data
-                // if let Type::Text(text_content) = &shape.shape_type {
-                //     text::render_position_data(self, fills_surface_id, &shape, text_content);
-                // }
-
-                self.surfaces.apply_mut(surface_ids, |s| {
-                    s.canvas()
-                        .concat(&transform.invert().unwrap_or(Matrix::default()));
-                });
-            }
+            self.apply_clip_stack_to_surfaces(clips, surface_ids, scale, Some(fills_surface_id));
         }
 
         // We don't want to change the value in the global state
@@ -1538,10 +1672,25 @@ impl RenderState {
                         );
                     }
                 } else {
-                    let mut drop_shadows = shape.drop_shadow_paints();
+                    let shape_scale = self.get_scale();
+                    let mut drop_shadows = if skip_drop_shadows {
+                        Vec::new()
+                    } else {
+                        shape
+                            .drop_shadows_visible()
+                            .filter(|s| s.is_perceptible_at_scale(shape_scale))
+                            .map(|shadow| {
+                                let mut paint = skia_safe::Paint::default();
+                                paint.set_image_filter(shadow.get_drop_shadow_filter());
+                                paint
+                            })
+                            .collect()
+                    };
 
-                    if let Some(inherited_shadows) = self.get_inherited_drop_shadows() {
-                        drop_shadows.extend(inherited_shadows);
+                    if !skip_drop_shadows {
+                        if let Some(inherited_shadows) = self.get_inherited_drop_shadows() {
+                            drop_shadows.extend(inherited_shadows);
+                        }
                     }
 
                     let inner_shadows = shape.inner_shadow_paints();
@@ -1565,32 +1714,34 @@ impl RenderState {
                         .unzip();
 
                     if let Some(parent_shadows) = parent_shadows {
-                        if !shape.has_visible_strokes() {
-                            for shadow in parent_shadows {
-                                text::render(
-                                    Some(self),
-                                    None,
+                        if !skip_drop_shadows {
+                            if !shape.has_visible_strokes() {
+                                for shadow in parent_shadows {
+                                    text::render(
+                                        Some(self),
+                                        None,
+                                        &shape,
+                                        &mut paragraphs_with_shadows,
+                                        text_drop_shadows_surface_id.into(),
+                                        Some(&shadow),
+                                        blur_filter.as_ref(),
+                                        None,
+                                        None,
+                                    )?;
+                                }
+                            } else {
+                                shadows::render_text_shadows(
+                                    self,
                                     &shape,
                                     &mut paragraphs_with_shadows,
+                                    &mut stroke_paragraphs_with_shadows_list,
                                     text_drop_shadows_surface_id.into(),
-                                    Some(&shadow),
-                                    blur_filter.as_ref(),
-                                    None,
-                                    None,
+                                    &parent_shadows,
+                                    &blur_filter,
+                                    &stroke_kinds,
+                                    text_content,
                                 )?;
                             }
-                        } else {
-                            shadows::render_text_shadows(
-                                self,
-                                &shape,
-                                &mut paragraphs_with_shadows,
-                                &mut stroke_paragraphs_with_shadows_list,
-                                text_drop_shadows_surface_id.into(),
-                                &parent_shadows,
-                                &blur_filter,
-                                &stroke_kinds,
-                                text_content,
-                            )?;
                         }
                     } else {
                         // 1. Text drop shadows
@@ -2290,6 +2441,7 @@ impl RenderState {
         allow_stop: bool,
     ) -> Result<FrameType> {
         performance::begin_measure!("continue_render_loop");
+        let timestamp = self.render_budget_start(timestamp);
         let frame_type =
             self.render_shape_tree_partial(base_object, tree, timestamp, allow_stop)?;
 
@@ -2309,9 +2461,9 @@ impl RenderState {
                 panic!("FrameType::None");
             }
             FrameType::Partial => {
-                // Partial frame: just flush GPU work. The display shows the last
-                // fully submitted frame; no need to copy or draw UI overlays here.
-                self.flush();
+                // Final soft drain for this yield (mid-walk also drains; see
+                // `drain_partial_gpu_soft`). Full still submits via present_frame.
+                Self::drain_partial_gpu_soft();
             }
             FrameType::Full => {
                 // A full-quality frame is now complete. Rebuild the per-shape crop
@@ -2337,6 +2489,7 @@ impl RenderState {
         tree: ShapesPoolRef,
         timestamp: i32,
     ) -> Result<FrameType> {
+        let timestamp = self.render_budget_start(timestamp);
         self.render_shape_tree_partial(base_object, tree, timestamp, false)?;
 
         // Same composition as `continue_render_loop` for full frames: snapshot only the
@@ -2362,6 +2515,7 @@ impl RenderState {
         tree: ShapesPoolRef,
         scale: f32,
         timestamp: i32,
+        format: raster::RasterFormat,
     ) -> Result<(Vec<u8>, i32, i32)> {
         let target_surface = SurfaceId::Export;
 
@@ -2392,7 +2546,7 @@ impl RenderState {
 
         self.surfaces
             .canvas(target_surface)
-            .clear(skia::Color::TRANSPARENT);
+            .clear(format.clear_color());
 
         if tree.len() != 0 {
             let Some(shape) = tree.get(id) else {
@@ -2409,6 +2563,14 @@ impl RenderState {
             self.render_area_with_margins = extrect;
             self.surfaces.update_render_context(extrect, scale);
 
+            // `resize_export_surface` swaps in a brand-new (zeroed, i.e.
+            // transparent) surface whenever the dimensions change, discarding
+            // the clear above — so an opaque backdrop has to be laid down again
+            // here, after the resize.
+            if let Some(background) = format.opaque_background() {
+                self.surfaces.canvas(target_surface).clear(background);
+            }
+
             self.pending_nodes.push(NodeRenderState {
                 id: *id,
                 visited_children: false,
@@ -2429,10 +2591,10 @@ impl RenderState {
         let data = image
             .encode(
                 Some(&mut get_gpu_state().context),
-                skia::EncodedImageFormat::PNG,
-                100,
+                format.encoded(),
+                format.quality(),
             )
-            .expect("PNG encode failed");
+            .unwrap_or_else(|| panic!("{format:?} encode failed"));
         let skia::ISize { width, height } = image.dimensions();
 
         // Restore the workspace render state.
@@ -2462,6 +2624,24 @@ impl RenderState {
         Ok((data.as_bytes().to_vec(), width, height))
     }
 
+    /// Anchor the progressive render budget to wall-clock now when the
+    /// caller-provided timestamp is unusable:
+    /// - Frontend sometimes passes `0` (finalize-view / debounced zoom-end).
+    /// - rAF may hand a timestamp that is already older than the budget when
+    ///   the handler runs late. Using that stamp made `should_stop_rendering`
+    ///   yield after a few nodes with ~0ms of real work.
+    #[inline]
+    fn render_budget_start(&self, timestamp: i32) -> i32 {
+        let now = performance::get_time();
+        if timestamp <= 0 {
+            return now;
+        }
+        if now - timestamp > self.options.max_blocking_time_ms {
+            return now;
+        }
+        timestamp
+    }
+
     #[inline]
     pub fn should_stop_rendering(&self, iteration: i32, timestamp: i32) -> bool {
         if iteration % self.options.node_batch_threshold != 0 {
@@ -2486,6 +2666,28 @@ impl RenderState {
         true
     }
 
+    /// Soft-drain GPU command buffers during progressive tile walks.
+    /// Release packs far more cheap Current draws (e.g. fills_none paths) into
+    /// one Partial than debug; flushing only at Partial end then stalls. Call
+    /// periodically so each flush stays small. Full present still submits.
+    #[inline]
+    fn drain_partial_gpu_soft() {
+        crate::get_gpu_state().context.flush(None);
+    }
+
+    /// Skip all drop/inner shadows in fast mode, or when even a large design-space
+    /// shadow would be subpixel. Otherwise filter per shadow via
+    /// [`Shadow::is_perceptible_at_scale_for`] (stricter for recursive shapes).
+    #[inline]
+    pub(crate) fn should_skip_drop_shadows(&self) -> bool {
+        if self.options.is_fast_mode() {
+            return true;
+        }
+        let scale = self.get_scale();
+        scale * crate::shapes::DROP_SHADOW_LARGE_DESIGN_PX
+            < crate::shapes::DROP_SHADOW_MIN_DEVICE_PX
+    }
+
     #[inline]
     fn clip_target_surface_to_stack(
         &mut self,
@@ -3021,6 +3223,7 @@ impl RenderState {
 
     /// Renders element drop shadows to DropShadows surface and composites to Current.
     /// Used for both normal shadow rendering and pre-layer rendering (frame_clip_layer_blur).
+    /// Returns `true` when at least one visible drop shadow was composited.
     #[allow(clippy::too_many_arguments)]
     fn render_element_drop_shadows_and_composite(
         &mut self,
@@ -3031,14 +3234,32 @@ impl RenderState {
         scale: f32,
         node_render_state: &NodeRenderState,
         target_surface: SurfaceId,
-    ) -> Result<()> {
+    ) -> Result<bool> {
+        // Avoid a blank DropShadows→Current blit + clear when nothing will paint
+        // (no shadows, fast/overview skip, or all footprints subpixel). Callers
+        // must still touch DropShadows once per tile when this returns false
+        // (see `drop_shadows_ops_warmed`).
+        if self.should_skip_drop_shadows()
+            || !element
+                .drop_shadows_visible()
+                .any(|s| s.is_perceptible_at_scale_for(scale, element.is_recursive()))
+        {
+            return Ok(false);
+        }
+
         let element_extrect = extrect.get_or_insert_with(|| element.extrect(tree, scale));
         let inherited_layer_blur = match element.shape_type {
             Type::Frame(_) | Type::Group(_) => element.blur,
             _ => None,
         };
 
+        let recursive = element.is_recursive();
+        let mut rendered_any = false;
         for shadow in element.drop_shadows_visible() {
+            if !shadow.is_perceptible_at_scale_for(scale, recursive) {
+                continue;
+            }
+            rendered_any = true;
             let paint = skia::Paint::default();
             let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
             self.surfaces
@@ -3130,6 +3351,10 @@ impl RenderState {
             self.surfaces.canvas(SurfaceId::DropShadows).restore();
         }
 
+        if !rendered_any {
+            return Ok(false);
+        }
+
         if let Some(clips) = clip_bounds.as_ref() {
             let antialias = !self.options.is_fast_mode()
                 && element.should_use_antialias(scale, self.options.antialias_threshold);
@@ -3146,7 +3371,7 @@ impl RenderState {
         self.surfaces
             .canvas(SurfaceId::DropShadows)
             .clear(skia::Color::TRANSPARENT);
-        Ok(())
+        Ok(true)
     }
 
     pub fn render_shape_tree_partial_uncached(
@@ -3381,13 +3606,15 @@ impl RenderState {
                 // the layer blur (which would make it more diffused than without clipping)
                 let shadow_before_layer = !node_render_state.is_root()
                     && self.focus_mode.is_active()
-                    && !self.options.is_fast_mode()
+                    && !self.should_skip_drop_shadows()
                     && !matches!(element.shape_type, Type::Text(_))
                     && Self::frame_clip_layer_blur(element).is_some()
-                    && element.drop_shadows_visible().next().is_some();
+                    && element
+                        .drop_shadows_visible()
+                        .any(|s| s.is_perceptible_at_scale_for(scale, element.is_recursive()));
 
-                if shadow_before_layer {
-                    self.render_element_drop_shadows_and_composite(
+                if shadow_before_layer
+                    && self.render_element_drop_shadows_and_composite(
                         element,
                         tree,
                         &mut extrect,
@@ -3395,7 +3622,9 @@ impl RenderState {
                         scale,
                         &node_render_state,
                         target_surface,
-                    )?;
+                    )?
+                {
+                    self.drop_shadows_ops_warmed = true;
                 }
 
                 // Render background blur BEFORE save_layer so it modifies
@@ -3408,8 +3637,8 @@ impl RenderState {
             }
 
             if !node_render_state.is_root() && self.focus_mode.is_active() {
-                // Skip expensive drop shadow rendering in fast mode (during pan/zoom).
-                let skip_shadows = self.options.is_fast_mode();
+                // Skip expensive drop shadows in fast mode and at overview zooms.
+                let skip_shadows = self.should_skip_drop_shadows();
 
                 // Skip shadow block when already rendered before the layer (frame_clip_layer_blur)
                 let shadows_already_rendered = Self::frame_clip_layer_blur(element).is_some();
@@ -3418,8 +3647,7 @@ impl RenderState {
                 if !skip_shadows
                     && !shadows_already_rendered
                     && !matches!(element.shape_type, Type::Text(_))
-                {
-                    self.render_element_drop_shadows_and_composite(
+                    && self.render_element_drop_shadows_and_composite(
                         element,
                         tree,
                         &mut extrect,
@@ -3427,11 +3655,26 @@ impl RenderState {
                         scale,
                         &node_render_state,
                         target_surface,
-                    )?;
-                } else {
-                    // This is necessary or the later flush_and_submit will be very slow
+                    )?
+                {
+                    // Real shadow composite already clears DropShadows.
+                    self.drop_shadows_ops_warmed = true;
+                }
+
+                if !self.drop_shadows_ops_warmed {
+                    // Touch DropShadows→Current once per tile when no shape has
+                    // composited real shadows yet. Omitting this entirely made
+                    // flush_and_submit very slow (ops-task ordering); repeating
+                    // it per shape was waste.
+                    self.surfaces.draw_into(
+                        SurfaceId::DropShadows,
+                        target_surface,
+                        Some(&skia::Paint::default()),
+                    );
                     self.surfaces
-                        .draw_into(SurfaceId::DropShadows, target_surface, None);
+                        .canvas(SurfaceId::DropShadows)
+                        .clear(skia::Color::TRANSPARENT);
+                    self.drop_shadows_ops_warmed = true;
                 }
 
                 // For frames without clip_content, inner strokes must render after children in
@@ -3538,6 +3781,12 @@ impl RenderState {
             if allow_stop && self.should_stop_rendering(iteration, timestamp) {
                 return Ok((is_empty, true));
             }
+            // Keep GPU ops buffers bounded when many shapes paint cheaply to
+            // Current (release packs far more per Partial than debug).
+            let drain_every = self.options.partial_gpu_drain_every_n;
+            if allow_stop && drain_every > 0 && iteration > 0 && iteration % drain_every == 0 {
+                Self::drain_partial_gpu_soft();
+            }
             iteration += 1;
         }
 
@@ -3633,6 +3882,7 @@ impl RenderState {
                 // empty tile.
                 self.current_tile_had_shapes = false;
                 self.tile_atlas_flushed = false;
+                self.drop_shadows_ops_warmed = false;
 
                 let viewer_masked_pass = self.viewer_masked_pass();
 
diff --git a/render-wasm/src/render/images.rs b/render-wasm/src/render/images.rs
index a431ae5e4b..79b5e5653a 100644
--- a/render-wasm/src/render/images.rs
+++ b/render-wasm/src/render/images.rs
@@ -6,6 +6,7 @@ use crate::error::Result;
 use crate::get_gpu_state;
 use skia_safe::gpu::{surfaces, Budgeted, DirectContext};
 use skia_safe::{self as skia, Codec, ISize, Size};
+use std::cell::Cell;
 use std::collections::HashMap;
 
 pub type Image = skia::Image;
@@ -66,8 +67,19 @@ enum StoredImage {
     },
 }
 
+struct StoredEntry {
+    image: StoredImage,
+    /// Approximate retained cost: encoded byte length (raw/svg) or the
+    /// decoded RGBA size for images registered from a GL texture.
+    bytes: usize,
+    /// LRU tick; `Cell` so read paths can touch it without `&mut self`.
+    last_used: Cell<u64>,
+}
+
 pub struct ImageStore {
-    images: HashMap<(Uuid, bool), StoredImage>,
+    images: HashMap<(Uuid, bool), StoredEntry>,
+    total_bytes: usize,
+    tick: Cell<u64>,
     /// gpu-only
     context: Option<Box<DirectContext>>,
 }
@@ -212,6 +224,8 @@ impl ImageStore {
         let context = &gpu_state.context;
         Self {
             images: HashMap::with_capacity(2048),
+            total_bytes: 0,
+            tick: Cell::new(0),
             context: Some(Box::new(context.clone())),
         }
     }
@@ -222,10 +236,65 @@ impl ImageStore {
     pub fn new_without_gpu() -> Self {
         Self {
             images: HashMap::with_capacity(16),
+            total_bytes: 0,
+            tick: Cell::new(0),
             context: None,
         }
     }
 
+    /// Bumps the LRU clock and returns the new tick.
+    fn next_tick(&self) -> u64 {
+        let t = self.tick.get() + 1;
+        self.tick.set(t);
+        t
+    }
+
+    fn insert_entry(&mut self, key: (Uuid, bool), image: StoredImage, bytes: usize) {
+        let last_used = Cell::new(self.next_tick());
+        self.total_bytes += bytes;
+        self.images.insert(
+            key,
+            StoredEntry {
+                image,
+                bytes,
+                last_used,
+            },
+        );
+    }
+
+    /// Evicts least-recently-used images until the store retains at most
+    /// `max_bytes`. Meant to be called by the headless exporter *between*
+    /// requests, so an image can never disappear under a running render;
+    /// evicted images are simply re-provisioned by a later request that
+    /// needs them (`is_image_cached` reports them as missing). Returns the
+    /// number of evicted images.
+    pub fn evict_to_budget(&mut self, max_bytes: usize) -> usize {
+        if self.total_bytes <= max_bytes {
+            return 0;
+        }
+
+        // Order the keys once instead of rescanning the whole store for the
+        // minimum on every eviction.
+        let mut keys: Vec<_> = self
+            .images
+            .iter()
+            .map(|(key, entry)| (entry.last_used.get(), *key))
+            .collect();
+        keys.sort_unstable_by_key(|(last_used, _)| *last_used);
+
+        let mut evicted = 0;
+        for (_, key) in keys {
+            if self.total_bytes <= max_bytes {
+                break;
+            }
+            if let Some(entry) = self.images.remove(&key) {
+                self.total_bytes -= entry.bytes;
+                evicted += 1;
+            }
+        }
+        evicted
+    }
+
     pub fn add(
         &mut self,
         id: Uuid,
@@ -239,40 +308,43 @@ impl ImageStore {
         }
 
         let raw_data = image_data.to_vec();
+        let bytes = raw_data.len();
 
         match self.context.as_mut() {
             Some(context) => {
                 if let Some(gpu_image) = decode_image(context, &raw_data) {
-                    self.images.insert(key, StoredImage::Gpu(gpu_image));
+                    self.insert_entry(key, StoredImage::Gpu(gpu_image), bytes);
                 } else if let Some((dom, size)) = parse_svg(&raw_data) {
-                    self.images.insert(
+                    self.insert_entry(
                         key,
                         StoredImage::Svg {
                             dom,
                             size,
                             raster: None,
                         },
+                        bytes,
                     );
                 } else {
                     // The lazy re-decode in `get_internal` only retries raster codecs,
                     // so SVGs that fail to parse here stay raw.
-                    self.images.insert(key, StoredImage::Raw(raw_data));
+                    self.insert_entry(key, StoredImage::Raw(raw_data), bytes);
                 }
             }
             // GPU-free: keep the encoded bytes; decoded on the CPU at draw time.
             // SVGs still get parsed up front since that needs no GPU context.
             None => {
                 if let Some((dom, size)) = parse_svg(&raw_data) {
-                    self.images.insert(
+                    self.insert_entry(
                         key,
                         StoredImage::Svg {
                             dom,
                             size,
                             raster: None,
                         },
+                        bytes,
                     );
                 } else {
-                    self.images.insert(key, StoredImage::Raw(raw_data));
+                    self.insert_entry(key, StoredImage::Raw(raw_data), bytes);
                 }
             }
         }
@@ -303,7 +375,8 @@ impl ImageStore {
             ));
         };
         let image = create_image_from_gl_texture(context, texture_id, width, height)?;
-        self.images.insert(key, StoredImage::Gpu(image));
+        let bytes = (width as usize) * (height as usize) * 4;
+        self.insert_entry(key, StoredImage::Gpu(image), bytes);
 
         Ok(())
     }
@@ -337,7 +410,9 @@ impl ImageStore {
     }
 
     fn decode_raw_cpu_image(&self, id: &Uuid, is_thumbnail: bool) -> Option<Image> {
-        match self.images.get(&(*id, is_thumbnail))? {
+        let entry = self.images.get(&(*id, is_thumbnail))?;
+        entry.last_used.set(self.next_tick());
+        match &entry.image {
             StoredImage::Raw(raw_data) => {
                 let data = unsafe { skia::Data::new_bytes(raw_data) };
                 Image::from_encoded(&data)
@@ -361,7 +436,8 @@ impl ImageStore {
             .images
             .get(&(*id, false))
             .or_else(|| self.images.get(&(*id, true)))?;
-        match entry {
+        entry.last_used.set(self.next_tick());
+        match &entry.image {
             StoredImage::Svg { dom, size, .. } => Some((dom, *size)),
             _ => None,
         }
@@ -369,16 +445,20 @@ impl ImageStore {
 
     fn get_internal(&mut self, id: &Uuid, is_thumbnail: bool) -> Option<&Image> {
         let key = (*id, is_thumbnail);
+        let tick = self.tick.get() + 1;
+        self.tick.set(tick);
         // Use entry API to mutate the HashMap in-place if needed
         if let Some(entry) = self.images.get_mut(&key) {
-            match entry {
+            entry.last_used.set(tick);
+            let image = &mut entry.image;
+            match image {
                 StoredImage::Gpu(ref img) => Some(img),
                 StoredImage::Raw(raw_data) => {
                     let context = self.context.as_mut()?;
                     let gpu_image = decode_image(context, raw_data)?;
-                    *entry = StoredImage::Gpu(gpu_image);
+                    *image = StoredImage::Gpu(gpu_image);
 
-                    if let StoredImage::Gpu(ref img) = entry {
+                    if let StoredImage::Gpu(ref img) = image {
                         Some(img)
                     } else {
                         None
diff --git a/render-wasm/src/render/options.rs b/render-wasm/src/render/options.rs
index fed66505fe..5dfe0ac2fb 100644
--- a/render-wasm/src/render/options.rs
+++ b/render-wasm/src/render/options.rs
@@ -11,6 +11,10 @@ const VIEWPORT_INTEREST_AREA_THRESHOLD: i32 = 1;
 const MIN_DPR_VIEWPORT_INTEREST_AREA_THRESHOLD: i32 = 2;
 const MAX_BLOCKING_TIME_MS: i32 = 32;
 const NODE_BATCH_THRESHOLD: i32 = 3;
+/// Soft-drain GPU every N walker nodes on progressive Partials. Keeps ops
+/// buffers bounded when many shapes paint cheaply to Current (release packs
+/// far more per budget than debug).
+const PARTIAL_GPU_DRAIN_EVERY_N: i32 = 64;
 const BLUR_DOWNSCALE_THRESHOLD: f32 = 8.0;
 const ANTIALIAS_THRESHOLD: f32 = 7.0;
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -29,6 +33,9 @@ pub struct RenderOptions {
     pub dpr_viewport_interest_area_threshold: i32,
     pub max_blocking_time_ms: i32,
     pub node_batch_threshold: i32,
+    /// Soft-flush GPU every N nodes during progressive tile walks (see
+    /// [`PARTIAL_GPU_DRAIN_EVERY_N`]).
+    pub partial_gpu_drain_every_n: i32,
     pub blur_downscale_threshold: f32,
     pub capture_frames: i32,
 }
@@ -45,6 +52,7 @@ impl Default for RenderOptions {
             dpr_viewport_interest_area_threshold: VIEWPORT_INTEREST_AREA_THRESHOLD,
             max_blocking_time_ms: MAX_BLOCKING_TIME_MS,
             node_batch_threshold: NODE_BATCH_THRESHOLD,
+            partial_gpu_drain_every_n: PARTIAL_GPU_DRAIN_EVERY_N,
             blur_downscale_threshold: BLUR_DOWNSCALE_THRESHOLD,
             capture_frames: 0,
         }
diff --git a/render-wasm/src/render/raster.rs b/render-wasm/src/render/raster.rs
index 34692d6ab4..740d20b8d9 100644
--- a/render-wasm/src/render/raster.rs
+++ b/render-wasm/src/render/raster.rs
@@ -3,17 +3,78 @@ use skia_safe as skia;
 use crate::error::{Error, Result};
 use crate::state::ShapesPoolRef;
 use crate::uuid::Uuid;
+use macros::ToJs;
 
 use super::vector;
 use super::RenderResources;
 
-/// Renders a shape tree to PNG bytes on a CPU raster surface (no GPU/WebGL).
-/// Returns `(png_bytes, width_px, height_px)`.
+/// Encoded output format for [`render_to_raster`] and `render_shape_pixels`.
+/// `ToJs` publishes the discriminants to `api/shared.js`, so the CLJS side
+/// reads them from here instead of hardcoding the codes.
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ToJs)]
+pub enum RasterFormat {
+    Png = 0,
+    Jpeg = 1,
+    Webp = 2,
+}
+
+impl RasterFormat {
+    /// Maps the wire code sent by the CLJS hosts.
+    pub fn from_u32(value: u32) -> Result<Self> {
+        match value {
+            0 => Ok(Self::Png),
+            1 => Ok(Self::Jpeg),
+            2 => Ok(Self::Webp),
+            _ => Err(Error::CriticalError(format!(
+                "Unknown raster format: {value}"
+            ))),
+        }
+    }
+
+    pub fn encoded(self) -> skia::EncodedImageFormat {
+        match self {
+            Self::Png => skia::EncodedImageFormat::PNG,
+            Self::Jpeg => skia::EncodedImageFormat::JPEG,
+            Self::Webp => skia::EncodedImageFormat::WEBP,
+        }
+    }
+
+    /// Encoder quality. Mirrors the Playwright backend (`bitmap.cljs`): jpeg
+    /// screenshots default to 95, webp is converted with `-quality 100`.
+    /// Ignored by the PNG encoder.
+    pub fn quality(self) -> u32 {
+        match self {
+            Self::Jpeg => 95,
+            _ => 100,
+        }
+    }
+
+    /// Opaque backdrop this format requires, or `None` when it keeps alpha.
+    /// JPEG has no alpha channel, so transparent regions must be flattened onto
+    /// white — Playwright ignores `omitBackground` for jpeg and does the same.
+    /// PNG/WEBP keep transparency.
+    pub fn opaque_background(self) -> Option<skia::Color> {
+        match self {
+            Self::Jpeg => Some(skia::Color::WHITE),
+            _ => None,
+        }
+    }
+
+    /// Colour to clear a fresh export surface with.
+    pub fn clear_color(self) -> skia::Color {
+        self.opaque_background().unwrap_or(skia::Color::TRANSPARENT)
+    }
+}
+
+/// Renders a shape tree to encoded image bytes on a CPU raster surface (no
+/// GPU/WebGL). Returns `(encoded_bytes, width_px, height_px)`.
 pub fn render_to_raster(
     shared: &mut RenderResources,
     id: &Uuid,
     tree: ShapesPoolRef,
     scale: f32,
+    format: RasterFormat,
 ) -> Result<(Vec<u8>, i32, i32)> {
     let Some(shape) = tree.get(id) else {
         return Ok((Vec::new(), 0, 0));
@@ -40,7 +101,7 @@ pub fn render_to_raster(
 
     {
         let canvas = surface.canvas();
-        canvas.clear(skia::Color::TRANSPARENT);
+        canvas.clear(format.clear_color());
         canvas.scale((scale, scale));
         canvas.translate((-bounds.left(), -bounds.top()));
         vector::render_tree(shared, canvas, id, tree, scale, bounds)?;
@@ -50,10 +111,10 @@ pub fn render_to_raster(
         .image_snapshot()
         .encode(
             None::<&mut skia::gpu::DirectContext>,
-            skia::EncodedImageFormat::PNG,
-            100,
+            format.encoded(),
+            format.quality(),
         )
-        .ok_or_else(|| Error::CriticalError("PNG encode failed".to_string()))?;
+        .ok_or_else(|| Error::CriticalError(format!("{format:?} encode failed")))?;
 
     Ok((data.as_bytes().to_vec(), width, height))
 }
diff --git a/render-wasm/src/render/shadows.rs b/render-wasm/src/render/shadows.rs
index c3de172ad8..c6baadc0b3 100644
--- a/render-wasm/src/render/shadows.rs
+++ b/render-wasm/src/render/shadows.rs
@@ -13,10 +13,16 @@ pub fn render_fill_inner_shadows(
     antialias: bool,
     surface_id: SurfaceId,
 ) {
-    if shape.has_fills() {
-        for shadow in shape.inner_shadows_visible() {
-            render_fill_inner_shadow(render_state, shape, shadow, antialias, surface_id);
+    if !shape.has_fills() || render_state.should_skip_drop_shadows() {
+        return;
+    }
+    let scale = render_state.get_scale();
+    let recursive = shape.is_recursive();
+    for shadow in shape.inner_shadows_visible() {
+        if !shadow.is_perceptible_at_scale_for(scale, recursive) {
+            continue;
         }
+        render_fill_inner_shadow(render_state, shape, shadow, antialias, surface_id);
     }
 }
 
@@ -38,19 +44,25 @@ pub fn render_stroke_inner_shadows(
     antialias: bool,
     surface_id: SurfaceId,
 ) -> Result<()> {
-    if !shape.has_fills() {
-        for shadow in shape.inner_shadows_visible() {
-            let filter = shadow.get_inner_shadow_filter();
-            strokes::render_single(
-                render_state,
-                shape,
-                stroke,
-                Some(surface_id),
-                filter.as_ref(),
-                antialias,
-                None, // Inner shadows don't use spread
-            )?;
+    if shape.has_fills() || render_state.should_skip_drop_shadows() {
+        return Ok(());
+    }
+    let scale = render_state.get_scale();
+    let recursive = shape.is_recursive();
+    for shadow in shape.inner_shadows_visible() {
+        if !shadow.is_perceptible_at_scale_for(scale, recursive) {
+            continue;
         }
+        let filter = shadow.get_inner_shadow_filter();
+        strokes::render_single(
+            render_state,
+            shape,
+            stroke,
+            Some(surface_id),
+            filter.as_ref(),
+            antialias,
+            None, // Inner shadows don't use spread
+        )?;
     }
     Ok(())
 }
diff --git a/render-wasm/src/render/strokes.rs b/render-wasm/src/render/strokes.rs
index b5a5a93518..b4ac78eb05 100644
--- a/render-wasm/src/render/strokes.rs
+++ b/render-wasm/src/render/strokes.rs
@@ -31,6 +31,12 @@ pub(super) fn draw_stroke_on_rect(
     let filter = compose_filters(blur, shadow);
     paint.set_image_filter(filter);
 
+    // Per-side widths render as a band between an outer and an inner rect.
+    if let Some(widths) = stroke.per_side_widths() {
+        draw_per_side_stroke_on_rect(canvas, stroke, rect, corners, &paint, widths, antialias);
+        return;
+    }
+
     // By default just draw the rect. Only dotted inner/outer strokes need
     // clipping to prevent the dotted pattern from appearing in wrong areas.
     let draw_stroke = || match corners {
@@ -97,6 +103,93 @@ pub(super) fn draw_stroke_on_rect(
     }
 }
 
+/// Draws a rect/frame stroke whose sides have different widths as the area
+/// between an outer and an inner (rounded) rect, mitered like CSS borders.
+/// The band is filled with the stroke fill; dashed/dotted patterns are not
+/// supported per side and render solid.
+#[allow(clippy::too_many_arguments)]
+fn draw_per_side_stroke_on_rect(
+    canvas: &skia::Canvas,
+    stroke: &Stroke,
+    rect: &Rect,
+    corners: &Option<Corners>,
+    paint: &skia::Paint,
+    widths: [f32; 4],
+    antialias: bool,
+) {
+    let [top, right, bottom, left] = widths;
+
+    // Fraction of each side width growing outward / inward from the shape
+    // boundary, per stroke alignment.
+    let (out_f, in_f) = match stroke.kind {
+        StrokeKind::Inner => (0.0, 1.0),
+        StrokeKind::Center => (0.5, 0.5),
+        StrokeKind::Outer => (1.0, 0.0),
+    };
+
+    let outer = Rect::from_ltrb(
+        rect.left - left * out_f,
+        rect.top - top * out_f,
+        rect.right + right * out_f,
+        rect.bottom + bottom * out_f,
+    );
+    let inner = Rect::from_ltrb(
+        rect.left + left * in_f,
+        rect.top + top * in_f,
+        rect.right - right * in_f,
+        rect.bottom - bottom * in_f,
+    );
+    // When a side width exceeds the shape dimension the inner rect collapses
+    // and the whole outer rect is filled, like CSS collapsing borders.
+    let has_hole = inner.width() > 0.0 && inner.height() > 0.0;
+
+    let mut fill_paint = paint.clone();
+    fill_paint.set_style(skia::PaintStyle::Fill);
+    fill_paint.set_path_effect(None);
+    fill_paint.set_anti_alias(antialias);
+
+    let mut pb = skia::PathBuilder::new();
+    match corners {
+        Some(radii) => {
+            // Straight (zero-radius) corners stay sharp; rounded ones keep
+            // their curvature parallel to the shape edge, like CSS borders.
+            let grow = |radius: f32, delta: f32| {
+                if radius > 0.0 {
+                    radius + delta
+                } else {
+                    0.0
+                }
+            };
+            let shrink = |radius: f32, delta: f32| (radius - delta).max(0.0);
+            // Adjacent side widths per corner, matching the Skia radii order:
+            // [top-left, top-right, bottom-right, bottom-left].
+            let side_deltas = [(left, top), (right, top), (right, bottom), (left, bottom)];
+            let mut outer_radii = *radii;
+            let mut inner_radii = *radii;
+            for (i, (dx, dy)) in side_deltas.into_iter().enumerate() {
+                outer_radii[i].x = grow(outer_radii[i].x, dx * out_f);
+                outer_radii[i].y = grow(outer_radii[i].y, dy * out_f);
+                inner_radii[i].x = shrink(inner_radii[i].x, dx * in_f);
+                inner_radii[i].y = shrink(inner_radii[i].y, dy * in_f);
+            }
+            pb.add_rrect(RRect::new_rect_radii(outer, &outer_radii), None, None);
+            if has_hole {
+                pb.add_rrect(RRect::new_rect_radii(inner, &inner_radii), None, None);
+            }
+        }
+        None => {
+            pb.add_rect(outer, None, None);
+            if has_hole {
+                pb.add_rect(inner, None, None);
+            }
+        }
+    }
+
+    let mut path = pb.detach();
+    path.set_fill_type(skia::PathFillType::EvenOdd);
+    canvas.draw_path(&path, &fill_paint);
+}
+
 #[allow(clippy::too_many_arguments)]
 pub(super) fn draw_stroke_on_circle(
     canvas: &skia::Canvas,
@@ -468,6 +561,13 @@ fn draw_image_stroke_in_container(
     surface_id: SurfaceId,
 ) -> Result<()> {
     let scale = render_state.get_scale();
+    let lod_stroke;
+    let stroke = if matches!(shape.shape_type, Type::Path(_) | Type::Bool(_)) {
+        lod_stroke = stroke.path_lod_at_scale(shape.is_open(), scale);
+        &lod_stroke
+    } else {
+        stroke
+    };
     let Some(image) = get_resources().images.get(&image_fill.id()) else {
         return Ok(());
     };
@@ -711,6 +811,7 @@ fn strokes_share_geometry(strokes: &[&Stroke]) -> bool {
     strokes.windows(2).all(|pair| {
         pair[0].kind == pair[1].kind
             && pair[0].width == pair[1].width
+            && pair[0].widths == pair[1].widths
             && pair[0].style == pair[1].style
             && pair[0].cap_start == pair[1].cap_start
             && pair[0].cap_end == pair[1].cap_end
@@ -844,12 +945,13 @@ fn render_merged(
         shape_type @ (Type::Path(_) | Type::Bool(_)) => {
             if let Some(path) = shape_type.path() {
                 let is_open = path.is_open();
+                let lod_stroke = representative.path_lod_at_scale(is_open, scale);
                 let mut paint =
-                    representative.to_stroked_paint(is_open, &selrect, svg_attrs, antialias);
+                    lod_stroke.to_stroked_paint(is_open, &selrect, svg_attrs, antialias);
                 paint.set_shader(merged.shader());
                 draw_stroke_on_path(
                     canvas,
-                    representative,
+                    &lod_stroke,
                     path,
                     &paint,
                     path_transform.as_ref(),
@@ -1003,6 +1105,8 @@ fn render_single_internal(
             shape_type @ (Type::Path(_) | Type::Bool(_)) => {
                 if let Some(path) = shape_type.path() {
                     let is_open = path.is_open();
+                    let lod_stroke = stroke.path_lod_at_scale(is_open, scale);
+                    let stroke = &lod_stroke;
                     let mut paint =
                         stroke.to_stroked_paint(is_open, &selrect, svg_attrs, antialias);
                     // Apply outset by increasing stroke width
diff --git a/render-wasm/src/render/surfaces.rs b/render-wasm/src/render/surfaces.rs
index e68c0df0c3..b8f4b51c9d 100644
--- a/render-wasm/src/render/surfaces.rs
+++ b/render-wasm/src/render/surfaces.rs
@@ -27,6 +27,29 @@ const TILE_DRAWABLE_RECT: IRect = IRect {
 };
 const DOC_ATLAS_MAX_DIM: i32 = 4096;
 
+/// GPU→GPU copy of `src` from `from` into `dst` on `to_canvas`, without
+/// `image_snapshot` (avoids per-tile sync stalls on WebGL).
+fn draw_surface_src_rect_to_dst(
+    from: &mut skia::Surface,
+    to_canvas: &skia::Canvas,
+    src: skia::Rect,
+    dst: skia::Rect,
+    sampling: skia::SamplingOptions,
+) {
+    if src.is_empty() || dst.is_empty() {
+        return;
+    }
+    to_canvas.save();
+    to_canvas.clip_rect(dst, None, true);
+    let sx = dst.width() / src.width();
+    let sy = dst.height() / src.height();
+    to_canvas.translate((dst.left, dst.top));
+    to_canvas.scale((sx, sy));
+    to_canvas.translate((-src.left, -src.top));
+    from.draw(to_canvas, (0.0, 0.0), sampling, None);
+    to_canvas.restore();
+}
+
 pub fn get_cache_size(viewbox: &Viewbox, interest: i32) -> skia::ISize {
     // First we retrieve the extended area of the viewport that we could render.
     let TileRect(isx, isy, iex, iey) =
@@ -238,17 +261,20 @@ impl DocAtlas {
         Ok(())
     }
 
-    fn blit_tile_image_into_atlas(
+    /// Blit a Current-surface drawable rect into the doc atlas without
+    /// `image_snapshot` (GPU→GPU draw; avoids per-tile sync stalls).
+    fn blit_current_drawable_into_atlas(
         &mut self,
         gpu_state: &mut GpuState,
-        tile_image: &skia::Image,
+        current: &mut skia::Surface,
+        drawable_src: skia::Rect,
         tile_doc_rect: skia::Rect,
+        sampling: skia::SamplingOptions,
     ) -> Result<()> {
-        if tile_doc_rect.is_empty() {
+        if tile_doc_rect.is_empty() || drawable_src.is_empty() {
             return Ok(());
         }
 
-        // Clamp to document bounds (if any) and compute a matching source-rect in tile pixels.
         let mut clipped_doc_rect = tile_doc_rect;
         if let Some(bounds) = self.doc_bounds {
             if !clipped_doc_rect.intersect(bounds) {
@@ -261,7 +287,6 @@ impl DocAtlas {
 
         self.ensure_atlas_contains(gpu_state, clipped_doc_rect)?;
 
-        // Destination is document-space rect mapped into atlas pixel coords.
         let dst = skia::Rect::from_xywh(
             (clipped_doc_rect.left - self.origin.x) * self.scale,
             (clipped_doc_rect.top - self.origin.y) * self.scale,
@@ -269,24 +294,18 @@ impl DocAtlas {
             clipped_doc_rect.height() * self.scale,
         );
 
-        // Compute source rect in tile_image pixel coordinates.
-        let img_w = tile_image.width() as f32;
-        let img_h = tile_image.height() as f32;
         let tw = tile_doc_rect.width().max(1.0);
         let th = tile_doc_rect.height().max(1.0);
-
-        let sx = ((clipped_doc_rect.left - tile_doc_rect.left) / tw) * img_w;
-        let sy = ((clipped_doc_rect.top - tile_doc_rect.top) / th) * img_h;
-        let sw = (clipped_doc_rect.width() / tw) * img_w;
-        let sh = (clipped_doc_rect.height() / th) * img_h;
-        let src = skia::Rect::from_xywh(sx, sy, sw, sh);
-
-        self.surface.canvas().draw_image_rect(
-            tile_image,
-            Some((&src, skia::canvas::SrcRectConstraint::Fast)),
-            dst,
-            &skia::Paint::default(),
+        let dw = drawable_src.width();
+        let dh = drawable_src.height();
+        let src = skia::Rect::from_xywh(
+            drawable_src.left + ((clipped_doc_rect.left - tile_doc_rect.left) / tw) * dw,
+            drawable_src.top + ((clipped_doc_rect.top - tile_doc_rect.top) / th) * dh,
+            (clipped_doc_rect.width() / tw) * dw,
+            (clipped_doc_rect.height() / th) * dh,
         );
+
+        draw_surface_src_rect_to_dst(current, self.surface.canvas(), src, dst, sampling);
         Ok(())
     }
 
@@ -827,28 +846,24 @@ impl Surfaces {
     pub fn update_render_context(&mut self, render_area: skia::Rect, scale: f32) {
         let translation = self.get_render_context_translation(render_area, scale);
 
-        // When context changes (zoom/pan/tile), clear all render surfaces first
-        // to remove any residual content from previous tiles, then mark as dirty
-        // so they get redrawn with new transformations
+        // When context changes (zoom/pan/tile), clear intermediate surfaces so
+        // residual content from the previous tile cannot leak into the next.
         let surface_ids = SurfaceId::Fills as u32
             | SurfaceId::Strokes as u32
             | SurfaceId::InnerShadows as u32
             | SurfaceId::TextDropShadows as u32
             | SurfaceId::DropShadows as u32;
 
-        // Clear surfaces before updating transformations to remove residual content
         self.apply_mut(surface_ids, |s| {
             s.canvas().clear(skia::Color::TRANSPARENT);
         });
 
-        // Mark all render surfaces as dirty so they get redrawn
-        self.mark_dirty(SurfaceId::Fills);
-        self.mark_dirty(SurfaceId::Strokes);
-        self.mark_dirty(SurfaceId::InnerShadows);
-        self.mark_dirty(SurfaceId::TextDropShadows);
-        self.mark_dirty(SurfaceId::DropShadows);
+        // Dirty means "has content to composite", not "transform was updated".
+        // After a clear the surfaces are empty; leaving them dirty made the
+        // first `draw_shape_surface_stack_into` on each tile blit empty
+        // Fills/Strokes/shadows into Current (useless GPU ops / ops-task noise).
+        self.clear_dirty(surface_ids);
 
-        // Update transformations
         self.apply_mut(surface_ids, |s| {
             let canvas = s.canvas();
             canvas.reset_matrix();
@@ -1198,34 +1213,34 @@ impl Surfaces {
         tile_doc_rect: skia::Rect,
     ) {
         let gpu_state = get_gpu_state();
-        let rect = TILE_DRAWABLE_RECT;
+        let src = skia::Rect::from(TILE_DRAWABLE_RECT);
+        let sampling = self.sampling_options;
 
-        let tile_image_opt = self.current.image_snapshot_with_bounds(rect);
-        if let Some(tile_image) = tile_image_opt {
-            if !skip_cache_surface {
-                // Draw to cache surface for render_from_cache
-                self.cache.canvas().draw_image_rect(
-                    &tile_image,
-                    None,
-                    tile_rect,
-                    &skia::Paint::default(),
-                );
-            }
+        // DocAtlas + tile atlas via Surface::draw (no image_snapshot sync).
+        let _ = self.atlas.blit_current_drawable_into_atlas(
+            gpu_state,
+            &mut self.current,
+            src,
+            tile_doc_rect,
+            sampling,
+        );
+        self.atlas.tile_doc_rects.insert(*tile, tile_doc_rect);
 
-            // Incrementally update persistent 1:1 atlas in document space.
-            // `tile_doc_rect` is in world/document coordinates (1 unit == 1 px at 100%).
-            let _ = self
-                .atlas
-                .blit_tile_image_into_atlas(gpu_state, &tile_image, tile_doc_rect);
-            self.atlas.tile_doc_rects.insert(*tile, tile_doc_rect);
+        let tile_ref = self.tiles.add(tile_viewbox, tile);
+        let dst = tile_ref.rect;
+        let mut current = self.current.clone();
+        draw_surface_src_rect_to_dst(&mut current, self.tile_atlas.canvas(), src, dst, sampling);
 
-            // Draws current tile into tile atlas
-            let tile_ref = self.tiles.add(tile_viewbox, tile);
-            self.tile_atlas.canvas().draw_image_rect(
-                &tile_image,
-                None,
-                tile_ref.rect,
-                &skia::Paint::default(),
+        if !skip_cache_surface {
+            // Optional legacy Cache surface fill (debug). Pan/zoom preview
+            // uses DocAtlas + tile-atlas textures via render_from_cache.
+            let mut current = self.current.clone();
+            draw_surface_src_rect_to_dst(
+                &mut current,
+                self.cache.canvas(),
+                src,
+                *tile_rect,
+                sampling,
             );
         }
     }
diff --git a/render-wasm/src/render/text.rs b/render-wasm/src/render/text.rs
index 4f1307e6eb..e027aebd21 100644
--- a/render-wasm/src/render/text.rs
+++ b/render-wasm/src/render/text.rs
@@ -3,8 +3,8 @@ use crate::{
     error::Result,
     math::Rect,
     shapes::{
-        calculate_text_layout_data, set_paint_fill, ParagraphBuilderGroup, ParagraphLayout, Stroke,
-        StrokeKind, TextContent,
+        add_text_with_tabs, calculate_text_layout_data, set_paint_fill, ParagraphBuilderGroup,
+        ParagraphLayout, Stroke, StrokeKind, TextContent,
     },
     utils::{get_fallback_fonts, get_font_collection},
 };
@@ -55,7 +55,7 @@ pub fn stroke_paragraph_builder_group_from_text(
                     paragraph.line_height(),
                 );
                 builder.push_style(&stroke_style);
-                builder.add_text(&text);
+                add_text_with_tabs(builder, &text, span.font_size);
             }
         }
 
@@ -329,15 +329,21 @@ fn render_text_on_canvas(
     layer_opacity: Option<f32>,
     overlay_emoji: bool,
 ) {
+    let layer_bounds = shape.layer_bounds();
+
     if let Some(blur_filter) = blur {
         let mut blur_paint = Paint::default();
         blur_paint.set_image_filter(blur_filter.clone());
-        let blur_layer = SaveLayerRec::default().paint(&blur_paint);
+        let blur_layer = SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&blur_paint);
         canvas.save_layer(&blur_layer);
     }
 
     if let Some(shadow_paint) = shadow {
-        let layer_rec = SaveLayerRec::default().paint(shadow_paint);
+        let layer_rec = SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(shadow_paint);
         canvas.save_layer(&layer_rec);
         draw_text(
             canvas,
@@ -351,7 +357,9 @@ fn render_text_on_canvas(
         if let Some(erode) = skia_safe::image_filters::erode((eps, eps), None, None) {
             let mut layer_paint = Paint::default();
             layer_paint.set_image_filter(erode);
-            let layer_rec = SaveLayerRec::default().paint(&layer_paint);
+            let layer_rec = SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&layer_paint);
             canvas.save_layer(&layer_rec);
             draw_text(
                 canvas,
@@ -398,8 +406,20 @@ fn paint_text(
 
 /// Alpha mask for background blur coverage
 pub fn paint_text_mask(canvas: &Canvas, shape: &Shape) {
-    let mut mask_builders = shape.get_text_content().paragraph_builder_group_opaque();
+    let text_content = shape.get_text_content();
+    let mut mask_builders = text_content.paragraph_builder_group_opaque();
     paint_text(canvas, shape, &mut mask_builders);
+
+    // take strokes into account for the bblur mask
+    for stroke in shape.visible_strokes() {
+        let (mut stroke_builders, _) = stroke_paragraph_builder_group_from_text(
+            text_content,
+            stroke,
+            &shape.selrect(),
+            Some(true),
+        );
+        paint_text(canvas, shape, &mut stroke_builders);
+    }
 }
 
 fn paint_text_with_emoji_overlay(
@@ -570,7 +590,10 @@ fn draw_decoration_stroke(
         skia::BlendMode::SrcOut
     };
 
-    canvas.save_layer(&SaveLayerRec::default());
+    let outset = stroke_paint.stroke_width().max(0.0);
+    let layer_bounds = bar.with_outset((outset, outset));
+
+    canvas.save_layer(&SaveLayerRec::default().bounds(&layer_bounds));
     let mut mask_paint = Paint::default();
     mask_paint.set_color(skia::Color::BLACK);
     mask_paint.set_anti_alias(true);
@@ -578,7 +601,11 @@ fn draw_decoration_stroke(
 
     let mut blend_paint = Paint::default();
     blend_paint.set_blend_mode(blend);
-    canvas.save_layer(&SaveLayerRec::default().paint(&blend_paint));
+    canvas.save_layer(
+        &SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&blend_paint),
+    );
     canvas.draw_rect(bar, stroke_paint);
     canvas.restore();
     canvas.restore();
@@ -693,7 +720,12 @@ pub fn render_emoji_overlay(
     if let Some(blur_filter) = blur {
         let mut blur_paint = Paint::default();
         blur_paint.set_image_filter(blur_filter.clone());
-        canvas.save_layer(&SaveLayerRec::default().paint(&blur_paint));
+        let layer_bounds = shape.layer_bounds();
+        canvas.save_layer(
+            &SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&blur_paint),
+        );
     }
 
     for (emoji_para, deco_para) in emoji_layout
@@ -716,13 +748,17 @@ fn draw_text(
     layer_opacity: Option<f32>,
     overlay_emoji: bool,
 ) {
+    let layer_bounds = shape.layer_bounds();
+
     if let Some(opacity) = layer_opacity {
         let mut opacity_paint = Paint::default();
         opacity_paint.set_alpha_f(opacity);
-        let layer_rec = SaveLayerRec::default().paint(&opacity_paint);
+        let layer_rec = SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&opacity_paint);
         canvas.save_layer(&layer_rec);
     } else {
-        canvas.save_layer(&SaveLayerRec::default());
+        canvas.save_layer(&SaveLayerRec::default().bounds(&layer_bounds));
     }
 
     paint_text_with_emoji_overlay(canvas, shape, paragraph_builder_groups, overlay_emoji);
@@ -747,27 +783,41 @@ fn render_masked_stroke_on_canvas(
     blur: Option<&ImageFilter>,
     layer_opacity: Option<f32>,
 ) {
+    let layer_bounds = shape.layer_bounds();
+
     if let Some(blur_filter) = blur {
         let mut blur_paint = Paint::default();
         blur_paint.set_image_filter(blur_filter.clone());
-        canvas.save_layer(&SaveLayerRec::default().paint(&blur_paint));
+        canvas.save_layer(
+            &SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&blur_paint),
+        );
     }
 
     if let Some(opacity) = layer_opacity {
         let mut opacity_paint = Paint::default();
         opacity_paint.set_alpha_f(opacity);
-        canvas.save_layer(&SaveLayerRec::default().paint(&opacity_paint));
+        canvas.save_layer(
+            &SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&opacity_paint),
+        );
     }
 
-    canvas.save_layer(&SaveLayerRec::default());
+    canvas.save_layer(&SaveLayerRec::default().bounds(&layer_bounds));
 
-    canvas.save_layer(&SaveLayerRec::default());
+    canvas.save_layer(&SaveLayerRec::default().bounds(&layer_bounds));
 
     paint_text(canvas, shape, mask_builders);
 
     let mut stroke_paint = Paint::default();
     stroke_paint.set_blend_mode(stroke_mask_blend);
-    canvas.save_layer(&SaveLayerRec::default().paint(&stroke_paint));
+    canvas.save_layer(
+        &SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&stroke_paint),
+    );
 
     paint_text(canvas, shape, stroke_builders);
 
@@ -777,7 +827,11 @@ fn render_masked_stroke_on_canvas(
     if let Some(fill_builders) = fill_builders {
         let mut dst_over_paint = Paint::default();
         dst_over_paint.set_blend_mode(skia::BlendMode::DstOver);
-        canvas.save_layer(&SaveLayerRec::default().paint(&dst_over_paint));
+        canvas.save_layer(
+            &SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&dst_over_paint),
+        );
 
         paint_text(canvas, shape, fill_builders);
 
diff --git a/render-wasm/src/render/text_editor.rs b/render-wasm/src/render/text_editor.rs
index 361b6db165..169f4cb735 100644
--- a/render-wasm/src/render/text_editor.rs
+++ b/render-wasm/src/render/text_editor.rs
@@ -12,7 +12,9 @@ pub fn render_overlay(
     editor_state: &TextEditorState,
     shape: &Shape,
 ) {
-    if !editor_state.has_focus {
+    let has_selection = editor_state.selection.is_selection();
+
+    if !editor_state.has_focus && !has_selection {
         return;
     }
 
@@ -25,11 +27,12 @@ pub fn render_overlay(
     canvas.scale((zoom, zoom));
     canvas.translate((-viewbox.area.left, -viewbox.area.top));
 
-    if editor_state.selection.is_selection() {
+    if has_selection {
+        // With an active selection there is no blinking caret (the caret is one
+        // end of the selection); drawing it would make it toggle on top of the
+        // highlight while the selection is held.
         render_selection(canvas, editor_state, text_content, shape);
-    }
-
-    if editor_state.cursor_visible {
+    } else if editor_state.has_focus && editor_state.cursor_visible {
         render_cursor(canvas, zoom, options.dpr, editor_state, text_content, shape);
     }
 
@@ -65,6 +68,11 @@ fn render_cursor(
     if editor_state.is_overtype_mode {
         paint.set_blend_mode(BlendMode::Exclusion);
         paint.set_color(Color::WHITE);
+    } else if editor_state.theme.cursor_invert {
+        // Default (no solid fill to match): a white caret with a Difference
+        // blend renders the inverted color of whatever is behind it.
+        paint.set_blend_mode(BlendMode::Difference);
+        paint.set_color(editor_state.theme.cursor_color);
     } else {
         paint.set_blend_mode(BlendMode::SrcOver);
         paint.set_color(editor_state.theme.cursor_color);
@@ -148,12 +156,13 @@ fn calculate_cursor_rect(
                 .map(|span| span.text.chars().count())
                 .sum();
 
+            // Skia ranges are UTF-16 code units, not characters.
             let (cursor_x, cursor_y, cursor_width, cursor_height) = if para_char_count == 0 {
                 // Empty paragraph - use default height
                 (0.0, 0.0, 1.0, laid_out_para.height())
             } else if char_pos == 0 {
                 let rects = laid_out_para.get_rects_for_range(
-                    0..1,
+                    0..para.char_utf16_len_at(0),
                     RectHeightStyle::Max,
                     RectWidthStyle::Tight,
                 );
@@ -164,8 +173,10 @@ fn calculate_cursor_rect(
                     (0.0, 0.0, 1.0, laid_out_para.height())
                 }
             } else if char_pos >= para_char_count {
+                let last_char = para_char_count.saturating_sub(1);
+                let last_start = para.char_offset_to_utf16(last_char);
                 let rects = laid_out_para.get_rects_for_range(
-                    para_char_count.saturating_sub(1)..para_char_count,
+                    last_start..last_start + para.char_utf16_len_at(last_char),
                     RectHeightStyle::Max,
                     RectWidthStyle::Tight,
                 );
@@ -181,8 +192,9 @@ fn calculate_cursor_rect(
                     )
                 }
             } else {
+                let utf16_pos = para.char_offset_to_utf16(char_pos);
                 let rects = laid_out_para.get_rects_for_range(
-                    char_pos..char_pos + 1,
+                    utf16_pos..utf16_pos + para.char_utf16_len_at(char_pos),
                     RectHeightStyle::Max,
                     RectWidthStyle::Tight,
                 );
@@ -256,7 +268,7 @@ fn calculate_selection_rects(
         if range_start < range_end {
             use skia_safe::textlayout::{RectHeightStyle, RectWidthStyle};
             let text_boxes = laid_out_para.get_rects_for_range(
-                range_start..range_end,
+                para.char_offset_to_utf16(range_start)..para.char_offset_to_utf16(range_end),
                 RectHeightStyle::Max,
                 RectWidthStyle::Tight,
             );
diff --git a/render-wasm/src/render/vector.rs b/render-wasm/src/render/vector.rs
index cf17a55b8e..a536955c6d 100644
--- a/render-wasm/src/render/vector.rs
+++ b/render-wasm/src/render/vector.rs
@@ -10,6 +10,7 @@ use crate::uuid::Uuid;
 use super::shape_renderer::ShapeRenderer;
 use super::text;
 use super::RenderResources;
+use super::RenderState;
 use super::{get_dest_rect, get_source_rect};
 
 // ---------------------------------------------------------------------------
@@ -78,11 +79,14 @@ impl ShapeRenderer for VectorRenderer<'_> {
     }
 
     fn draw_drop_shadows(&mut self, shape: &Shape) -> Result<()> {
+        let layer_bounds = shape.layer_bounds();
         for shadow in shape.drop_shadows_visible() {
             if let Some(filter) = shadow.get_drop_shadow_filter() {
                 let mut paint = Paint::default();
                 paint.set_image_filter(filter);
-                let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
+                let layer_rec = skia::canvas::SaveLayerRec::default()
+                    .bounds(&layer_bounds)
+                    .paint(&paint);
                 self.canvas.save_layer(&layer_rec);
                 let mut fill_paint = Paint::default();
                 fill_paint.set_anti_alias(true);
@@ -98,10 +102,14 @@ impl ShapeRenderer for VectorRenderer<'_> {
         if !shape.has_fills() {
             return Ok(());
         }
+        let layer_bounds = shape.layer_bounds();
         for shadow in shape.inner_shadows_visible() {
             let paint = shadow.get_inner_shadow_paint(true, shape.image_filter(1.).as_ref());
-            self.canvas
-                .save_layer(&skia::canvas::SaveLayerRec::default().paint(&paint));
+            self.canvas.save_layer(
+                &skia::canvas::SaveLayerRec::default()
+                    .bounds(&layer_bounds)
+                    .paint(&paint),
+            );
             let mut fill_paint = Paint::default();
             fill_paint.set_anti_alias(true);
             fill_paint.set_color(skia::Color::BLACK);
@@ -160,9 +168,13 @@ impl ShapeRenderer for VectorRenderer<'_> {
                 })
                 .collect();
 
+            let layer_bounds = shape.layer_bounds();
             for shadow_paint in &drop_shadows {
-                self.canvas
-                    .save_layer(&skia::canvas::SaveLayerRec::default().paint(shadow_paint));
+                self.canvas.save_layer(
+                    &skia::canvas::SaveLayerRec::default()
+                        .bounds(&layer_bounds)
+                        .paint(shadow_paint),
+                );
 
                 text::render_overlay_emoji(
                     self.canvas,
@@ -330,7 +342,10 @@ impl ShapeRenderer for VectorRenderer<'_> {
         if let Some(filter) = skia::image_filters::blur((sigma, sigma), None, None, None) {
             let mut paint = Paint::default();
             paint.set_image_filter(filter);
-            let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
+            let layer_bounds = shape.layer_bounds();
+            let layer_rec = skia::canvas::SaveLayerRec::default()
+                .bounds(&layer_bounds)
+                .paint(&paint);
             self.canvas.save_layer(&layer_rec);
             true
         } else {
@@ -438,9 +453,10 @@ fn render_tree_inner(
     }
 
     // Background blur samples already-drawn content behind the shape, so it must
-    // run before the shape (and its subtree) paints. Text/SVGRaw are excluded,
-    // matching the GPU path.
-    if !matches!(element.shape_type, Type::Text(_) | Type::SVGRaw(_)) {
+    // run before the shape (and its subtree) paints. SVGRaw is excluded,
+    // matching the GPU path; text keeps only the glyph-alpha coverage (see the
+    // text branches below), also matching the GPU path.
+    if !matches!(element.shape_type, Type::SVGRaw(_)) {
         if let Some(blur) = element.visible_background_blur() {
             if blur.value > 0.0 {
                 if opts.embed_bg_blur {
@@ -479,8 +495,9 @@ fn render_tree_inner(
 
 /// Background blur on a canvas that supports Skia backdrop filters (raster).
 /// Blurs the current device contents within the shape silhouette and stamps the
-/// result back with `Src`. `sigma_radius` is the blur radius already multiplied
-/// by the export scale.
+/// result back with `Src` — or, for text, keeps it only under the glyph/stroke
+/// alpha via a `DstIn` mask (mirrors the GPU path). `sigma_radius` is the blur
+/// radius already multiplied by the export scale.
 fn render_background_blur_backdrop(canvas: &Canvas, shape: &Shape, sigma_radius: f32) {
     let sigma = radius_to_sigma(sigma_radius);
     let Some(blur_filter) =
@@ -492,7 +509,59 @@ fn render_background_blur_backdrop(canvas: &Canvas, shape: &Shape, sigma_radius:
     let matrix = shape.centered_transform();
     canvas.save();
     canvas.concat(&matrix);
-    clip_to_shape(canvas, shape, true);
+
+    if matches!(shape.shape_type, Type::Text(_)) {
+        // Text has no closed geometry to clip with: blur the backdrop inside
+        // the shape rect (outset by the max outward stroke reach so the mask's
+        // stroke coverage isn't cut off), then keep the blurred result only
+        // where the opaque glyph/stroke mask is, via DstIn.
+        let mut clip_rect = shape.selrect;
+        let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), false);
+        if stroke_outset > 0.0 {
+            clip_rect.outset((stroke_outset, stroke_outset));
+        }
+        canvas.clip_rect(clip_rect, skia::ClipOp::Intersect, true);
+
+        // Blur in device space (sigma already includes the export scale); the
+        // clip survives reset_matrix. Remember the full transform to restore it
+        // for painting the mask.
+        let local_to_device = canvas.local_to_device();
+        canvas.reset_matrix();
+
+        // SrcOver composite (NOT Src): Src would clear the backdrop outside
+        // the glyphs within the clip rect; SrcOver + DstIn mask leaves the
+        // unmasked backdrop untouched.
+        let layer_rec = skia::canvas::SaveLayerRec::default()
+            .backdrop(&blur_filter)
+            .backdrop_tile_mode(skia::TileMode::Clamp);
+        canvas.save_layer(&layer_rec);
+
+        canvas.set_matrix(&local_to_device);
+
+        // Keep the blurred backdrop only where the glyphs/strokes are.
+        let mut mask_paint = Paint::default();
+        mask_paint.set_blend_mode(skia::BlendMode::DstIn);
+        let mask_layer_rec = skia::canvas::SaveLayerRec::default().paint(&mask_paint);
+        canvas.save_layer(&mask_layer_rec);
+
+        text::paint_text_mask(canvas, shape);
+
+        canvas.restore(); // mask layer
+        canvas.restore(); // blur layer
+        canvas.restore(); // clip + transform
+        return;
+    }
+
+    // When strokes extend beyond the fill geometry (center/outer), expand the
+    // clip with the stroke coverage so the backdrop is also blurred under the
+    // stroke (mirrors the GPU path).
+    let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), shape.is_open());
+    if stroke_outset > 0.0 {
+        let clip_path = RenderState::background_blur_clip_path(shape, stroke_outset);
+        canvas.clip_path(&clip_path, skia::ClipOp::Intersect, true);
+    } else {
+        clip_to_shape(canvas, shape, true);
+    }
     // Apply the blur in device space (sigma already includes the export scale);
     // the clip, set with the full transform, survives reset_matrix.
     canvas.reset_matrix();
@@ -554,6 +623,7 @@ fn render_background_blur_image(
     // Bake the blur into a raster bitmap. The PDF backend ignores image filters
     // at draw time (same limitation as backdrop filters), so we must blur on a
     // raster surface — where filters work — and embed the pre-blurred result.
+    let is_text = matches!(shape.shape_type, Type::Text(_));
     let sigma = radius_to_sigma(shape.visible_background_blur().map_or(0.0, |b| b.value) * scale);
     let blurred = {
         let Some(mut blur_surface) = skia::surfaces::raster_n32_premul((width, height)) else {
@@ -568,13 +638,50 @@ fn render_background_blur_image(
             paint.set_image_filter(filter);
         }
         bc.draw_image(&image, (0.0, 0.0), Some(&paint));
+
+        if is_text {
+            // Text has no closed geometry to clip with on the PDF canvas, and
+            // the PDF backend can't express DstIn either — so bake the
+            // glyph/stroke alpha mask into the raster bitmap here (where blend
+            // modes work) and embed the already-masked result.
+            let mut mask_paint = Paint::default();
+            mask_paint.set_blend_mode(skia::BlendMode::DstIn);
+            bc.save_layer(&skia::canvas::SaveLayerRec::default().paint(&mask_paint));
+            // Same page-space transform used to render the backdrop above.
+            bc.scale((scale, scale));
+            bc.translate((-bounds.left(), -bounds.top()));
+            bc.concat(&shape.centered_transform());
+            text::paint_text_mask(bc, shape);
+            bc.restore();
+        }
+
         blur_surface.image_snapshot()
     };
 
     let matrix = shape.centered_transform();
     canvas.save();
     canvas.concat(&matrix);
-    clip_to_shape(canvas, shape, true);
+    if is_text {
+        // Mask is already baked into the bitmap; the clip only bounds it to
+        // the shape rect (outset by the max outward stroke reach so stroke
+        // coverage isn't cut off).
+        let mut clip_rect = shape.selrect;
+        let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), false);
+        if stroke_outset > 0.0 {
+            clip_rect.outset((stroke_outset, stroke_outset));
+        }
+        canvas.clip_rect(clip_rect, skia::ClipOp::Intersect, true);
+    } else {
+        // Expand the clip with the stroke coverage when strokes reach beyond
+        // the fill geometry (mirrors the GPU path).
+        let stroke_outset = Stroke::max_bounds_width(shape.visible_strokes(), shape.is_open());
+        if stroke_outset > 0.0 {
+            let clip_path = RenderState::background_blur_clip_path(shape, stroke_outset);
+            canvas.clip_path(&clip_path, skia::ClipOp::Intersect, true);
+        } else {
+            clip_to_shape(canvas, shape, true);
+        }
+    }
     // Draw the pre-blurred full-page bitmap in device space (1 image px per
     // device unit) so it aligns with the page regardless of the shape transform.
     canvas.reset_matrix();
@@ -622,7 +729,10 @@ fn render_group(
             }
         }
 
-        let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
+        let layer_bounds = element.extrect(tree, scale);
+        let layer_rec = skia::canvas::SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&paint);
         canvas.save_layer(&layer_rec);
     }
 
@@ -633,7 +743,12 @@ fn render_group(
         // as content, then re-draw the mask silhouette (the group's first child)
         // with DstIn to clip everything to it.
         let paint = Paint::default();
-        canvas.save_layer(&skia::canvas::SaveLayerRec::default().paint(&paint));
+        let subtree_bounds = element.extrect(tree, scale);
+        canvas.save_layer(
+            &skia::canvas::SaveLayerRec::default()
+                .bounds(&subtree_bounds)
+                .paint(&paint),
+        );
 
         for child_id in &children {
             render_tree_inner(shared, canvas, child_id, tree, scale, opts)?;
@@ -642,7 +757,11 @@ fn render_group(
         if let Some(mask_id) = element.mask_id() {
             let mut mask_paint = Paint::default();
             mask_paint.set_blend_mode(skia::BlendMode::DstIn);
-            canvas.save_layer(&skia::canvas::SaveLayerRec::default().paint(&mask_paint));
+            canvas.save_layer(
+                &skia::canvas::SaveLayerRec::default()
+                    .bounds(&subtree_bounds)
+                    .paint(&mask_paint),
+            );
             render_tree_inner(shared, canvas, mask_id, tree, scale, opts)?;
             canvas.restore(); // mask layer
         }
@@ -704,7 +823,10 @@ fn render_frame(
             }
         }
 
-        let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
+        let layer_bounds = element.extrect(tree, scale);
+        let layer_rec = skia::canvas::SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&paint);
         canvas.save_layer(&layer_rec);
     }
 
@@ -764,13 +886,18 @@ fn render_container_drop_shadows(
     draw_fills: bool,
     opts: &TreeOpts,
 ) -> Result<()> {
+    let subtree_bounds = element.extrect(tree, scale);
     for shadow in element.drop_shadows_visible() {
         let Some(filter) = shadow.get_drop_shadow_filter() else {
             continue;
         };
         let mut paint = Paint::default();
         paint.set_image_filter(filter);
-        canvas.save_layer(&skia::canvas::SaveLayerRec::default().paint(&paint));
+        canvas.save_layer(
+            &skia::canvas::SaveLayerRec::default()
+                .bounds(&subtree_bounds)
+                .paint(&paint),
+        );
 
         if draw_fills && !element.fills.is_empty() {
             let mut renderer = VectorRenderer::new(canvas, shared, scale);
@@ -809,7 +936,10 @@ fn render_leaf(
         let mut paint = Paint::default();
         paint.set_blend_mode(element.blend_mode().into());
         paint.set_alpha_f(element.opacity());
-        let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
+        let layer_bounds = element.layer_bounds();
+        let layer_rec = skia::canvas::SaveLayerRec::default()
+            .bounds(&layer_bounds)
+            .paint(&paint);
         canvas.save_layer(&layer_rec);
     }
 
@@ -1008,7 +1138,8 @@ fn draw_stroke_kind_aware(canvas: &Canvas, shape: &Shape, stroke: &Stroke, paint
         }
         StrokeKind::Outer => {
             canvas.save();
-            canvas.save_layer(&skia::canvas::SaveLayerRec::default());
+            let layer_bounds = shape.layer_bounds();
+            canvas.save_layer(&skia::canvas::SaveLayerRec::default().bounds(&layer_bounds));
             draw_shape_geometry(canvas, shape, paint);
             let mut clear_paint = Paint::default();
             clear_paint.set_blend_mode(skia::BlendMode::Clear);
@@ -1041,7 +1172,8 @@ fn draw_image_stroke(
     let container = shape.selrect;
 
     canvas.save();
-    canvas.save_layer(&skia::canvas::SaveLayerRec::default());
+    let layer_bounds = shape.layer_bounds();
+    canvas.save_layer(&skia::canvas::SaveLayerRec::default().bounds(&layer_bounds));
 
     // Opaque stroke silhouette; the SrcIn image draw below fills it.
     draw_stroke_geometry(canvas, scale, shape, stroke, true);
diff --git a/render-wasm/src/shapes.rs b/render-wasm/src/shapes.rs
index 7ae9fd8cef..dbdeb74be2 100644
--- a/render-wasm/src/shapes.rs
+++ b/render-wasm/src/shapes.rs
@@ -679,13 +679,13 @@ impl Shape {
     pub fn visible_strokes(&self) -> impl DoubleEndedIterator<Item = &Stroke> {
         self.strokes
             .iter()
-            .filter(|stroke| stroke.width > MIN_STROKE_WIDTH)
+            .filter(|stroke| stroke.max_width() > MIN_STROKE_WIDTH)
     }
 
     pub fn has_visible_strokes(&self) -> bool {
         self.strokes
             .iter()
-            .any(|stroke| stroke.width > MIN_STROKE_WIDTH)
+            .any(|stroke| stroke.max_width() > MIN_STROKE_WIDTH)
     }
 
     pub fn add_stroke(&mut self, s: Stroke) {
@@ -693,6 +693,13 @@ impl Shape {
         self.strokes.push(s)
     }
 
+    pub fn set_last_stroke_widths(&mut self, widths: [f32; 4]) -> Result<(), String> {
+        let stroke = self.strokes.last_mut().ok_or("Shape has no strokes")?;
+        stroke.widths = Some(widths);
+        self.invalidate_extrect();
+        Ok(())
+    }
+
     pub fn set_stroke_fill(&mut self, f: Fill) -> Result<(), String> {
         let stroke = self.strokes.last_mut().ok_or("Shape has no strokes")?;
         stroke.fill = f;
@@ -705,16 +712,21 @@ impl Shape {
     }
 
     pub fn set_path_segments(&mut self, segments: Vec<Segment>) {
-        let path = Path::new(segments);
         match &mut self.shape_type {
             Type::Bool(Bool { bool_type, .. }) => {
+                let path = match bool_type {
+                    // Exclusion booleans are computed with even-odd semantics but
+                    // PathData uploads do not carry the fill rule.
+                    BoolType::Exclusion => Path::new(segments).with_even_odd(true),
+                    _ => Path::new(segments),
+                };
                 self.shape_type = Type::Bool(Bool {
                     bool_type: *bool_type,
                     path,
                 });
             }
             Type::Path(_) => {
-                self.shape_type = Type::Path(path);
+                self.shape_type = Type::Path(Path::new(segments));
             }
             _ => {}
         };
@@ -1058,7 +1070,7 @@ impl Shape {
         extrect
     }
 
-    fn calculate_extrect_uncached(&self, shapes_pool: ShapesPoolRef, scale: f32) -> math::Rect {
+    fn own_extrect_bounds(&self) -> Bounds {
         let shape = self;
         let max_stroke = Stroke::max_bounds_width(shape.strokes.iter(), shape.is_open());
 
@@ -1084,6 +1096,19 @@ impl Shape {
         bounds = self.apply_stroke_bounds(bounds, max_stroke);
         bounds = self.apply_shadow_bounds(bounds);
         bounds = self.apply_blur_bounds(bounds);
+        bounds
+    }
+
+    /// Bound for a `SaveLayerRec` wrapping this shape's own drawing, in
+    /// untransformed space (callers concatenate [`Self::centered_transform`]
+    /// first). Includes shadow/blur margins, so it is also a valid input bound
+    /// for a layer whose paint carries an image filter.
+    pub fn layer_bounds(&self) -> math::Rect {
+        self.own_extrect_bounds().to_rect()
+    }
+
+    fn calculate_extrect_uncached(&self, shapes_pool: ShapesPoolRef, scale: f32) -> math::Rect {
+        let mut bounds = self.own_extrect_bounds();
         bounds = self.apply_children_bounds(bounds, shapes_pool, scale);
         bounds = self.apply_children_blur(bounds, shapes_pool);
 
diff --git a/render-wasm/src/shapes/fills.rs b/render-wasm/src/shapes/fills.rs
index 87da3881bf..15d5dc09f7 100644
--- a/render-wasm/src/shapes/fills.rs
+++ b/render-wasm/src/shapes/fills.rs
@@ -42,6 +42,29 @@ impl Gradient {
         self.offsets.extend(offsets);
     }
 
+    pub fn start(&self) -> (f32, f32) {
+        self.start
+    }
+
+    pub fn end(&self) -> (f32, f32) {
+        self.end
+    }
+
+    pub fn opacity(&self) -> u8 {
+        self.opacity
+    }
+
+    pub fn width(&self) -> f32 {
+        self.width
+    }
+
+    pub fn stops(&self) -> impl Iterator<Item = (Color, f32)> + '_ {
+        self.colors
+            .iter()
+            .copied()
+            .zip(self.offsets.iter().copied())
+    }
+
     pub fn to_linear_shader(&self, rect: &Rect) -> Option<skia::Shader> {
         let start = (
             rect.left + self.start.0 * rect.width(),
@@ -126,6 +149,14 @@ impl ImageFill {
     pub fn keep_aspect_ratio(&self) -> bool {
         self.keep_aspect_ratio
     }
+
+    pub fn width(&self) -> i32 {
+        self.width
+    }
+
+    pub fn height(&self) -> i32 {
+        self.height
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Copy)]
diff --git a/render-wasm/src/shapes/modifiers/flex_layout.rs b/render-wasm/src/shapes/modifiers/flex_layout.rs
index 7c7b911c1f..5bdd64e488 100644
--- a/render-wasm/src/shapes/modifiers/flex_layout.rs
+++ b/render-wasm/src/shapes/modifiers/flex_layout.rs
@@ -667,9 +667,12 @@ pub fn reflow_flex_layout(
                 transform.post_concat(&Matrix::translate(delta_v));
             }
 
-            result.push_back(Modifier::transform_propagate(child.id, transform));
-            if child.has_layout() {
-                result.push_back(Modifier::reflow(child.id, force_reflow));
+            // Skip identity: propagating it fans out through the whole subtree.
+            if !math::identitish(&transform) {
+                result.push_back(Modifier::transform_propagate(child.id, transform));
+                if child.has_layout() {
+                    result.push_back(Modifier::reflow(child.id, force_reflow));
+                }
             }
 
             shape_anchor = next_anchor(
diff --git a/render-wasm/src/shapes/modifiers/grid_layout.rs b/render-wasm/src/shapes/modifiers/grid_layout.rs
index 7ddc877d91..a9749b9d8f 100644
--- a/render-wasm/src/shapes/modifiers/grid_layout.rs
+++ b/render-wasm/src/shapes/modifiers/grid_layout.rs
@@ -884,9 +884,12 @@ pub fn reflow_grid_layout(
             transform.post_concat(&Matrix::translate(delta_v));
         }
 
-        result.push_back(Modifier::transform_propagate(child.id, transform));
-        if child.has_layout() {
-            result.push_back(Modifier::reflow(child.id, force_reflow));
+        // Skip identity: propagating it fans out through the whole subtree.
+        if !math::identitish(&transform) {
+            result.push_back(Modifier::transform_propagate(child.id, transform));
+            if child.has_layout() {
+                result.push_back(Modifier::reflow(child.id, force_reflow));
+            }
         }
     }
 
diff --git a/render-wasm/src/shapes/paths.rs b/render-wasm/src/shapes/paths.rs
index 94f7521c3e..f63b732f15 100644
--- a/render-wasm/src/shapes/paths.rs
+++ b/render-wasm/src/shapes/paths.rs
@@ -262,6 +262,9 @@ impl Path {
 
     pub fn to_skia_path(&self, svg_attrs: Option<&SvgAttrs>) -> skia::Path {
         let mut path = self.skia_path.snapshot();
+        if self.is_even_odd() {
+            path.set_fill_type(skia::PathFillType::EvenOdd);
+        }
         if let Some(attrs) = svg_attrs {
             if attrs.fill_rule == FillRule::Evenodd {
                 path.set_fill_type(skia::PathFillType::EvenOdd);
diff --git a/render-wasm/src/shapes/shadows.rs b/render-wasm/src/shapes/shadows.rs
index 6cfa912659..6f446e3223 100644
--- a/render-wasm/src/shapes/shadows.rs
+++ b/render-wasm/src/shapes/shadows.rs
@@ -4,6 +4,18 @@ use super::blurs::radius_to_sigma;
 use super::Color;
 use crate::render::filters::compose_filters;
 
+/// Soft visibility floor in device pixels for leaf shapes. Below this, a drop
+/// shadow is visual noise relative to its blur cost.
+pub const DROP_SHADOW_MIN_DEVICE_PX: f32 = 2.0;
+
+/// Recursive shapes (frames/groups) redraw children into the shadow layer; they
+/// need a clearer on-screen footprint before that cost is worthwhile.
+pub const DROP_SHADOW_RECURSIVE_MIN_DEVICE_PX: f32 = 4.0;
+
+/// Generous design-space shadow budget used with [`DROP_SHADOW_MIN_DEVICE_PX`]
+/// for a hard global early-out (subpixel even for huge shadows).
+pub const DROP_SHADOW_LARGE_DESIGN_PX: f32 = 64.0;
+
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
 pub enum ShadowStyle {
     #[default]
@@ -48,6 +60,32 @@ impl Shadow {
         self.hidden
     }
 
+    /// Approximate on-screen footprint (blur/spread + offset) at `scale` (zoom×dpr).
+    #[inline]
+    pub fn device_extent(&self, scale: f32) -> f32 {
+        let soft = self.blur.max(self.spread);
+        let offset = self.offset.0.abs().max(self.offset.1.abs());
+        (soft + offset) * scale
+    }
+
+    /// True when this shadow still has a perceptible footprint at `scale`.
+    /// Recursive shapes use a higher floor because compositing children into
+    /// the shadow layer is far more expensive than a leaf silhouette.
+    #[inline]
+    pub fn is_perceptible_at_scale(&self, scale: f32) -> bool {
+        self.is_perceptible_at_scale_for(scale, false)
+    }
+
+    #[inline]
+    pub fn is_perceptible_at_scale_for(&self, scale: f32, recursive: bool) -> bool {
+        let min = if recursive {
+            DROP_SHADOW_RECURSIVE_MIN_DEVICE_PX
+        } else {
+            DROP_SHADOW_MIN_DEVICE_PX
+        };
+        self.device_extent(scale) >= min
+    }
+
     pub fn get_drop_shadow_filter(&self) -> Option<ImageFilter> {
         let sigma = radius_to_sigma(self.blur);
         let mut filter = image_filters::drop_shadow_only(
@@ -112,3 +150,44 @@ impl Shadow {
         self.offset.1 *= value;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn shadow(blur: f32, spread: f32, ox: f32, oy: f32) -> Shadow {
+        Shadow::new(
+            skia::Color::BLACK,
+            blur,
+            spread,
+            (ox, oy),
+            ShadowStyle::Drop,
+            false,
+        )
+    }
+
+    #[test]
+    fn leaf_floor_at_moderate_zoom() {
+        // blur 16 @ 0.13 ≈ 2.08px → keep leaf
+        assert!(shadow(16.0, 0.0, 0.0, 0.0).is_perceptible_at_scale_for(0.13, false));
+        // blur 8 @ 0.13 ≈ 1.04px → skip leaf (below 2px)
+        assert!(!shadow(8.0, 0.0, 0.0, 0.0).is_perceptible_at_scale_for(0.13, false));
+    }
+
+    #[test]
+    fn recursive_floor_is_stricter() {
+        // blur 24 @ 0.13 ≈ 3.12px → keep leaf, skip recursive (needs 4px)
+        let s = shadow(24.0, 0.0, 0.0, 0.0);
+        assert!(s.is_perceptible_at_scale_for(0.13, false));
+        assert!(!s.is_perceptible_at_scale_for(0.13, true));
+        // blur 32 @ 0.13 ≈ 4.16px → keep recursive
+        assert!(shadow(32.0, 0.0, 0.0, 0.0).is_perceptible_at_scale_for(0.13, true));
+    }
+
+    #[test]
+    fn overview_scale_vs_extent() {
+        // At 0.038 even blur 50 is only ~1.9px — below leaf floor.
+        assert!(!shadow(50.0, 0.0, 0.0, 0.0).is_perceptible_at_scale_for(0.038, false));
+        assert!(shadow(60.0, 0.0, 0.0, 0.0).is_perceptible_at_scale_for(0.038, false));
+    }
+}
diff --git a/render-wasm/src/shapes/strokes.rs b/render-wasm/src/shapes/strokes.rs
index 48f43d975b..2e80abafe0 100644
--- a/render-wasm/src/shapes/strokes.rs
+++ b/render-wasm/src/shapes/strokes.rs
@@ -7,6 +7,14 @@ use super::StrokeLineCap;
 use super::StrokeLineJoin;
 use super::SvgAttrs;
 
+/// Soft floor in device pixels for dropping dash/dotted PathEffects when the
+/// pattern period is effectively invisible.
+pub const STROKE_MIN_DEVICE_PX: f32 = 0.75;
+
+/// When Inner/Outer doubled-width footprint is below this (device px), paint
+/// as Center to avoid save_layer / Clear paths.
+pub const STROKE_INNER_OUTER_SIMPLIFY_DEVICE_PX: f32 = 2.0;
+
 #[derive(Debug, Clone, PartialEq, Copy)]
 pub enum StrokeStyle {
     Solid,
@@ -45,6 +53,9 @@ pub struct Stroke {
     // default `width + 10` pattern to keep existing designs visually identical.
     pub dash: Option<f32>,
     pub gap: Option<f32>,
+    // Per-side widths [top, right, bottom, left] for rects and frames.
+    // `None` means the uniform `width` applies to all sides.
+    pub widths: Option<[f32; 4]>,
 }
 
 impl Stroke {
@@ -57,11 +68,90 @@ impl Stroke {
         }
     }
 
+    /// The widest side of the stroke: the uniform `width` unless per-side
+    /// widths are set, in which case the maximum of the four sides.
+    pub fn max_width(&self) -> f32 {
+        match self.widths {
+            Some(widths) => widths.into_iter().reduce(f32::max).unwrap_or(self.width),
+            None => self.width,
+        }
+    }
+
+    /// Inner/Outer use a doubled-width Center stroke plus clip/clear. When that
+    /// footprint is thin on screen, fall back to a plain Center stroke.
+    #[inline]
+    pub fn simplified_kind_at_scale(&self, is_open: bool, scale: f32) -> StrokeKind {
+        let kind = self.render_kind(is_open);
+        match kind {
+            StrokeKind::Inner | StrokeKind::Outer
+                if 2.0 * self.max_width() * scale < STROKE_INNER_OUTER_SIMPLIFY_DEVICE_PX =>
+            {
+                StrokeKind::Center
+            }
+            other => other,
+        }
+    }
+
+    /// Drop dash/dotted PathEffects when the pattern period is subpixel.
+    #[inline]
+    pub fn style_at_scale(&self, scale: f32) -> StrokeStyle {
+        if self.style == StrokeStyle::Solid {
+            return StrokeStyle::Solid;
+        }
+        let period = match self.style {
+            StrokeStyle::Dotted => self.width + 5.0,
+            StrokeStyle::Dashed => {
+                let dash = self.dash.unwrap_or(self.width + 10.);
+                let gap = self.gap.unwrap_or(self.width + 10.);
+                dash.min(gap)
+            }
+            StrokeStyle::Mixed => self.width + 1.0,
+            StrokeStyle::Solid => return StrokeStyle::Solid,
+        };
+        if period * scale < STROKE_MIN_DEVICE_PX {
+            StrokeStyle::Solid
+        } else {
+            self.style
+        }
+    }
+
+    /// Path/Bool overview LOD: simplify Inner/Outer and dash/dotted at low
+    /// scale. Never skips painting; stroke-only icons would otherwise go blank.
+    pub fn path_lod_at_scale(&self, is_open: bool, scale: f32) -> Stroke {
+        let kind = self.simplified_kind_at_scale(is_open, scale);
+        let style = self.style_at_scale(scale);
+        let kind_unchanged = kind == self.render_kind(is_open);
+        let style_unchanged = style == self.style;
+        if kind_unchanged && style_unchanged {
+            return self.clone();
+        }
+        let mut stroke = self.clone();
+        if !is_open {
+            stroke.kind = kind;
+        }
+        stroke.style = style;
+        stroke
+    }
+
+    /// Per-side widths [top, right, bottom, left] when they actually differ.
+    /// Returns `None` when unset or when all sides are equal, so the uniform
+    /// render path (which supports dashed/dotted styles) keeps handling that
+    /// case.
+    pub fn per_side_widths(&self) -> Option<[f32; 4]> {
+        let widths = self.widths?;
+        let [top, right, bottom, left] = widths;
+        if top == right && right == bottom && bottom == left {
+            None
+        } else {
+            Some(widths)
+        }
+    }
+
     pub fn bounds_width(&self, is_open: bool) -> f32 {
         match self.render_kind(is_open) {
             StrokeKind::Inner => 0.,
-            StrokeKind::Center => self.width / 2.,
-            StrokeKind::Outer => self.width,
+            StrokeKind::Center => self.max_width() / 2.,
+            StrokeKind::Outer => self.max_width(),
         }
     }
 
@@ -88,6 +178,7 @@ impl Stroke {
             kind: StrokeKind::Center,
             dash,
             gap,
+            widths: None,
         }
     }
 
@@ -108,6 +199,7 @@ impl Stroke {
             kind: StrokeKind::Inner,
             dash,
             gap,
+            widths: None,
         }
     }
 
@@ -128,11 +220,17 @@ impl Stroke {
             kind: StrokeKind::Outer,
             dash,
             gap,
+            widths: None,
         }
     }
 
     pub fn scale_content(&mut self, value: f32) {
         self.width *= value;
+        if let Some(widths) = &mut self.widths {
+            for width in widths.iter_mut() {
+                *width *= value;
+            }
+        }
         if let Some(dash) = self.dash {
             self.dash = Some(dash * value);
         }
@@ -417,3 +515,90 @@ fn cap_margin_for_cap(cap: Option<StrokeCap>, width: f32) -> f32 {
         _ => 0.0,
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn stroke_with_widths(widths: Option<[f32; 4]>) -> Stroke {
+        let mut stroke = Stroke::new_inner_stroke(2.0, StrokeStyle::Solid, None, None, None, None);
+        stroke.widths = widths;
+        stroke
+    }
+
+    #[test]
+    fn max_width_falls_back_to_uniform_width() {
+        let stroke = stroke_with_widths(None);
+        assert_eq!(stroke.max_width(), 2.0);
+    }
+
+    #[test]
+    fn max_width_uses_widest_side() {
+        let stroke = stroke_with_widths(Some([1.0, 8.0, 3.0, 0.0]));
+        assert_eq!(stroke.max_width(), 8.0);
+    }
+
+    #[test]
+    fn per_side_widths_none_when_all_sides_equal() {
+        let stroke = stroke_with_widths(Some([4.0, 4.0, 4.0, 4.0]));
+        assert_eq!(stroke.per_side_widths(), None);
+    }
+
+    #[test]
+    fn per_side_widths_returns_differing_sides() {
+        let stroke = stroke_with_widths(Some([1.0, 2.0, 3.0, 4.0]));
+        assert_eq!(stroke.per_side_widths(), Some([1.0, 2.0, 3.0, 4.0]));
+    }
+
+    #[test]
+    fn scale_content_scales_per_side_widths() {
+        let mut stroke = stroke_with_widths(Some([1.0, 2.0, 3.0, 4.0]));
+        stroke.scale_content(2.0);
+        assert_eq!(stroke.widths, Some([2.0, 4.0, 6.0, 8.0]));
+        assert_eq!(stroke.width, 4.0);
+    }
+
+    fn solid_center(width: f32) -> Stroke {
+        Stroke::new_center_stroke(width, StrokeStyle::Solid, None, None, None, None)
+    }
+
+    #[test]
+    fn inner_outer_simplify_to_center_when_thin() {
+        let inner = Stroke::new_inner_stroke(8.0, StrokeStyle::Solid, None, None, None, None);
+        // 2 * 8 * 0.1 = 1.6 < 2.0, simplify to Center
+        assert_eq!(
+            inner.simplified_kind_at_scale(false, 0.1),
+            StrokeKind::Center
+        );
+        // 2 * 8 * 0.2 = 3.2 >= 2.0, keep Inner
+        assert_eq!(
+            inner.simplified_kind_at_scale(false, 0.2),
+            StrokeKind::Inner
+        );
+    }
+
+    #[test]
+    fn dash_becomes_solid_when_period_subpixel() {
+        let dashed =
+            Stroke::new_center_stroke(2.0, StrokeStyle::Dashed, None, None, Some(20.0), Some(20.0));
+        // period 20 * 0.03 = 0.6 < 0.75, solid
+        assert_eq!(dashed.style_at_scale(0.03), StrokeStyle::Solid);
+        // period 20 * 0.05 = 1.0 >= 0.75, keep dashed
+        assert_eq!(dashed.style_at_scale(0.05), StrokeStyle::Dashed);
+    }
+
+    #[test]
+    fn path_lod_never_drops_thin_stroke() {
+        // Hairline strokes must still paint (stroke-only icons).
+        let thin = solid_center(1.0).path_lod_at_scale(false, 0.5);
+        assert_eq!(thin.width, 1.0);
+        assert_eq!(thin.kind, StrokeKind::Center);
+    }
+
+    #[test]
+    fn path_lod_simplifies_inner_at_overview() {
+        let inner = Stroke::new_inner_stroke(8.0, StrokeStyle::Solid, None, None, None, None);
+        let lod = inner.path_lod_at_scale(false, 0.1);
+        assert_eq!(lod.kind, StrokeKind::Center);
+    }
+}
diff --git a/render-wasm/src/shapes/text.rs b/render-wasm/src/shapes/text.rs
index f5f58f5a80..47befc08f3 100644
--- a/render-wasm/src/shapes/text.rs
+++ b/render-wasm/src/shapes/text.rs
@@ -14,7 +14,10 @@ use skia_safe::{
     textlayout::Affinity,
     textlayout::ParagraphBuilder,
     textlayout::ParagraphStyle,
+    textlayout::PlaceholderAlignment,
+    textlayout::PlaceholderStyle,
     textlayout::PositionWithAffinity,
+    textlayout::TextBaseline,
     Contains,
 };
 
@@ -653,38 +656,14 @@ impl TextContent {
                 let position_with_affinity =
                     layout_paragraph.get_glyph_position_at_coordinate((para_pt.x, para_pt.y));
                 if let Some(paragraph) = self.paragraphs().get(paragraph_index) {
-                    // Computed position keeps the current position in terms
-                    // of number of characters of text. This is used to know
-                    // in which span we are.
-                    let mut computed_position: usize = 0;
-
-                    // If paragraph has no spans, default to span 0, offset 0
-                    if !paragraph.children().is_empty() {
-                        for span in paragraph.children() {
-                            let length = span.text.chars().count();
-                            let start_position = computed_position;
-                            let end_position = computed_position + length;
-                            let current_position = position_with_affinity.position as usize;
-
-                            // Handle empty spans: if the span is empty and current position
-                            // matches the start, this is the right span
-                            if length == 0 && current_position == start_position {
-                                break;
-                            }
-
-                            if start_position <= current_position
-                                && end_position >= current_position
-                            {
-                                break;
-                            }
-                            computed_position += length;
-                        }
-                    }
+                    // Skia reports UTF-16 code units, the model counts characters.
+                    let offset =
+                        paragraph.utf16_offset_to_char(position_with_affinity.position as usize);
 
                     return Some(TextPositionWithAffinity::new(
                         position_with_affinity,
                         paragraph_index,
-                        position_with_affinity.position as usize,
+                        offset,
                     ));
                 }
             }
@@ -749,7 +728,7 @@ impl TextContent {
                     has_text = true;
                 }
                 builder.push_style(&text_style);
-                builder.add_text(&text);
+                add_text_with_tabs(&mut builder, &text, span.font_size);
             }
             if !has_text {
                 builder.add_text(" ");
@@ -783,7 +762,7 @@ impl TextContent {
                     has_text = true;
                 }
                 builder.push_style(&text_style);
-                builder.add_text(&text);
+                add_text_with_tabs(&mut builder, &text, span.font_size);
             }
             if !has_text {
                 builder.add_text(" ");
@@ -1160,6 +1139,53 @@ impl Paragraph {
         &mut self.children
     }
 
+    fn char_count(&self) -> usize {
+        self.children
+            .iter()
+            .map(|span| span.text.chars().count())
+            .sum()
+    }
+
+    /// Translate a character offset into the UTF-16 offset Skia indexes by.
+    /// Both differ on astral-plane characters (emoji) and whenever a text
+    /// transform changes the length of the laid out text (`ß` -> `SS`).
+    pub fn char_offset_to_utf16(&self, char_offset: usize) -> usize {
+        let mut remaining = char_offset;
+        let mut utf16 = 0;
+        for span in &self.children {
+            if remaining == 0 {
+                break;
+            }
+            let span_len = span.text.chars().count();
+            let take = remaining.min(span_len);
+            let prefix: String = span.text.chars().take(take).collect();
+            utf16 += span.transform_text(&prefix).encode_utf16().count();
+            remaining -= take;
+        }
+        utf16
+    }
+
+    /// Translate a UTF-16 offset coming from Skia into a character offset.
+    /// An offset inside a character rounds up, so it never splits a glyph.
+    pub fn utf16_offset_to_char(&self, utf16_offset: usize) -> usize {
+        let (mut low, mut high) = (0, self.char_count());
+        while low < high {
+            let middle = (low + high) / 2;
+            if self.char_offset_to_utf16(middle) < utf16_offset {
+                low = middle + 1;
+            } else {
+                high = middle;
+            }
+        }
+        low
+    }
+
+    /// UTF-16 length of the character at `char_offset`, so a caret range covers
+    /// the whole glyph.
+    pub fn char_utf16_len_at(&self, char_offset: usize) -> usize {
+        self.char_offset_to_utf16(char_offset + 1) - self.char_offset_to_utf16(char_offset)
+    }
+
     pub fn line_height(&self) -> f32 {
         self.line_height
     }
@@ -1190,7 +1216,7 @@ impl Paragraph {
         style.set_height(self.line_height);
         style.set_text_align(self.text_align);
         style.set_text_direction(self.text_direction);
-        style.set_replace_tab_characters(true);
+        style.set_replace_tab_characters(false);
         style.set_apply_rounding_hack(true);
         style.set_text_height_behavior(skia::textlayout::TextHeightBehavior::All);
         style
@@ -1226,12 +1252,30 @@ fn capitalize_words(text: &str) -> String {
     result
 }
 
-/// Filter control characters below U+0020, preserving line breaks.
+/// Add `text`, pushing every '\t' as a one em wide placeholder.
+pub fn add_text_with_tabs(builder: &mut ParagraphBuilder, text: &str, font_size: f32) {
+    let tab = PlaceholderStyle::new(
+        font_size,
+        0.0,
+        PlaceholderAlignment::Baseline,
+        TextBaseline::Alphabetic,
+        0.0,
+    );
+
+    for (index, segment) in text.split('\t').enumerate() {
+        if index > 0 {
+            builder.add_placeholder(&tab);
+        }
+        builder.add_text(segment);
+    }
+}
+
+/// Filter control characters below U+0020, preserving tabs and line breaks.
 /// Browser-dependent: Firefox drops them, others replace with space.
 fn process_ignored_chars(text: &str, browser: u8) -> String {
     text.chars()
         .filter_map(|c| {
-            if c == '\n' || c == '\r' || c == '\u{2028}' || c == '\u{2029}' {
+            if c == '\t' || c == '\n' || c == '\r' || c == '\u{2028}' || c == '\u{2029}' {
                 return Some(c);
             }
             if c < '\u{0020}' {
@@ -1377,9 +1421,8 @@ impl TextSpan {
         format!("{}", self.font_family)
     }
 
-    pub fn apply_text_transform(&self) -> String {
-        let browser = crate::with_state!(state, { state.current_browser });
-        let text = process_ignored_chars(&self.text, browser);
+    pub fn transform_text(&self, text: &str) -> String {
+        let text = process_ignored_chars(text, crate::globals::current_browser());
         match self.text_transform {
             Some(TextTransform::Uppercase) => text.to_uppercase(),
             Some(TextTransform::Lowercase) => text.to_lowercase(),
@@ -1388,6 +1431,10 @@ impl TextSpan {
         }
     }
 
+    pub fn apply_text_transform(&self) -> String {
+        self.transform_text(&self.text)
+    }
+
     pub fn scale_content(&mut self, value: f32) {
         self.font_size *= value;
     }
@@ -1716,6 +1763,15 @@ mod tests {
         assert_eq!(process_ignored_chars("hello\rworld", 0), "hello\rworld");
     }
 
+    #[test]
+    fn process_ignored_chars_preserves_tabs() {
+        assert_eq!(process_ignored_chars("hello\tworld", 0), "hello\tworld");
+        assert_eq!(
+            process_ignored_chars("hello\tworld", Browser::Firefox as u8),
+            "hello\tworld"
+        );
+    }
+
     #[test]
     fn process_ignored_chars_replaces_control_chars_chrome() {
         // U+0001 (SOH) should become space in non-Firefox
@@ -1732,4 +1788,85 @@ mod tests {
             "ab"
         );
     }
+
+    fn test_paragraph(texts: &[&str]) -> Paragraph {
+        let spans = texts
+            .iter()
+            .map(|text| {
+                TextSpan::new(
+                    text.to_string(),
+                    FontFamily::new(Uuid::nil(), 400, crate::shapes::FontStyle::Normal),
+                    14.0,
+                    1.2,
+                    0.0,
+                    None,
+                    None,
+                    TextDirection::LTR,
+                    400,
+                    Uuid::nil(),
+                    vec![],
+                )
+            })
+            .collect();
+
+        Paragraph::new(
+            TextAlign::Left,
+            TextDirection::LTR,
+            None,
+            None,
+            1.2,
+            0.0,
+            spans,
+        )
+    }
+
+    #[test]
+    fn char_offsets_match_utf16_offsets_for_bmp_text() {
+        let para = test_paragraph(&["Añadir"]);
+        for offset in 0..=6 {
+            assert_eq!(para.char_offset_to_utf16(offset), offset);
+            assert_eq!(para.utf16_offset_to_char(offset), offset);
+        }
+    }
+
+    #[test]
+    fn char_offsets_account_for_astral_characters() {
+        let para = test_paragraph(&["a", "😀b"]);
+
+        assert_eq!(para.char_offset_to_utf16(0), 0);
+        assert_eq!(para.char_offset_to_utf16(1), 1);
+        assert_eq!(para.char_offset_to_utf16(2), 3);
+        assert_eq!(para.char_offset_to_utf16(3), 4);
+
+        assert_eq!(para.utf16_offset_to_char(0), 0);
+        assert_eq!(para.utf16_offset_to_char(1), 1);
+        assert_eq!(para.utf16_offset_to_char(3), 2);
+        assert_eq!(para.utf16_offset_to_char(4), 3);
+    }
+
+    #[test]
+    fn utf16_offset_inside_a_surrogate_pair_rounds_to_a_char_boundary() {
+        let para = test_paragraph(&["a😀b"]);
+        assert_eq!(para.utf16_offset_to_char(2), 2);
+    }
+
+    #[test]
+    fn char_offsets_account_for_text_transforms() {
+        // Skia lays out the transformed text, where "Straße" is "STRASSE".
+        let mut para = test_paragraph(&["Straße"]);
+        para.children_mut()[0].text_transform = Some(TextTransform::Uppercase);
+
+        assert_eq!(para.char_offset_to_utf16(4), 4);
+        assert_eq!(para.char_offset_to_utf16(6), 7);
+        assert_eq!(para.char_utf16_len_at(4), 2);
+        assert_eq!(para.utf16_offset_to_char(7), 6);
+    }
+
+    #[test]
+    fn char_utf16_len_at_covers_the_whole_glyph() {
+        let para = test_paragraph(&["a😀b"]);
+        assert_eq!(para.char_utf16_len_at(0), 1);
+        assert_eq!(para.char_utf16_len_at(1), 2);
+        assert_eq!(para.char_utf16_len_at(2), 1);
+    }
 }
diff --git a/render-wasm/src/state.rs b/render-wasm/src/state.rs
index 136f5b52ba..849d35131b 100644
--- a/render-wasm/src/state.rs
+++ b/render-wasm/src/state.rs
@@ -10,6 +10,7 @@ pub use ui::RulerState;
 pub use ui::UIState;
 
 use crate::error::{Error, Result};
+use crate::render::raster::RasterFormat;
 use crate::render::FrameType;
 use crate::shapes::{grid_layout::grid_cell_data, FontFamily, Shape};
 use crate::uuid::Uuid;
@@ -68,6 +69,10 @@ impl State {
         get_render_state().render_from_cache(&self.shapes);
     }
 
+    pub fn present_frame(&mut self) {
+        get_render_state().present_frame(&self.shapes);
+    }
+
     pub fn render_ui_only(&mut self) {
         get_render_state().render_ui_only(&self.shapes);
     }
@@ -91,18 +96,24 @@ impl State {
         id: &Uuid,
         scale: f32,
         timestamp: i32,
+        format: RasterFormat,
     ) -> Result<(Vec<u8>, i32, i32)> {
-        get_render_state().render_shape_pixels(id, &self.shapes, scale, timestamp)
+        get_render_state().render_shape_pixels(id, &self.shapes, scale, timestamp, format)
     }
 
     pub fn render_shape_pdf(&mut self, id: &Uuid, scale: f32) -> Result<Vec<u8>> {
         crate::render::pdf::render_to_pdf(get_resources(), id, &self.shapes, scale)
     }
 
-    /// GPU-free counterpart of [`State::render_shape_pixels`]: PNG on a CPU
-    /// raster surface, no GPU/WebGL.
-    pub fn render_shape_raster(&mut self, id: &Uuid, scale: f32) -> Result<(Vec<u8>, i32, i32)> {
-        crate::render::raster::render_to_raster(get_resources(), id, &self.shapes, scale)
+    /// GPU-free counterpart of [`State::render_shape_pixels`]: encodes to
+    /// `format` on a CPU raster surface, no GPU/WebGL.
+    pub fn render_shape_raster(
+        &mut self,
+        id: &Uuid,
+        scale: f32,
+        format: RasterFormat,
+    ) -> Result<(Vec<u8>, i32, i32)> {
+        crate::render::raster::render_to_raster(get_resources(), id, &self.shapes, scale, format)
     }
 
     /// Distinct font families used by the (visible) subtree rooted at `id`, in
diff --git a/render-wasm/src/state/text_editor.rs b/render-wasm/src/state/text_editor.rs
index 3216586998..ecb792f775 100644
--- a/render-wasm/src/state/text_editor.rs
+++ b/render-wasm/src/state/text_editor.rs
@@ -101,7 +101,7 @@ pub enum TextEditorEvent {
 
 /// FIXME: It should be better to get these constants from the frontend through the API.
 const SELECTION_COLOR: Color = Color::from_argb(127, 0, 209, 184);
-const CURSOR_COLOR: Color = Color::BLACK;
+const CURSOR_COLOR: Color = Color::WHITE;
 const CURSOR_WIDTH: f32 = 1.0;
 const CURSOR_BLINK_INTERVAL_MS: f32 = 530.0;
 
@@ -274,6 +274,10 @@ pub struct TextEditorTheme {
     pub selection_color: Color,
     pub cursor_color: Color,
     pub cursor_width: f32,
+    /// When true the caret is painted with a Difference blend mode, so it shows
+    /// as the inverted color of whatever is behind it. Used as the default when
+    /// the text has no solid fill whose color the caret can match.
+    pub cursor_invert: bool,
 }
 
 pub struct TextComposition {
@@ -364,6 +368,7 @@ impl TextEditorState {
                 selection_color: SELECTION_COLOR,
                 cursor_color: CURSOR_COLOR,
                 cursor_width: CURSOR_WIDTH,
+                cursor_invert: true,
             },
             selection: TextSelection::new(),
             composition: TextComposition::new(),
@@ -380,11 +385,15 @@ impl TextEditorState {
     }
 
     pub fn focus(&mut self, shape_id: Uuid) {
+        let same_shape = self.active_shape_id == Some(shape_id);
+
         self.has_focus = true;
         self.active_shape_id = Some(shape_id);
         self.cursor_visible = true;
         self.last_blink_time_ms = 0.0;
-        self.selection.reset();
+        if !same_shape {
+            self.selection.reset();
+        }
         self.is_pointer_selection_active = false;
         self.is_overtype_mode = false;
         self.pending_events.clear();
@@ -431,17 +440,15 @@ impl TextEditorState {
     pub fn select_all(&mut self, text_content: &TextContent) -> bool {
         self.is_pointer_selection_active = false;
         self.set_caret_from_position(&TextPositionWithAffinity::empty());
-        let num_paragraphs = text_content.paragraphs().len() - 1;
+        let num_paragraphs = text_content.paragraphs().len().saturating_sub(1);
         let Some(last_paragraph) = text_content.paragraphs().last() else {
             return false;
         };
         let Some(_last_text_span) = last_paragraph.children().last() else {
             return false;
         };
-        let mut offset = 0;
-        for span in last_paragraph.children() {
-            offset += span.text.len();
-        }
+        // Offsets are counted in characters, not bytes.
+        let offset = text_helpers::paragraph_char_count(last_paragraph);
         self.extend_selection_from_position(&TextPositionWithAffinity::new(
             PositionWithAffinity {
                 position: offset as i32,
@@ -535,11 +542,17 @@ impl TextEditorState {
 
     pub fn set_caret_from_position(&mut self, position: &TextPositionWithAffinity) {
         self.selection.set_caret(*position);
+        // Restart the blink so the caret is solid right after it is placed,
+        // instead of keeping whatever phase it had (which can toggle off at the
+        // moment of the click and read as a flash). Mirrors the keyboard paths
+        // (`move_cursor`, `select_all`) which already reset the blink.
+        self.reset_blink();
         self.push_event(TextEditorEvent::SelectionChanged);
     }
 
     pub fn extend_selection_from_position(&mut self, position: &TextPositionWithAffinity) {
         self.selection.extend_to(*position);
+        self.reset_blink();
         self.push_event(TextEditorEvent::SelectionChanged);
     }
 
diff --git a/render-wasm/src/wasm/fills.rs b/render-wasm/src/wasm/fills.rs
index 2e652b11b1..c0a8d6850d 100644
--- a/render-wasm/src/wasm/fills.rs
+++ b/render-wasm/src/wasm/fills.rs
@@ -48,15 +48,15 @@ impl TryFrom<&shapes::Fill> for RawFillData {
                         | (color.b() as u32),
                 }))
             }
-            shapes::Fill::LinearGradient(_) => {
-                Err("LinearGradient serialization is not implemented".to_string())
-            }
-            shapes::Fill::RadialGradient(_) => {
-                Err("RadialGradient serialization is not implemented".to_string())
-            }
-            shapes::Fill::Image(_) => {
-                Err("Image fill serialization is not implemented".to_string())
-            }
+            shapes::Fill::LinearGradient(linear_gradient) => Ok(RawFillData::Linear(
+                gradient::RawGradientData::from(linear_gradient),
+            )),
+            shapes::Fill::RadialGradient(radial_gradient) => Ok(RawFillData::Radial(
+                gradient::RawGradientData::from(radial_gradient),
+            )),
+            shapes::Fill::Image(image_fill) => Ok(RawFillData::Image(
+                image::RawImageFillData::from(image_fill),
+            )),
         }
     }
 }
@@ -155,4 +155,36 @@ mod tests {
             RawFillData::Solid(solid::RawSolidData { color: 0xfffabada })
         );
     }
+
+    #[test]
+    fn test_gradient_fill_round_trip() {
+        let gradient = shapes::Gradient::new(
+            (0.0, 0.5),
+            (1.0, 0.5),
+            0x80,
+            0.25,
+            &[
+                (shapes::Color::from(0xfffabada), 0.0),
+                (shapes::Color::from(0xff00ff00), 1.0),
+            ],
+        );
+
+        let fill = shapes::Fill::LinearGradient(gradient.clone());
+        let raw_fill = RawFillData::try_from(&fill).expect("gradient must be serializable");
+        let bytes = <[u8; RAW_FILL_DATA_SIZE]>::from(raw_fill);
+
+        assert_eq!(bytes[0], 0x01);
+        assert_eq!(shapes::Fill::from(RawFillData::from(bytes)), fill);
+    }
+
+    #[test]
+    fn test_image_fill_round_trip() {
+        let image_fill = shapes::ImageFill::new(crate::uuid::Uuid::nil(), 0x80, 300, 200, true);
+        let fill = shapes::Fill::Image(image_fill);
+        let raw_fill = RawFillData::try_from(&fill).expect("image fill must be serializable");
+        let bytes = <[u8; RAW_FILL_DATA_SIZE]>::from(raw_fill);
+
+        assert_eq!(bytes[0], 0x03);
+        assert_eq!(shapes::Fill::from(RawFillData::from(bytes)), fill);
+    }
 }
diff --git a/render-wasm/src/wasm/fills/gradient.rs b/render-wasm/src/wasm/fills/gradient.rs
index c656cf197e..f36bcd70eb 100644
--- a/render-wasm/src/wasm/fills/gradient.rs
+++ b/render-wasm/src/wasm/fills/gradient.rs
@@ -44,6 +44,41 @@ impl RawStopData {
     }
 }
 
+impl From<&Gradient> for RawGradientData {
+    fn from(gradient: &Gradient) -> Self {
+        let mut stops = [RawStopData {
+            color: 0,
+            offset: 0.0,
+        }; MAX_GRADIENT_STOPS];
+
+        let mut stop_count: u8 = 0;
+        for (index, (color, offset)) in gradient.stops().take(MAX_GRADIENT_STOPS).enumerate() {
+            stops[index] = RawStopData {
+                color: ((color.a() as u32) << 24)
+                    | ((color.r() as u32) << 16)
+                    | ((color.g() as u32) << 8)
+                    | (color.b() as u32),
+                offset,
+            };
+            stop_count += 1;
+        }
+
+        let (start_x, start_y) = gradient.start();
+        let (end_x, end_y) = gradient.end();
+
+        RawGradientData {
+            start_x,
+            start_y,
+            end_x,
+            end_y,
+            opacity: gradient.opacity(),
+            width: gradient.width(),
+            stop_count,
+            stops,
+        }
+    }
+}
+
 impl From<RawGradientData> for Gradient {
     fn from(raw_gradient: RawGradientData) -> Self {
         let stops = raw_gradient
diff --git a/render-wasm/src/wasm/fills/image.rs b/render-wasm/src/wasm/fills/image.rs
index 778b80bf92..ce14511220 100644
--- a/render-wasm/src/wasm/fills/image.rs
+++ b/render-wasm/src/wasm/fills/image.rs
@@ -48,6 +48,29 @@ pub struct RawImageFillData {
     height: i32,
 }
 
+impl From<&ImageFill> for RawImageFillData {
+    fn from(image_fill: &ImageFill) -> Self {
+        let id = image_fill.id();
+        let (a, b, c, d) = crate::utils::uuid_to_u32_quartet(&id);
+        let flags = if image_fill.keep_aspect_ratio() {
+            FLAG_KEEP_ASPECT_RATIO
+        } else {
+            0
+        };
+
+        Self {
+            a,
+            b,
+            c,
+            d,
+            opacity: image_fill.opacity(),
+            flags,
+            width: image_fill.width(),
+            height: image_fill.height(),
+        }
+    }
+}
+
 impl From<RawImageFillData> for ImageFill {
     fn from(value: RawImageFillData) -> Self {
         let id = uuid_from_u32_quartet(value.a, value.b, value.c, value.d);
diff --git a/render-wasm/src/wasm/layouts/constraints.rs b/render-wasm/src/wasm/layouts/constraints.rs
index 8760ed5592..5e87e61f70 100644
--- a/render-wasm/src/wasm/layouts/constraints.rs
+++ b/render-wasm/src/wasm/layouts/constraints.rs
@@ -7,11 +7,12 @@ use crate::with_current_shape_mut;
 #[repr(u8)]
 #[allow(dead_code)]
 pub enum RawConstraintH {
-    Left = 0,
-    Right = 1,
-    Leftright = 2, // odd casing to comply with cljs value
-    Center = 3,
-    Scale = 4,
+    None = 0,
+    Left = 1,
+    Right = 2,
+    Leftright = 3, // odd casing to comply with cljs value
+    Center = 4,
+    Scale = 5,
 }
 
 impl From<u8> for RawConstraintH {
@@ -20,14 +21,15 @@ impl From<u8> for RawConstraintH {
     }
 }
 
-impl From<RawConstraintH> for ConstraintH {
+impl From<RawConstraintH> for Option<ConstraintH> {
     fn from(value: RawConstraintH) -> Self {
         match value {
-            RawConstraintH::Left => ConstraintH::Left,
-            RawConstraintH::Right => ConstraintH::Right,
-            RawConstraintH::Leftright => ConstraintH::LeftRight,
-            RawConstraintH::Center => ConstraintH::Center,
-            RawConstraintH::Scale => ConstraintH::Scale,
+            RawConstraintH::None => None,
+            RawConstraintH::Left => Some(ConstraintH::Left),
+            RawConstraintH::Right => Some(ConstraintH::Right),
+            RawConstraintH::Leftright => Some(ConstraintH::LeftRight),
+            RawConstraintH::Center => Some(ConstraintH::Center),
+            RawConstraintH::Scale => Some(ConstraintH::Scale),
         }
     }
 }
@@ -36,11 +38,12 @@ impl From<RawConstraintH> for ConstraintH {
 #[repr(u8)]
 #[allow(dead_code)]
 pub enum RawConstraintV {
-    Top = 0,
-    Bottom = 1,
-    Topbottom = 2, // odd casing to comply with cljs value
-    Center = 3,
-    Scale = 4,
+    None = 0,
+    Top = 1,
+    Bottom = 2,
+    Topbottom = 3, // odd casing to comply with cljs value
+    Center = 4,
+    Scale = 5,
 }
 
 impl From<u8> for RawConstraintV {
@@ -49,14 +52,15 @@ impl From<u8> for RawConstraintV {
     }
 }
 
-impl From<RawConstraintV> for ConstraintV {
+impl From<RawConstraintV> for Option<ConstraintV> {
     fn from(value: RawConstraintV) -> Self {
         match value {
-            RawConstraintV::Top => ConstraintV::Top,
-            RawConstraintV::Bottom => ConstraintV::Bottom,
-            RawConstraintV::Topbottom => ConstraintV::TopBottom,
-            RawConstraintV::Center => ConstraintV::Center,
-            RawConstraintV::Scale => ConstraintV::Scale,
+            RawConstraintV::None => None,
+            RawConstraintV::Top => Some(ConstraintV::Top),
+            RawConstraintV::Bottom => Some(ConstraintV::Bottom),
+            RawConstraintV::Topbottom => Some(ConstraintV::TopBottom),
+            RawConstraintV::Center => Some(ConstraintV::Center),
+            RawConstraintV::Scale => Some(ConstraintV::Scale),
         }
     }
 }
@@ -64,16 +68,16 @@ impl From<RawConstraintV> for ConstraintV {
 #[no_mangle]
 pub extern "C" fn set_shape_constraint_h(constraint: u8) {
     with_current_shape_mut!(state, |shape: &mut Shape| {
-        let constraint = RawConstraintH::from(constraint);
-        shape.set_constraint_h(Some(constraint.into()));
+        let constraint: Option<ConstraintH> = RawConstraintH::from(constraint).into();
+        shape.set_constraint_h(constraint);
     });
 }
 
 #[no_mangle]
 pub extern "C" fn set_shape_constraint_v(constraint: u8) {
     with_current_shape_mut!(state, |shape: &mut Shape| {
-        let constraint = RawConstraintV::from(constraint);
-        shape.set_constraint_v(Some(constraint.into()));
+        let constraint: Option<ConstraintV> = RawConstraintV::from(constraint).into();
+        shape.set_constraint_v(constraint);
     });
 }
 
diff --git a/render-wasm/src/wasm/shapes/base_props.rs b/render-wasm/src/wasm/shapes/base_props.rs
index e9b6a6e7b0..ab204a1f44 100644
--- a/render-wasm/src/wasm/shapes/base_props.rs
+++ b/render-wasm/src/wasm/shapes/base_props.rs
@@ -14,7 +14,6 @@ use super::RawShapeType;
 
 const FLAG_CLIP_CONTENT: u8 = 0b0000_0001;
 const FLAG_HIDDEN: u8 = 0b0000_0010;
-const CONSTRAINT_NONE: u8 = 0xFF;
 
 const RAW_BASE_PROPS_SIZE: usize = std::mem::size_of::<RawBasePropsData>();
 
@@ -87,19 +86,11 @@ impl RawBasePropsData {
     }
 
     fn constraint_h(&self) -> Option<ConstraintH> {
-        if self.constraint_h == CONSTRAINT_NONE {
-            None
-        } else {
-            Some(RawConstraintH::from(self.constraint_h).into())
-        }
+        RawConstraintH::from(self.constraint_h).into()
     }
 
     fn constraint_v(&self) -> Option<ConstraintV> {
-        if self.constraint_v == CONSTRAINT_NONE {
-            None
-        } else {
-            Some(RawConstraintV::from(self.constraint_v).into())
-        }
+        RawConstraintV::from(self.constraint_v).into()
     }
 }
 
@@ -219,10 +210,10 @@ mod tests {
         bytes[33] = FLAG_CLIP_CONTENT | FLAG_HIDDEN;
         // blend_mode = Overlay (15)
         bytes[34] = 15;
-        // constraint_h = Center (3)
-        bytes[35] = 3;
-        // constraint_v = Scale (4)
-        bytes[36] = 4;
+        // constraint_h = Center (4)
+        bytes[35] = 4;
+        // constraint_v = Scale (5)
+        bytes[36] = 5;
         // opacity
         bytes[40..44].copy_from_slice(&0.5_f32.to_le_bytes());
         // rotation
diff --git a/render-wasm/src/wasm/strokes.rs b/render-wasm/src/wasm/strokes.rs
index 1c14ac1077..647510ff0b 100644
--- a/render-wasm/src/wasm/strokes.rs
+++ b/render-wasm/src/wasm/strokes.rs
@@ -154,6 +154,15 @@ pub extern "C" fn add_shape_outer_stroke(
     });
 }
 
+#[no_mangle]
+pub extern "C" fn set_shape_stroke_sides(top: f32, right: f32, bottom: f32, left: f32) {
+    with_current_shape_mut!(state, |shape: &mut Shape| {
+        shape
+            .set_last_stroke_widths([top, right, bottom, left])
+            .expect("could not set stroke side widths");
+    });
+}
+
 #[no_mangle]
 pub extern "C" fn add_shape_stroke_fill() {
     with_current_shape_mut!(state, |shape: &mut Shape| {
diff --git a/render-wasm/src/wasm/text/helpers.rs b/render-wasm/src/wasm/text/helpers.rs
index 67044b4788..fedfdba215 100644
--- a/render-wasm/src/wasm/text/helpers.rs
+++ b/render-wasm/src/wasm/text/helpers.rs
@@ -195,6 +195,10 @@ pub fn move_cursor_up(
     _text_content: &TextContent,
 ) -> TextPositionWithAffinity {
     // TODO: Implement proper line-based navigation using line metrics
+    if paragraphs.is_empty() || cursor.paragraph >= paragraphs.len() {
+        return *cursor;
+    }
+
     if cursor.paragraph > 0 {
         let prev_para = cursor.paragraph - 1;
         let char_count = paragraph_char_count(&paragraphs[prev_para]);
@@ -212,6 +216,10 @@ pub fn move_cursor_down(
     _text_content: &TextContent,
 ) -> TextPositionWithAffinity {
     // TODO: Implement proper line-based navigation using line metrics
+    if paragraphs.is_empty() || cursor.paragraph >= paragraphs.len() {
+        return *cursor;
+    }
+
     if cursor.paragraph < paragraphs.len() - 1 {
         let next_para = cursor.paragraph + 1;
         let char_count = paragraph_char_count(&paragraphs[next_para]);
@@ -451,11 +459,13 @@ pub fn delete_selection_range(text_content: &mut TextContent, selection: &TextSe
     let end = selection.end();
 
     let paragraphs = text_content.paragraphs_mut();
-    if start.paragraph >= paragraphs.len() {
+    if paragraphs.is_empty() || start.paragraph >= paragraphs.len() {
         return;
     }
 
-    if start.paragraph == end.paragraph {
+    let end_paragraph = end.paragraph.min(paragraphs.len() - 1);
+
+    if start.paragraph == end_paragraph {
         delete_range_in_paragraph(&mut paragraphs[start.paragraph], start.offset, end.offset);
     } else {
         let start_para_len = paragraph_char_count(&paragraphs[start.paragraph]);
@@ -465,19 +475,15 @@ pub fn delete_selection_range(text_content: &mut TextContent, selection: &TextSe
             start_para_len,
         );
 
-        delete_range_in_paragraph(&mut paragraphs[end.paragraph], 0, end.offset);
+        delete_range_in_paragraph(&mut paragraphs[end_paragraph], 0, end.offset);
 
-        if end.paragraph < paragraphs.len() {
-            let end_para_children: Vec<_> =
-                paragraphs[end.paragraph].children_mut().drain(..).collect();
-            paragraphs[start.paragraph]
-                .children_mut()
-                .extend(end_para_children);
-        }
+        let end_para_children: Vec<_> =
+            paragraphs[end_paragraph].children_mut().drain(..).collect();
+        paragraphs[start.paragraph]
+            .children_mut()
+            .extend(end_para_children);
 
-        if end.paragraph < paragraphs.len() {
-            paragraphs.drain((start.paragraph + 1)..=end.paragraph);
-        }
+        paragraphs.drain((start.paragraph + 1)..=end_paragraph);
 
         let children = paragraphs[start.paragraph].children_mut();
         let has_content = children.iter().any(|span| !span.text.is_empty());
@@ -491,6 +497,11 @@ pub fn delete_selection_range(text_content: &mut TextContent, selection: &TextSe
 
 /// Delete a range of characters within a single paragraph.
 pub fn delete_range_in_paragraph(para: &mut Paragraph, start_offset: usize, end_offset: usize) {
+    // An out of bounds offset must not skip the deletion.
+    let para_len = paragraph_char_count(para);
+    let start_offset = start_offset.min(para_len);
+    let end_offset = end_offset.min(para_len);
+
     if start_offset >= end_offset {
         return;
     }
@@ -840,3 +851,124 @@ pub fn split_paragraph_at_cursor(
 
     true
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::math::Rect;
+    use crate::shapes::{FontFamily, FontStyle, GrowType, TextAlign, TextSpan};
+    use crate::uuid::Uuid;
+
+    fn span(text: &str) -> TextSpan {
+        TextSpan::new(
+            text.to_string(),
+            FontFamily::new(Uuid::nil(), 400, FontStyle::Normal),
+            14.0,
+            1.2,
+            0.0,
+            None,
+            None,
+            TextDirection::LTR,
+            400,
+            Uuid::nil(),
+            vec![],
+        )
+    }
+
+    fn paragraph(texts: &[&str]) -> Paragraph {
+        Paragraph::new(
+            TextAlign::Left,
+            TextDirection::LTR,
+            None,
+            None,
+            1.2,
+            0.0,
+            texts.iter().copied().map(span).collect(),
+        )
+    }
+
+    fn content(paragraphs: Vec<Paragraph>) -> TextContent {
+        let mut content =
+            TextContent::new(Rect::from_xywh(0.0, 0.0, 100.0, 100.0), GrowType::Fixed);
+        for para in paragraphs {
+            content.add_paragraph(para);
+        }
+        content
+    }
+
+    fn text_of(content: &TextContent) -> String {
+        content
+            .paragraphs()
+            .iter()
+            .map(|para| {
+                para.children()
+                    .iter()
+                    .map(|span| span.text.as_str())
+                    .collect::<String>()
+            })
+            .collect::<Vec<_>>()
+            .join("\n")
+    }
+
+    fn selection(start: (usize, usize), end: (usize, usize)) -> TextSelection {
+        TextSelection {
+            anchor: TextPositionWithAffinity::new_without_affinity(start.0, start.1),
+            focus: TextPositionWithAffinity::new_without_affinity(end.0, end.1),
+        }
+    }
+
+    #[test]
+    fn delete_selection_range_deletes_a_whole_multibyte_paragraph() {
+        let mut content = content(vec![paragraph(&["Añadir"])]);
+        delete_selection_range(&mut content, &selection((0, 0), (0, 6)));
+        assert_eq!(text_of(&content), "");
+    }
+
+    #[test]
+    fn delete_range_in_paragraph_clamps_an_overshooting_end_offset() {
+        let mut para = paragraph(&["Añadir"]);
+        delete_range_in_paragraph(&mut para, 0, 7);
+        assert_eq!(para.children().len(), 1);
+        assert_eq!(para.children()[0].text, "");
+    }
+
+    #[test]
+    fn delete_selection_range_deletes_emoji() {
+        let mut content = content(vec![paragraph(&["Hi 😀"])]);
+        delete_selection_range(&mut content, &selection((0, 0), (0, 4)));
+        assert_eq!(text_of(&content), "");
+    }
+
+    #[test]
+    fn delete_selection_range_never_splits_an_emoji() {
+        let mut content = content(vec![paragraph(&["a😀b"])]);
+        delete_selection_range(&mut content, &selection((0, 1), (0, 2)));
+        assert_eq!(text_of(&content), "ab");
+    }
+
+    #[test]
+    fn delete_selection_range_spanning_several_spans() {
+        let mut content = content(vec![paragraph(&["Añ", "adir"])]);
+        delete_selection_range(&mut content, &selection((0, 1), (0, 4)));
+        assert_eq!(text_of(&content), "Air");
+    }
+
+    #[test]
+    fn delete_selection_range_across_paragraphs() {
+        let mut content = content(vec![
+            paragraph(&["Añadir"]),
+            paragraph(&["Más"]),
+            paragraph(&["Fin"]),
+        ]);
+        delete_selection_range(&mut content, &selection((0, 0), (2, 3)));
+        assert_eq!(content.paragraphs().len(), 1);
+        assert_eq!(text_of(&content), "");
+    }
+
+    #[test]
+    fn delete_selection_range_clamps_an_out_of_range_focus() {
+        let mut content = content(vec![paragraph(&["Añadir"])]);
+        delete_selection_range(&mut content, &selection((0, 0), (5, 99)));
+        assert_eq!(text_of(&content), "");
+    }
+}
diff --git a/render-wasm/src/wasm/text_editor.rs b/render-wasm/src/wasm/text_editor.rs
index 1ee391b40b..7f0e75465f 100644
--- a/render-wasm/src/wasm/text_editor.rs
+++ b/render-wasm/src/wasm/text_editor.rs
@@ -6,9 +6,10 @@ use crate::mem;
 use crate::render::text_editor as text_editor_render;
 use crate::render::SurfaceId;
 use crate::shapes::{Shape, TextAlign, TextContent, TextPositionWithAffinity, Type, VerticalAlign};
-use crate::state::{TextEditorEvent, TextSelection};
+use crate::state::{State, TextEditorEvent, TextSelection};
 use crate::utils::uuid_from_u32_quartet;
 use crate::utils::uuid_to_u32_quartet;
+use crate::uuid::Uuid;
 use crate::wasm::fills::RawFillData;
 use crate::wasm::text::{
     helpers as text_helpers, RawTextAlign, RawTextDecoration, RawTextDirection, RawTextTransform,
@@ -32,12 +33,17 @@ pub enum CursorDirection {
 // STATE MANAGEMENT
 // ============================================================================
 
+/// Apply the editor theme. When `invert` is true the caret is painted with a
+/// Difference blend mode (pass white as `cursor_color` to always show the
+/// inverted color of the background); otherwise it is painted with the given
+/// solid `cursor_color`.
 #[no_mangle]
-pub extern "C" fn text_editor_apply_theme(selection_color: u32, cursor_color: u32) {
+pub extern "C" fn text_editor_apply_theme(selection_color: u32, cursor_color: u32, invert: bool) {
     // NOTE: In the future could be interesting to fill al this data from
     // a structure pointer.
     get_text_editor_state().theme.selection_color = Color::new(selection_color);
     get_text_editor_state().theme.cursor_color = Color::new(cursor_color);
+    get_text_editor_state().theme.cursor_invert = invert;
 }
 
 #[no_mangle]
@@ -186,6 +192,35 @@ pub extern "C" fn text_editor_pointer_down(x: f32, y: f32) {
     });
 }
 
+/// Like `text_editor_pointer_down`, but keeps the current anchor and moves the
+/// focus to the pointer instead of collapsing the caret there (Shift+click).
+#[no_mangle]
+pub extern "C" fn text_editor_pointer_down_extend(x: f32, y: f32) {
+    with_state!(state, {
+        if !get_text_editor_state().has_focus {
+            return;
+        }
+        let Some(shape_id) = get_text_editor_state().active_shape_id else {
+            return;
+        };
+        let Some(shape) = state.shapes.get(&shape_id) else {
+            return;
+        };
+        let Type::Text(text_content) = &shape.shape_type else {
+            return;
+        };
+        let point = Point::new(x, y);
+        get_text_editor_state().start_pointer_selection();
+        if let Some(position) = text_content.get_caret_position_from_shape_coords(&point) {
+            get_text_editor_state().extend_selection_from_position(&position);
+            // The click after pointerup would collapse the caret and drop the
+            // selection we just extended.
+            get_text_editor_state().is_click_event_skipped = true;
+            get_text_editor_state().update_styles(text_content);
+        }
+    });
+}
+
 #[no_mangle]
 pub extern "C" fn text_editor_pointer_move(x: f32, y: f32) {
     with_state!(state, {
@@ -849,6 +884,63 @@ pub extern "C" fn text_editor_update_blink(timestamp_ms: f32) {
     get_text_editor_state().update_blink(timestamp_ms);
 }
 
+/// Refresh a text shape's layout if the editor marked it dirty, so the
+/// caret/selection overlay is measured against up-to-date glyph geometry.
+fn update_text_layout_if_needed(state: &mut State, shape_id: Uuid) {
+    let Some(shape) = state.shapes.get_mut(&shape_id) else {
+        return;
+    };
+
+    let selrect = shape.selrect();
+
+    let Type::Text(text_content) = &mut shape.shape_type else {
+        return;
+    };
+
+    if text_content.needs_update_layout() {
+        text_content.update_layout(selrect);
+    }
+}
+
+/// Repaint the caret/selection over the last fully rendered frame.
+///
+/// Re-composes Target from the Backbuffer (which still holds the last complete
+/// render) and draws the editor overlay on top, in a single submitted frame.
+///
+/// This exists because the caret blink must erase the previous caret, which
+/// means restoring the pixels underneath it. Doing that via `render_from_cache`
+/// rebuilds the frame from the document atlas, and that atlas is capped at
+/// scale <= 1.0 — on a zoomed-in view it gets blitted heavily upscaled, so the
+/// blink alternates between the crisp render and a softer approximation, which
+/// reads as a flash. Reusing the Backbuffer is pixel-identical at any zoom.
+#[no_mangle]
+pub extern "C" fn text_editor_render_caret() {
+    with_state!(state, {
+        let Some(shape_id) = get_text_editor_state().active_shape_id else {
+            return;
+        };
+
+        update_text_layout_if_needed(state, shape_id);
+
+        let Some(shape) = state.shapes.get(&shape_id) else {
+            return;
+        };
+
+        get_render_state().compose_frame(&state.shapes);
+
+        let canvas = get_render_state().surfaces.canvas(SurfaceId::Target);
+        let viewbox = get_render_state().viewbox;
+        text_editor_render::render_overlay(
+            canvas,
+            &viewbox,
+            &get_render_state().options,
+            get_text_editor_state(),
+            shape,
+        );
+        get_render_state().flush_and_submit();
+    });
+}
+
 #[no_mangle]
 pub extern "C" fn text_editor_render_overlay() {
     with_state!(state, {
@@ -856,18 +948,7 @@ pub extern "C" fn text_editor_render_overlay() {
             return;
         };
 
-        if let Some(shape) = state.shapes.get(&shape_id) {
-            if let Type::Text(text_content) = &shape.shape_type {
-                if text_content.needs_update_layout() {
-                    let selrect = shape.selrect();
-                    if let Some(shape) = state.shapes.get_mut(&shape_id) {
-                        if let Type::Text(text_content) = &mut shape.shape_type {
-                            text_content.update_layout(selrect);
-                        }
-                    }
-                }
-            }
-        }
+        update_text_layout_if_needed(state, shape_id);
 
         let Some(shape) = state.shapes.get(&shape_id) else {
             return;
@@ -1008,17 +1089,40 @@ pub extern "C" fn text_editor_export_selection() -> *mut u8 {
 
 #[no_mangle]
 pub extern "C" fn text_editor_get_selection(buffer_ptr: *mut u32) -> bool {
-    if !get_text_editor_state().selection.is_selection() {
-        return false;
-    }
-    let sel = &get_text_editor_state().selection;
-    unsafe {
-        *buffer_ptr = sel.anchor.paragraph as u32;
-        *buffer_ptr.add(1) = sel.anchor.offset as u32;
-        *buffer_ptr.add(2) = sel.focus.paragraph as u32;
-        *buffer_ptr.add(3) = sel.focus.offset as u32;
-    }
-    true
+    with_state!(state, {
+        if get_text_editor_state().active_shape_id.is_none() {
+            return false;
+        }
+
+        let sel = get_text_editor_state().selection;
+
+        // The frontend indexes these offsets into JS strings, which are UTF-16.
+        let (anchor_offset, focus_offset) = match get_text_editor_state()
+            .active_shape_id
+            .and_then(|shape_id| state.shapes.get(&shape_id))
+            .map(|shape| &shape.shape_type)
+        {
+            Some(Type::Text(text_content)) => {
+                let paragraphs = text_content.paragraphs();
+                let to_utf16 = |position: TextPositionWithAffinity| {
+                    paragraphs
+                        .get(position.paragraph)
+                        .map(|para| para.char_offset_to_utf16(position.offset))
+                        .unwrap_or(position.offset)
+                };
+                (to_utf16(sel.anchor), to_utf16(sel.focus))
+            }
+            _ => (sel.anchor.offset, sel.focus.offset),
+        };
+
+        unsafe {
+            *buffer_ptr = sel.anchor.paragraph as u32;
+            *buffer_ptr.add(1) = anchor_offset as u32;
+            *buffer_ptr.add(2) = sel.focus.paragraph as u32;
+            *buffer_ptr.add(3) = focus_offset as u32;
+        }
+        true
+    })
 }
 
 // ============================================================================
@@ -1047,11 +1151,11 @@ fn get_cursor_rect(
     let mut y_offset = valign_offset;
     for (idx, laid_out_para) in layout_paragraphs.iter().enumerate() {
         if idx == cursor.paragraph {
-            let char_pos = cursor.offset;
+            let utf16_pos = paragraphs[cursor.paragraph].char_offset_to_utf16(cursor.offset);
 
             use skia_safe::textlayout::{RectHeightStyle, RectWidthStyle};
             let rects = laid_out_para.get_rects_for_range(
-                char_pos..char_pos,
+                utf16_pos..utf16_pos,
                 RectHeightStyle::Tight,
                 RectWidthStyle::Tight,
             );
@@ -1135,7 +1239,7 @@ fn get_selection_rects(
         if range_start < range_end {
             use skia_safe::textlayout::{RectHeightStyle, RectWidthStyle};
             let text_boxes = laid_out_para.get_rects_for_range(
-                range_start..range_end,
+                para.char_offset_to_utf16(range_start)..para.char_offset_to_utf16(range_end),
                 RectHeightStyle::Tight,
                 RectWidthStyle::Tight,
             );
diff --git a/render-wasm/test b/render-wasm/test
index f416e6c6bb..8019b1fecd 100755
--- a/render-wasm/test
+++ b/render-wasm/test
@@ -7,7 +7,7 @@ export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;
 
-. ./_build_env
+. ./_build_env frontend
 
 cargo test --bin render_wasm -- --show-output
 
diff --git a/render-wasm/watch b/render-wasm/watch
index 90c08c9ffd..1825bf7667 100755
--- a/render-wasm/watch
+++ b/render-wasm/watch
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Usage: ./watch [frontend|export]
+
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;
 
@@ -7,8 +9,7 @@ pushd $_SCRIPT_DIR;
 
 set -x
 build;
-copy_artifacts "../frontend/resources/public/js";
-copy_shared_artifact;
+copy_target_artifacts;
 
 pushd $_SCRIPT_DIR;
 
@@ -16,7 +17,7 @@ cargo watch \
       --why \
       -i "_tmp*" \
       -x "build $CARGO_PARAMS" \
-      -s "./build" \
+      -s "./build $RENDER_TARGET" \
       -s "echo 'DONE\n'";
 
 popd
diff --git a/scripts/ci b/scripts/ci
new file mode 100755
index 0000000000..026bdb7d02
--- /dev/null
+++ b/scripts/ci
@@ -0,0 +1,499 @@
+#!/usr/bin/env bash
+# scripts/ci - CI orchestration script for Penpot monorepo
+
+set -euo pipefail
+
+# Constants
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+LOG_DIR="$PROJECT_ROOT/.ci-logs"
+
+# Color codes
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+# Available modules
+ALL_MODULES=("frontend" "backend" "common" "render-wasm" "exporter" "mcp" "plugins" "library")
+
+# Module commands
+declare -A LINT_CMD=(
+  [frontend]="pnpm run lint:clj && pnpm run lint:js && pnpm run lint:scss"
+  [backend]="pnpm run lint:clj"
+  [common]="pnpm run lint:clj"
+  [render-wasm]="./lint"
+  [exporter]="pnpm run lint"
+  [mcp]=""
+  [plugins]="pnpm run lint"
+  [library]="pnpm run lint"
+)
+
+declare -A TEST_CMD=(
+  [frontend]="pnpm run test:quiet"
+  [backend]="clojure -M:dev:test"
+  [common]="clojure -M:dev:test && pnpm run test:quiet"
+  [render-wasm]="./test"
+  [exporter]=""
+  [mcp]="pnpm run test"
+  [plugins]="pnpm run test"
+  [library]="pnpm run test"
+)
+
+declare -A FMT_CHECK_CMD=(
+  [frontend]="pnpm run check-fmt:clj && pnpm run check-fmt:js && pnpm run check-fmt:scss"
+  [backend]="pnpm run check-fmt"
+  [common]="pnpm run check-fmt:clj && pnpm run check-fmt:js"
+  [render-wasm]="cargo fmt --check"
+  [exporter]="pnpm run check-fmt"
+  [mcp]="pnpm run fmt:check"
+  [plugins]="pnpm run format:check"
+  [library]="pnpm run check-fmt"
+)
+
+declare -A FMT_FIX_CMD=(
+  [frontend]="pnpm run fmt:clj && pnpm run fmt:js && pnpm run fmt:scss"
+  [backend]="pnpm run fmt"
+  [common]="pnpm run fmt:clj && pnpm run fmt:js"
+  [render-wasm]="cargo fmt"
+  [exporter]="pnpm run fmt"
+  [mcp]="pnpm run fmt"
+  [plugins]="pnpm run format"
+  [library]="pnpm run fmt"
+)
+
+declare -A PAREN_REPAIR_CMD=(
+  [frontend]="find src test -name '*.clj' -o -name '*.cljs' -o -name '*.cljc' | xargs $PROJECT_ROOT/scripts/paren-repair"
+  [backend]="find src test -name '*.clj' -o -name '*.cljs' -o -name '*.cljc' | xargs $PROJECT_ROOT/scripts/paren-repair"
+  [common]="find src test -name '*.clj' -o -name '*.cljs' -o -name '*.cljc' | xargs $PROJECT_ROOT/scripts/paren-repair"
+  [render-wasm]=""
+  [exporter]="find src -name '*.clj' -o -name '*.cljs' -o -name '*.cljc' | xargs $PROJECT_ROOT/scripts/paren-repair"
+  [mcp]=""
+  [plugins]=""
+  [library]="find src test -name '*.clj' -o -name '*.cljs' -o -name '*.cljc' | xargs $PROJECT_ROOT/scripts/paren-repair"
+)
+
+# Default options
+MODULES=()
+TASKS=("lint" "test" "fmt")
+FIX_MODE=false
+FAIL_FAST=false
+VERBOSE=true
+DRY_RUN=false
+
+# Results tracking
+declare -A RESULTS=()
+declare -a FAILED_LOGS=()
+
+timestamp() {
+  date "+%H:%M:%S"
+}
+
+log_info() {
+  echo -e "${BLUE}[$(timestamp)]${NC} $1"
+}
+
+log_success() {
+  echo -e "${GREEN}[$(timestamp)] ✓${NC} $1"
+}
+
+log_error() {
+  echo -e "${RED}[$(timestamp)] ✗${NC} $1"
+}
+
+log_warning() {
+  echo -e "${YELLOW}[$(timestamp)] ⚠${NC} $1"
+}
+
+log_header() {
+  local module=$1
+  local current=$2
+  local total=$3
+  echo ""
+  echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+  echo -e "${CYAN} ${BOLD}[$current/$total] $module${NC}"
+  echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+}
+
+run_task() {
+  local module=$1
+  local task=$2
+  local cmd=$3
+  local logfile="$LOG_DIR/${module}-${task}.log"
+
+  if [[ -z "$cmd" ]]; then
+    log_warning "$task: not defined for $module, skipping"
+    RESULTS["$module:$task"]="SKIPPED"
+    return 0
+  fi
+
+  if [[ "$DRY_RUN" == "true" ]]; then
+    log_info "$task: would run '$cmd' in $module/"
+    RESULTS["$module:$task"]="DRY-RUN"
+    return 0
+  fi
+
+  log_info "Running ${BOLD}$task${NC} for $module..."
+
+  mkdir -p "$LOG_DIR"
+  local start_time
+  start_time=$(date +%s)
+
+  if [[ "$VERBOSE" == "true" ]]; then
+    echo -e "${BLUE}  cmd: $cmd${NC}"
+  fi
+
+  local exit_code=0
+  (cd "$PROJECT_ROOT/$module" && eval "$cmd") > "$logfile" 2>&1 || exit_code=$?
+
+  local end_time
+  end_time=$(date +%s)
+  local duration=$((end_time - start_time))
+
+  if [[ $exit_code -eq 0 ]]; then
+    log_success "$task passed for $module ${BLUE}(${duration}s)${NC}"
+    RESULTS["$module:$task"]="PASSED"
+    return 0
+  else
+    log_error "$task failed for $module ${BLUE}(${duration}s)${NC}"
+    echo -e "  ${RED}log: $logfile${NC}"
+    RESULTS["$module:$task"]="FAILED"
+    FAILED_LOGS+=("$logfile")
+    if [[ "$VERBOSE" == "true" ]]; then
+      echo -e "${YELLOW}  --- last 30 lines ---${NC}"
+      tail -n 30 "$logfile" | sed 's/^/  /'
+      echo -e "${YELLOW}  ---------------------${NC}"
+    fi
+    return 1
+  fi
+}
+
+run_module() {
+  local module=$1
+  local failed=false
+
+  for task in "${TASKS[@]}"; do
+    local cmd=""
+    case $task in
+      lint)
+        cmd="${LINT_CMD[$module]:-}"
+        ;;
+      test)
+        cmd="${TEST_CMD[$module]:-}"
+        ;;
+      fmt)
+        if [[ "$FIX_MODE" == "true" ]]; then
+          cmd="${FMT_FIX_CMD[$module]:-}"
+        else
+          cmd="${FMT_CHECK_CMD[$module]:-}"
+        fi
+        ;;
+      paren-repair)
+        cmd="${PAREN_REPAIR_CMD[$module]:-}"
+        ;;
+    esac
+
+    if ! run_task "$module" "$task" "$cmd"; then
+      failed=true
+      if [[ "$FAIL_FAST" == "true" ]]; then
+        return 1
+      fi
+    fi
+  done
+
+  if [[ "$failed" == "true" ]]; then
+    return 1
+  fi
+  return 0
+}
+
+print_summary() {
+  echo ""
+  echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+  echo -e "${CYAN} ${BOLD}SUMMARY${NC}"
+  echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+
+  local total=0
+  local passed=0
+  local failed=0
+  local skipped=0
+
+  for module in "${MODULES[@]}"; do
+    for task in "${TASKS[@]}"; do
+      local result="${RESULTS[$module:$task]:-N/A}"
+      total=$((total + 1))
+      case $result in
+        PASSED)
+          passed=$((passed + 1))
+          echo -e "  ${GREEN}✓${NC} $module:$task"
+          ;;
+        FAILED)
+          failed=$((failed + 1))
+          echo -e "  ${RED}✗${NC} $module:$task"
+          ;;
+        SKIPPED)
+          skipped=$((skipped + 1))
+          echo -e "  ${YELLOW}○${NC} $module:$task"
+          ;;
+        DRY-RUN)
+          echo -e "  ${BLUE}~${NC} $module:$task"
+          ;;
+      esac
+    done
+  done
+
+  echo ""
+  echo -e "  ${BOLD}Total:${NC} $total  ${GREEN}Passed:${NC} $passed  ${RED}Failed:${NC} $failed  ${YELLOW}Skipped:${NC} $skipped"
+
+  if [[ $failed -gt 0 ]]; then
+    echo ""
+    echo -e "  ${RED}${BOLD}Failed logs:${NC}"
+    for logfile in "${FAILED_LOGS[@]}"; do
+      echo -e "    ${RED}•${NC} $logfile"
+    done
+    return 1
+  fi
+  return 0
+}
+
+validate_module() {
+  local mod=$1
+  for valid in "${ALL_MODULES[@]}"; do
+    if [[ "$valid" == "$mod" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+usage() {
+  cat <<EOF
+Usage: $(basename "$0") [OPTIONS] [MODULES...]
+
+CI orchestration script for Penpot monorepo.
+
+MODULES:
+  frontend, backend, common, render-wasm, exporter, mcp, plugins, library
+  Use --all to run all modules.
+
+OPTIONS:
+  --all             Run all modules
+  --exclude MOD     Exclude a module (can be repeated)
+  --lint            Run lint only
+  --no-lint         Skip lint
+  --test            Run tests only
+  --no-test         Skip tests
+  --fmt             Run format check only
+  --no-fmt          Skip format check
+  --fix             Run format fix instead of check
+  --paren-repair    Fix delimiter errors in Clojure/CLJS files
+  --fail-fast       Stop on first failure
+  --verbose         Show command output on failure (default)
+  --quiet           Suppress command output
+  --dry-run         Show what would run without executing
+  --clean           Remove .ci-logs directory
+  --help            Show this help message
+
+EXAMPLES:
+  $(basename "$0") frontend backend          # Run lint, test, fmt on frontend and backend
+  $(basename "$0") --all --no-test           # Run lint and fmt on all modules
+  $(basename "$0") --lint common             # Run only lint on common
+  $(basename "$0") --fix frontend            # Fix formatting in frontend
+  $(basename "$0") --paren-repair frontend   # Fix delimiter errors in frontend
+  $(basename "$0") --paren-repair --all      # Fix delimiter errors in all Clojure modules
+  $(basename "$0") --all --fail-fast --verbose
+EOF
+  exit 0
+}
+
+main() {
+  local exclude_modules=()
+  local run_all=false
+
+  while [[ $# -gt 0 ]]; do
+    case $1 in
+      --all)
+        run_all=true
+        shift
+        ;;
+      --exclude)
+        exclude_modules+=("$2")
+        shift 2
+        ;;
+      --lint)
+        TASKS=("lint")
+        shift
+        ;;
+      --no-lint)
+        TASKS=("${TASKS[@]/lint/}")
+        shift
+        ;;
+      --test)
+        TASKS=("test")
+        shift
+        ;;
+      --no-test)
+        TASKS=("${TASKS[@]/test/}")
+        shift
+        ;;
+      --fmt)
+        TASKS=("fmt")
+        shift
+        ;;
+      --no-fmt)
+        TASKS=("${TASKS[@]/fmt/}")
+        shift
+        ;;
+      --paren-repair)
+        TASKS=("paren-repair")
+        shift
+        ;;
+      --fix)
+        FIX_MODE=true
+        shift
+        ;;
+      --fail-fast)
+        FAIL_FAST=true
+        shift
+        ;;
+      --verbose)
+        VERBOSE=true
+        shift
+        ;;
+      --quiet)
+        VERBOSE=false
+        shift
+        ;;
+      --dry-run)
+        DRY_RUN=true
+        shift
+        ;;
+      --clean)
+        if [[ -d "$LOG_DIR" ]]; then
+          rm -rf "$LOG_DIR"
+          echo "Cleaned $LOG_DIR"
+        else
+          echo "No logs to clean"
+        fi
+        exit 0
+        ;;
+      --help | -h)
+        usage
+        ;;
+      -*)
+        echo -e "${RED}Error: Unknown option $1${NC}" >&2
+        echo "Run '$(basename "$0") --help' for usage." >&2
+        exit 1
+        ;;
+      *)
+        if validate_module "$1"; then
+          MODULES+=("$1")
+        else
+          echo -e "${RED}Error: Unknown module '$1'${NC}" >&2
+          echo "Valid modules: ${ALL_MODULES[*]}" >&2
+          exit 1
+        fi
+        shift
+        ;;
+    esac
+  done
+
+  # Clean empty entries from TASKS after removal
+  TASKS=("${TASKS[@]// /}")
+  TASKS=("${TASKS[@]/#/}")
+  local clean_tasks=()
+  for t in "${TASKS[@]}"; do
+    if [[ -n "$t" ]]; then
+      clean_tasks+=("$t")
+    fi
+  done
+  TASKS=("${clean_tasks[@]}")
+
+  # Set modules
+  if [[ "$run_all" == "true" ]]; then
+    MODULES=("${ALL_MODULES[@]}")
+  fi
+
+  # Apply exclusions
+  if [[ ${#exclude_modules[@]} -gt 0 ]]; then
+    local filtered=()
+    for mod in "${MODULES[@]}"; do
+      local excluded=false
+      for ex in "${exclude_modules[@]}"; do
+        if [[ "$mod" == "$ex" ]]; then
+          excluded=true
+          break
+        fi
+      done
+      if [[ "$excluded" == "false" ]]; then
+        filtered+=("$mod")
+      fi
+    done
+    MODULES=("${filtered[@]}")
+  fi
+
+  # Validate
+  if [[ ${#MODULES[@]} -eq 0 ]]; then
+    echo -e "${RED}Error: No modules specified.${NC}" >&2
+    echo "Use --all or specify modules: ${ALL_MODULES[*]}" >&2
+    exit 1
+  fi
+
+  if [[ ${#TASKS[@]} -eq 0 ]]; then
+    echo -e "${RED}Error: No tasks selected.${NC}" >&2
+    exit 1
+  fi
+
+  # Print configuration
+  echo ""
+  echo -e "${CYAN}${BOLD}Penpot CI Orchestrator${NC}"
+  echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+  echo -e "  ${BOLD}Modules:${NC}  ${MODULES[*]}"
+  echo -e "  ${BOLD}Tasks:${NC}    ${TASKS[*]}"
+  echo -e "  ${BOLD}Fix mode:${NC} $FIX_MODE"
+  echo -e "  ${BOLD}Fail-fast:${NC} $FAIL_FAST"
+  if [[ "$DRY_RUN" == "true" ]]; then
+    echo -e "  ${BOLD}Mode:${NC}     ${YELLOW}DRY RUN${NC}"
+  fi
+  echo ""
+
+  # Run
+  local total_modules=${#MODULES[@]}
+  local current=0
+  local modules_failed=0
+  local start_time
+  start_time=$(date +%s)
+
+  for module in "${MODULES[@]}"; do
+    current=$((current + 1))
+    log_header "$module" "$current" "$total_modules"
+
+    if ! run_module "$module"; then
+      modules_failed=$((modules_failed + 1))
+      if [[ "$FAIL_FAST" == "true" ]]; then
+        log_error "Fail-fast: stopping due to failure in $module"
+        break
+      fi
+    fi
+  done
+
+  local end_time
+  end_time=$(date +%s)
+  local total_duration=$((end_time - start_time))
+
+  print_summary || true
+
+  echo ""
+  echo -e "  ${BOLD}Duration:${NC} ${total_duration}s"
+  echo ""
+
+  if [[ $modules_failed -gt 0 ]]; then
+    exit 1
+  fi
+  exit 0
+}
+
+main "$@"
diff --git a/scripts/error-reports.mjs b/scripts/error-reports.mjs
new file mode 100755
index 0000000000..241c608987
--- /dev/null
+++ b/scripts/error-reports.mjs
@@ -0,0 +1,758 @@
+#!/usr/bin/env node
+import { Command } from "commander";
+import dotenv from "dotenv";
+import { readFileSync, existsSync, createWriteStream } from "fs";
+import path from "path";
+import { createInterface } from "readline";
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+function loadConfig(envPath) {
+  const envFile = envPath || ".env";
+
+  if (existsSync(envFile)) {
+    dotenv.config({ path: envFile });
+  } else if (envPath) {
+    console.error(`Error: .env file not found at ${envPath}`);
+    process.exit(1);
+  }
+
+  const config = {
+    apiUrl: process.env.PENPOT_API_URI,
+    accessToken: process.env.PENPOT_ACCESS_TOKEN
+  };
+
+  if (!config.apiUrl) {
+    console.error("Error: PENPOT_API_URI not set");
+    console.error("\nCreate a .env file with:");
+    console.error("  PENPOT_API_URI=http://localhost:3450");
+    console.error("  PENPOT_ACCESS_TOKEN=<your-token>");
+    process.exit(1);
+  }
+
+  if (!config.accessToken) {
+    console.error("Error: PENPOT_ACCESS_TOKEN not set");
+    console.error("\nCreate a .env file with:");
+    console.error("  PENPOT_API_URI=http://localhost:3450");
+    console.error("  PENPOT_ACCESS_TOKEN=<your-token>");
+    console.error("\nGrant permission to your token:");
+    console.error("  UPDATE access_token SET perms = ARRAY['error-reports:read']::text[]");
+    console.error("  WHERE id = '<token-uuid>';");
+    process.exit(1);
+  }
+
+  return config;
+}
+
+// ============================================================================
+// RPC Client
+// ============================================================================
+
+async function rpcCall(config, method, params = {}) {
+  const url = `${config.apiUrl}/api/main/methods/${method}`;
+
+  let response;
+  try {
+    response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+        "Authorization": `Token ${config.accessToken}`
+      },
+      body: JSON.stringify(params)
+    });
+  } catch (err) {
+    if (err.cause?.code === "ECONNREFUSED") {
+      console.error("Error: Cannot connect to server (connection refused)");
+      console.error("The Penpot backend server is not running or not reachable.");
+      console.error("\nCheck that:");
+      console.error("  1. The backend server is running");
+      console.error("  2. PENPOT_API_URI in .env points to the correct URL");
+      console.error(`  Current URI: ${config.apiUrl}`);
+      process.exit(1);
+    }
+    if (err.cause?.code === "ENOTFOUND") {
+      console.error("Error: Cannot resolve server hostname");
+      console.error(`The hostname in PENPOT_API_URI is not valid: ${config.apiUrl}`);
+      process.exit(1);
+    }
+    throw new Error(`Network error: ${err.message}`);
+  }
+
+  if (!response.ok) {
+    let errorData;
+    try {
+      errorData = await response.json();
+    } catch {
+      errorData = { message: response.statusText };
+    }
+
+    if (response.status === 401) {
+      console.error("Error: Authentication failed (401)");
+      console.error("Your access token may be invalid or expired.");
+      process.exit(1);
+    }
+
+    if (response.status === 403) {
+      console.error("Error: Authorization failed (403)");
+      console.error("Your access token lacks the required permission: error-reports:read");
+      console.error("\nGrant permission:");
+      console.error("  UPDATE access_token SET perms = ARRAY['error-reports:read']::text[]");
+      console.error("  WHERE id = '<token-uuid>';");
+      process.exit(1);
+    }
+
+    if (response.status === 502) {
+      console.error("Error: Server is down (502 Bad Gateway)");
+      console.error("The Penpot backend server is not responding.");
+      console.error("\nCheck that:");
+      console.error("  1. The backend server is running");
+      console.error("  2. PENPOT_API_URI in .env points to the correct URL");
+      console.error(`  Current URI: ${config.apiUrl}`);
+      process.exit(1);
+    }
+
+    if (response.status === 503) {
+      console.error("Error: Service unavailable (503)");
+      console.error("The Penpot backend server is temporarily unavailable.");
+      console.error("Please wait a moment and try again.");
+      process.exit(1);
+    }
+
+    if (response.status === 504) {
+      console.error("Error: Gateway timeout (504)");
+      console.error("The Penpot backend server did not respond in time.");
+      console.error("\nCheck that:");
+      console.error("  1. The backend server is running and responsive");
+      console.error("  2. PENPOT_API_URI in .env points to the correct URL");
+      console.error(`  Current URI: ${config.apiUrl}`);
+      process.exit(1);
+    }
+
+    const code = errorData.code || "unknown";
+    const message = errorData.message || errorData.hint || "Unknown error";
+    throw new Error(`RPC error [${code}]: ${message}`);
+  }
+
+  return response.json();
+}
+
+// ============================================================================
+// Hint Normalization
+// ============================================================================
+
+function normalizeHint(hint) {
+  if (!hint) return hint;
+  let h = String(hint)
+    .replace(/[“”]/g, '"')
+    .replace(/[‘’]/g, "'")
+    .replace(/\\"/g, '"')
+    .replace(/\s+/g, ' ')
+    .trim();
+
+  h = h.replace(/https?:\/\/"[^"]*"/g, '<uri>');
+  h = h.replace(/https?:\/\/\S+/g, '<uri>');
+
+  h = h.replace(/\b(?:file[-_]?id|file_id|file-id)\b\s*[=:]\s*([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/gi, (match, id) => match.replace(id, '<file-id>'));
+  h = h.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, '<uuid>');
+  h = h.replace(/\(\d+\)/g, '(<id>)');
+  h = h.replace(/\b\d+(?:\.\d+)?(?:ms|s|m|h|d)(?:\s*\d+(?:\.\d+)?(?:ms|s|m|h|d))*\b/g, '<elapsed>');
+  h = h.replace(/\s+/g, ' ').trim();
+
+  return h || '(empty)';
+}
+
+// ============================================================================
+// Output Formatting
+// ============================================================================
+
+function formatJson(data) {
+  return JSON.stringify(data, null, 2);
+}
+
+function truncateHint(text, maxLength) {
+  if (!text) return "-";
+  if (text.length <= maxLength) return text;
+  return text.substring(0, maxLength - 3) + "...";
+}
+
+const TABLE_HEADERS = ["ID", "Created At", "Source", "Profile ID", "Kind", "Hint"];
+
+function formatTableRow(item, normalizeHints) {
+  const hint = normalizeHints ? normalizeHint(item.hint) : item.hint;
+  return [
+    item.id || "-",
+    item.createdAt || "-",
+    item.source || "-",
+    item.profileId || "-",
+    item.kind || "-",
+    truncateHint(hint, 60)
+  ];
+}
+
+function computeColWidths(headerLines, dataRows) {
+  return headerLines.map((h, i) => {
+    const maxData = Math.max(...dataRows.map(r => (r[i] || "").toString().length));
+    return Math.max(h.length, maxData);
+  });
+}
+
+function padRow(row, colWidths) {
+  return row.map((cell, i) => (cell || "-").toString().padEnd(colWidths[i])).join(" | ");
+}
+
+function formatListTable(data, hasMore = false, normalizeHints = false) {
+  if (!data.items || data.items.length === 0) {
+    return "No error reports found.";
+  }
+
+  const lines = [];
+  lines.push(`Found ${data.items.length} error reports`);
+  lines.push("");
+
+  const rows = data.items.map(item => formatTableRow(item, normalizeHints));
+  const colWidths = computeColWidths(TABLE_HEADERS, rows);
+
+  lines.push(padRow(TABLE_HEADERS, colWidths));
+  lines.push(colWidths.map(w => "-".repeat(w)).join("-+-"));
+  lines.push(...rows.map(row => padRow(row, colWidths)));
+
+  if (hasMore && data.nextSince && data.nextId) {
+    lines.push("");
+    lines.push(`More results: use --since ${data.nextSince} --since-id ${data.nextId}`);
+  }
+
+  return lines.join("\n");
+}
+
+function printTableHeaderStr(normalizeHints) {
+  const colWidths = TABLE_HEADERS.map(h => Math.max(h.length, h === "ID" ? 36 : 10));
+  return padRow(TABLE_HEADERS, colWidths) + "\n" + colWidths.map(w => "-".repeat(w)).join("-+-") + "\n";
+}
+
+function printTableRowStr(item, normalizeHints) {
+  const row = formatTableRow(item, normalizeHints);
+  return row.map(cell => (cell || "-").toString()).join(" | ");
+}
+
+function formatGetTable(data) {
+  const lines = [];
+  lines.push(`ID:              ${data.id || "(none)"}`);
+  lines.push(`Created At:      ${data.createdAt || "(none)"}`);
+  lines.push(`Source:          ${data.source || "(none)"}`);
+  lines.push(`Profile ID:      ${data.profileId || "(none)"}`);
+  lines.push(`Kind:            ${data.kind || "(none)"}`);
+  lines.push(`Version:         ${data.version || "(none)"}`);
+  lines.push(`Hint:            ${data.hint || "(none)"}`);
+  lines.push(`HREF:            ${data.href || "(none)"}`);
+
+  if (data.context) {
+    lines.push(`--- Context ---`);
+    const indented = data.context.split("\n").map(line => `  ${line}`).join("\n");
+    lines.push(indented);
+  }
+
+  if (data.params && data.params !== "{}") {
+    lines.push(`--- Params ---`);
+    const indented = data.params.split("\n").map(line => `  ${line}`).join("\n");
+    lines.push(indented);
+  }
+
+  if (data.props && data.props !== "{}") {
+    lines.push(`--- Props ---`);
+    const indented = data.props.split("\n").map(line => `  ${line}`).join("\n");
+    lines.push(indented);
+  }
+
+  const body = data.trace || data.report;
+  lines.push(`--- Report ---`);
+  if (body) {
+    const indented = body.split("\n").map(line => `  ${line}`).join("\n");
+    lines.push(indented);
+  } else {
+    lines.push("  (none)");
+  }
+
+  return lines.join("\n");
+}
+
+// ============================================================================
+// Commands
+// ============================================================================
+
+async function cmdList(config, args) {
+  const params = {};
+
+  if (args.limit !== undefined) params.limit = args.limit;
+  if (args.source !== undefined) params.source = args.source;
+  if (args.profileId) params["profile-id"] = args.profileId;
+  if (args.kind) params.kind = args.kind;
+  if (args.tenant) params.tenant = args.tenant;
+  if (args.version) params.version = args.version;
+  if (args.hint) params.hint = args.hint;
+
+  // --from maps to server's --since (oldest boundary)
+  // --since / --since-id are explicit cursor overrides
+  if (args.since) {
+    params.since = args.since;
+  } else if (args.from) {
+    params.since = args.from;
+  }
+  if (args.sinceId) params["since-id"] = args.sinceId;
+
+  // --to maps to server's --until (newest boundary)
+  if (args.to) params.until = args.to;
+
+  if (args.all && args.format === "json") {
+    console.error("Error: --all cannot be combined with --format json because --all streams output.");
+    console.error("Use --format ndjson for streaming, --format table for human-readable streaming, or omit --all for a single JSON page.");
+    process.exit(1);
+  }
+
+  // Output target
+  const out = args.output
+    ? createWriteStream(args.output)
+    : process.stdout;
+  const write = (text) => new Promise((resolve) => out.write(text, resolve));
+
+  const streaming = args.all || args.format === "ndjson";
+  let itemCount = 0;
+
+  if (streaming) {
+    // Streaming mode: print items as they arrive
+    if (args.format === "table") {
+      await write(printTableHeaderStr(args.normalizeHints));
+    }
+
+    let sinceParam = params.since;
+    let sinceIdParam = params["since-id"];
+    let hasMore = true;
+
+    while (hasMore) {
+      const currentParams = { ...params };
+      if (sinceParam) currentParams.since = sinceParam;
+      if (sinceIdParam) currentParams["since-id"] = sinceIdParam;
+
+      const result = await rpcCall(config, "get-error-reports", currentParams);
+
+      for (const item of result.items) {
+        itemCount++;
+        const outItem = args.normalizeHints ? { ...item, hint: normalizeHint(item.hint) } : item;
+        if (args.format === "table") {
+          await write(printTableRowStr(outItem, false) + "\n");
+        } else {
+          await write(JSON.stringify(outItem) + "\n");
+        }
+      }
+
+      if (result.nextSince && result.nextId) {
+        sinceParam = result.nextSince;
+        sinceIdParam = result.nextId;
+      } else {
+        hasMore = false;
+      }
+    }
+  } else {
+    // Single page: buffer and print
+    let allItems = [];
+    let lastResult = null;
+    let hasMore = true;
+    let sinceParam = params.since;
+    let sinceIdParam = params["since-id"];
+
+    while (hasMore) {
+      const currentParams = { ...params };
+      if (sinceParam) currentParams.since = sinceParam;
+      if (sinceIdParam) currentParams["since-id"] = sinceIdParam;
+
+      lastResult = await rpcCall(config, "get-error-reports", currentParams);
+      allItems = [...allItems, ...lastResult.items];
+
+      if (args.all && lastResult.nextSince && lastResult.nextId) {
+        sinceParam = lastResult.nextSince;
+        sinceIdParam = lastResult.nextId;
+      } else {
+        hasMore = false;
+      }
+    }
+
+    if (args.normalizeHints) {
+      for (const item of allItems) {
+        item.hint = normalizeHint(item.hint);
+      }
+    }
+
+    itemCount = allItems.length;
+    const output = { items: allItems };
+
+    if (lastResult) {
+      output.nextSince = lastResult.nextSince;
+      output.nextId = lastResult.nextId;
+    }
+
+    if (args.format === "table") {
+      const hasMore = lastResult.nextSince && lastResult.nextId;
+      await write(formatListTable(output, hasMore, false) + "\n");
+    } else {
+      await write(formatJson(output) + "\n");
+    }
+  }
+
+  if (args.output) {
+    out.end();
+    process.stderr.write(`Wrote ${itemCount} items to ${args.output}\n`);
+  }
+}
+
+async function cmdGet(config, args) {
+  const params = args.id ? { id: args.id } : { id: args.errorId };
+  const result = await rpcCall(config, "get-error-report", params);
+
+  if (args.format === "table") {
+    console.log(formatGetTable(result));
+  } else {
+    console.log(formatJson(result));
+  }
+}
+
+async function cmdStats(config, args) {
+  let items;
+
+  if (args.input) {
+    // Read from file (supports JSON, JSON array, and NDJSON)
+    const raw = readFileSync(args.input, "utf-8");
+    items = parseItems(raw);
+  } else if (!process.stdin.isTTY) {
+    // Read from stdin (supports JSON, JSON array, and NDJSON)
+    const raw = await readStdin();
+    items = parseItems(raw);
+  } else {
+    // Fetch from API
+    const params = {};
+    if (args.limit !== undefined) params.limit = args.limit;
+    if (args.from) params.since = args.from;
+    if (args.to) params["until"] = args.to;
+
+    items = [];
+    let sinceParam = params.since;
+    let sinceIdParam = undefined;
+    let hasMore = true;
+
+    while (hasMore) {
+      const currentParams = { ...params };
+      if (sinceParam) currentParams.since = sinceParam;
+      if (sinceIdParam) currentParams["since-id"] = sinceIdParam;
+
+      const result = await rpcCall(config, "get-error-reports", currentParams);
+      items = [...items, ...result.items];
+
+      if (result.nextSince && result.nextId) {
+        sinceParam = result.nextSince;
+        sinceIdParam = result.nextId;
+      } else {
+        hasMore = false;
+      }
+    }
+  }
+
+  if (items.length === 0) {
+    console.log("No error reports found.");
+    return;
+  }
+
+  // Normalize all hints for grouping
+  for (const item of items) {
+    item._normHint = normalizeHint(item.hint) || "(empty)";
+  }
+
+  const auditLogItems = items.filter((item) => item.source === "audit-log");
+
+  // Aggregations
+  const byHint = {};
+  const byVersion = {};
+  const bySource = {};
+  const byKind = {};
+  const byHour = {};
+  const profiles = new Set();
+
+  for (const item of items) {
+    count(byHint, item._normHint);
+    count(byVersion, item.version || "(unknown)");
+    count(bySource, item.source || "(unknown)");
+
+    const hour = item.createdAt ? item.createdAt.substring(11, 13) : "??";
+    count(byHour, hour);
+
+    if (item.profileId) profiles.add(item.profileId);
+  }
+
+  for (const item of auditLogItems) {
+    count(byKind, item.kind || "(none)");
+  }
+
+  const burstWindows = buildBurstWindows(items, 5 * 60 * 1000);
+  const heatmap = buildHeatmap(items);
+
+  if (args.format === "json") {
+    const stats = {
+      total: items.length,
+      uniqueProfiles: profiles.size,
+      byHint: sortDesc(byHint),
+      byVersion: sortDesc(byVersion),
+      bySource: sortDesc(bySource),
+      byKind: sortDesc(byKind),
+      byHour: sortDesc(byHour),
+      kindScope: "audit-log"
+    };
+
+    if (args.burst) {
+      stats.bursts = burstWindows.map((burst) => ({
+        start: burst.start,
+        end: burst.end,
+        count: burst.count,
+        averagePerWindow: Number(burst.averagePerWindow.toFixed(2)),
+        ratio: Number(burst.ratio.toFixed(2)),
+        ids: burst.ids
+      }));
+    }
+
+    if (args.heatmap) {
+      stats.heatmap = heatmap;
+    }
+
+    console.log(formatJson(stats));
+  } else {
+    console.log(`=== Error Stats ===`);
+    console.log(`Total: ${items.length}`);
+    console.log(`Unique profiles: ${profiles.size}`);
+    console.log("");
+
+    printTable("By Signature (normalized hint)", byHint, items.length);
+    printTable("By Source", bySource, items.length);
+    printTable("By Kind (audit-log only)", byKind, auditLogItems.length || 1);
+    printTable("By Version", byVersion, items.length);
+    printTable("By Hour (UTC)", byHour, items.length);
+
+    if (args.burst) {
+      printBurstTable(burstWindows);
+    }
+
+    if (args.heatmap) {
+      printHeatmapTable(heatmap);
+    }
+  }
+}
+
+function readStdin() {
+  return new Promise((resolve) => {
+    let data = "";
+    const rl = createInterface({ input: process.stdin });
+    rl.on("line", (line) => { data += line + "\n"; });
+    rl.on("close", () => resolve(data));
+  });
+}
+
+function parseItems(raw) {
+  try {
+    const data = JSON.parse(raw);
+    return Array.isArray(data) ? data : data.items || [];
+  } catch {
+    // NDJSON: one JSON object per line
+    return raw.split("\n")
+      .filter(line => line.trim())
+      .map(line => JSON.parse(line));
+  }
+}
+
+function buildBurstWindows(items, windowMs) {
+  const validItems = items
+    .filter((item) => item.createdAt && !Number.isNaN(Date.parse(item.createdAt)))
+    .map((item) => ({ ...item, _createdAtMs: Date.parse(item.createdAt) }))
+    .sort((a, b) => a._createdAtMs - b._createdAtMs);
+
+  if (validItems.length === 0) return [];
+
+  const startMs = validItems[0]._createdAtMs;
+  const endMs = validItems[validItems.length - 1]._createdAtMs;
+  const windowCount = Math.max(1, Math.ceil((endMs - startMs) / windowMs));
+  const averagePerWindow = validItems.length / windowCount;
+  const threshold = Math.max(1, averagePerWindow * 3);
+  const byWindow = new Map();
+
+  for (const item of validItems) {
+    const idx = Math.max(0, Math.min(windowCount - 1, Math.floor((item._createdAtMs - startMs) / windowMs)));
+    if (!byWindow.has(idx)) byWindow.set(idx, []);
+    byWindow.get(idx).push(item);
+  }
+
+  return Array.from(byWindow.entries())
+    .filter(([, windowItems]) => windowItems.length > threshold)
+    .map(([idx, windowItems]) => {
+      const start = new Date(startMs + idx * windowMs).toISOString();
+      const end = new Date(startMs + (idx + 1) * windowMs).toISOString();
+      return {
+        start,
+        end,
+        count: windowItems.length,
+        averagePerWindow,
+        ratio: windowItems.length / averagePerWindow,
+        ids: windowItems.map((item) => item.id).slice(0, 12)
+      };
+    })
+    .sort((a, b) => b.count - a.count || a.start.localeCompare(b.start));
+}
+
+function buildHeatmap(items) {
+  const days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+  const heatmap = {};
+  for (const item of items) {
+    if (!item.createdAt || Number.isNaN(Date.parse(item.createdAt))) continue;
+    const date = new Date(item.createdAt);
+    const day = days[(date.getUTCDay() + 6) % 7];
+    const hour = String(date.getUTCHours()).padStart(2, "0");
+    const key = `${day}-${hour}`;
+    heatmap[key] = (heatmap[key] || 0) + 1;
+  }
+  return heatmap;
+}
+
+function printBurstTable(bursts) {
+  console.log("5-minute bursts (>3x average):");
+  if (!bursts.length) {
+    console.log("  No bursts detected.");
+    console.log("");
+    return;
+  }
+
+  const rows = bursts.map((burst) => [
+    `${burst.start} → ${burst.end}`,
+    burst.count,
+    burst.averagePerWindow.toFixed(2),
+    `${burst.ratio.toFixed(2)}x`,
+    burst.ids.join(", ")
+  ]);
+  const widths = computeColWidths(["Window", "Count", "Avg", "Ratio", "Error IDs"], rows);
+  console.log(padRow(["Window", "Count", "Avg", "Ratio", "Error IDs"], widths));
+  console.log(widths.map((w) => "-".repeat(w)).join("-+-"));
+  rows.forEach((row) => console.log(padRow(row, widths)));
+  console.log("");
+}
+
+function printHeatmapTable(heatmap) {
+  const days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+  const hours = Array.from({ length: 24 }, (_, hour) => String(hour).padStart(2, "0"));
+  const max = Math.max(...hours.flatMap((hour) => days.map((day) => heatmap[`${day}-${hour}`] || 0)), 1);
+
+  console.log("Heatmap (day-of-week × hour UTC):");
+  console.log(`Max bucket: ${max}`);
+  console.log("");
+  console.log("       " + hours.map((hour) => hour.slice(0, 1)).join(" "));
+  for (const day of days) {
+    const cells = hours.map((hour) => {
+      const value = heatmap[`${day}-${hour}`] || 0;
+      if (value === 0) return "·";
+      if (value / max >= 0.75) return "4";
+      if (value / max >= 0.5) return "3";
+      if (value / max >= 0.25) return "2";
+      return "1";
+    });
+    console.log(`${day.padEnd(6)} ${cells.join(" ")}`);
+  }
+  console.log("");
+  console.log("Legend: ·=0 1=low 2=medium 3=high 4=peak");
+  console.log("");
+}
+
+function count(map, key) {
+  map[key] = (map[key] || 0) + 1;
+}
+
+function sortDesc(map) {
+  return Object.entries(map)
+    .sort((a, b) => b[1] - a[1])
+    .map(([key, count]) => ({ key, count }));
+}
+
+function printTable(title, map, total) {
+  const entries = Object.entries(map).sort((a, b) => b[1] - a[1]);
+  const maxCount = entries[0]?.[1] || 1;
+  const barWidth = 30;
+
+  console.log(`${title}:`);
+  for (const [key, n] of entries) {
+    const pct = ((100 * n) / total).toFixed(1);
+    const barLen = Math.max(1, Math.round((n / maxCount) * barWidth));
+    const bar = "█".repeat(barLen);
+    const label = key.length > 60 ? key.substring(0, 57) + "..." : key;
+    console.log(`  ${String(n).padStart(5)} (${pct.padStart(5)}%)  ${bar}  ${label}`);
+  }
+  console.log("");
+}
+
+// ============================================================================
+// CLI Setup with Commander
+// ============================================================================
+
+const program = new Command();
+
+program
+  .name("error-reports")
+  .description("Query Penpot error reports via RPC API")
+  .version("1.0.0");
+
+program
+  .command("list")
+  .description("List error reports with pagination and filters")
+  .option("-l, --limit <n>", "Max items per page (default: 50, max: 200)", (value) => parseInt(value, 10), 50)
+  .option("--from <date>", "ISO timestamp — oldest boundary (fetches items after this)")
+  .option("--to <date>", "ISO timestamp — newest boundary (fetches items before this)")
+  .option("--since <date>", "ISO timestamp — explicit cursor for manual pagination")
+  .option("--since-id <uuid>", "Fetch errors after this ID (cursor pagination)")
+  .option("-s, --source <name>", "Filter by source (legacy-v1, legacy-v2, logging, audit-log, rlimit)")
+  .option("-p, --profile-id <uuid>", "Filter by profile ID")
+  .option("-k, --kind <kind>", "Filter by kind (string)")
+  .option("-t, --tenant <tenant>", "Filter by tenant (string)")
+  .option("--version <version>", "Filter by version")
+  .option("--hint <text>", "Filter by hint (ILIKE match)")
+  .option("-a, --all", "Fetch all pages automatically (streams output)", false)
+  .option("-f, --format <type>", "Output format (json for one page, table, or ndjson for streaming)", "table")
+  .option("--normalize-hints", "Normalize hints by stripping dynamic values", false)
+  .option("-o, --output <file>", "Write output to file instead of stdout")
+  .option("--env <path>", "Custom .env file path")
+  .action(async (options) => {
+    const config = loadConfig(options.env);
+    await cmdList(config, options);
+  });
+
+program
+  .command("get")
+  .description("Get a single error report by ID")
+  .requiredOption("--id <uuid>", "Error report ID")
+  .option("--error-id <id>", "Error report error-id")
+  .option("-f, --format <type>", "Output format (json|table)", "table")
+  .option("--env <path>", "Custom .env file path")
+  .action(async (options) => {
+    const config = loadConfig(options.env);
+    await cmdGet(config, options);
+  });
+
+program
+  .command("stats")
+  .description("Compute error report statistics")
+  .option("--from <date>", "Start of interval (ISO timestamp)")
+  .option("--to <date>", "End of interval (ISO timestamp)")
+  .option("--limit <n>", "Items per page (default: 200)", (value) => parseInt(value, 10), 200)
+  .option("--input <file>", "Read from local JSON/NDJSON file instead of API")
+  .option("--burst", "Detect 5-minute bursts above 3x the average window rate", false)
+  .option("--heatmap", "Show day-of-week × hour-of-day heatmap", false)
+  .option("-f, --format <type>", "Output format (json|table)", "table")
+  .option("--env <path>", "Custom .env file path")
+  .action(async (options) => {
+    const config = loadConfig(options.env);
+    await cmdStats(config, options);
+  });
+
+program.parse();